summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 02:08:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 02:08:14 +0000
commit9ea2ce1041549c90f94062ce5ec145056e7fbdfa (patch)
tree3bcd3fb016bc498a72ff99c8d67c8b7ef2d91718 /data
parente2ce20e9a4dfd12bb383a1b60032f2ef7b507850 (diff)
efl: merge edje.
this is still in progress, mostly the multisense stuff is pending. it seems that when we merge ecore_audio in edje the libremix and similar are gone, at least from Edje, and will be in ecore_audio itself (or pulseaudio). Changes: * __UNUSED__ to EINA_UNUSED * binaries (epp, embryo_cc, edje_cc) now consider EFL_RUN_IN_TREE and will assume the binaries are still not installed, running from build tree location (needs more testing, maybe doesn't work with srcdir != builddir, still doesn't solve cross compile builds) SVN revision: 82139
Diffstat (limited to '')
-rw-r--r--data/Makefile.am18
-rw-r--r--data/edje/edc.vim (renamed from legacy/edje/data/edc.vim)0
-rw-r--r--data/edje/edje-mode.el (renamed from legacy/edje/data/edje-mode.el)0
-rw-r--r--data/edje/edje.xml (renamed from legacy/edje/data/edje.xml)0
-rw-r--r--data/edje/include/edje.inc (renamed from legacy/edje/data/include/edje.inc)0
-rw-r--r--data/edje/vim/autoload/edccomplete.vim (renamed from legacy/edje/data/vim/autoload/edccomplete.vim)0
-rw-r--r--data/edje/vim/ftdetect/edc.vim (renamed from legacy/edje/data/vim/ftdetect/edc.vim)0
-rw-r--r--data/edje/vim/ftplugin/edc.vim (renamed from legacy/edje/data/vim/ftplugin/edc.vim)0
-rw-r--r--data/edje/vim/indent/edc.vim (renamed from legacy/edje/data/vim/indent/edc.vim)0
-rw-r--r--data/edje/vim/plugin-info.txt (renamed from legacy/edje/data/vim/plugin-info.txt)0
-rw-r--r--data/edje/vim/snippets/edc.snippets (renamed from legacy/edje/data/vim/snippets/edc.snippets)0
-rw-r--r--data/edje/vim/syntax/edc.vim (renamed from legacy/edje/data/vim/syntax/edc.vim)0
-rw-r--r--data/edje/vim/syntax/embryo.vim (renamed from legacy/edje/data/vim/syntax/embryo.vim)0
13 files changed, 17 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index f2d475397a..fc04b811c6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,28 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EXTRA_DIST =
4
5########################################################################
6# Embryo
3embryofilesdir = $(datadir)/embryo/include 7embryofilesdir = $(datadir)/embryo/include
4embryofiles_DATA = embryo/default.inc 8embryofiles_DATA = embryo/default.inc
5 9
10########################################################################
11# Evas
6evasfilesdir = $(datadir)/evas 12evasfilesdir = $(datadir)/evas
7evasfiles_DATA = evas/checkme 13evasfiles_DATA = evas/checkme
8 14
15########################################################################
16# Eo
9eofilesdir = $(datadir)/eo 17eofilesdir = $(datadir)/eo
10eofiles_DATA = eo/eo_step.py 18eofiles_DATA = eo/eo_step.py
11 19
12EXTRA_DIST = embryo/default.inc evas/checkme eo/eo_step.py 20########################################################################
21# Edje
22edjefilesdir = $(datadir)/edje/include
23edjefiles_DATA = edje/include/edje.inc
24
25mimedir = $(datadir)/mime/packages
26mime_DATA = edje/edje.xml
27
28EXTRA_DIST += edje/edc.vim edje/edje-mode.el
diff --git a/legacy/edje/data/edc.vim b/data/edje/edc.vim
index 6041dcf1fb..6041dcf1fb 100644
--- a/legacy/edje/data/edc.vim
+++ b/data/edje/edc.vim
diff --git a/legacy/edje/data/edje-mode.el b/data/edje/edje-mode.el
index 33c6fe6131..33c6fe6131 100644
--- a/legacy/edje/data/edje-mode.el
+++ b/data/edje/edje-mode.el
diff --git a/legacy/edje/data/edje.xml b/data/edje/edje.xml
index eb299e7021..eb299e7021 100644
--- a/legacy/edje/data/edje.xml
+++ b/data/edje/edje.xml
diff --git a/legacy/edje/data/include/edje.inc b/data/edje/include/edje.inc
index 5fc9ec2b3f..5fc9ec2b3f 100644
--- a/legacy/edje/data/include/edje.inc
+++ b/data/edje/include/edje.inc
diff --git a/legacy/edje/data/vim/autoload/edccomplete.vim b/data/edje/vim/autoload/edccomplete.vim
index e2521e9c42..e2521e9c42 100644
--- a/legacy/edje/data/vim/autoload/edccomplete.vim
+++ b/data/edje/vim/autoload/edccomplete.vim
diff --git a/legacy/edje/data/vim/ftdetect/edc.vim b/data/edje/vim/ftdetect/edc.vim
index d8cc228c27..d8cc228c27 100644
--- a/legacy/edje/data/vim/ftdetect/edc.vim
+++ b/data/edje/vim/ftdetect/edc.vim
diff --git a/legacy/edje/data/vim/ftplugin/edc.vim b/data/edje/vim/ftplugin/edc.vim
index 5a90a56a6c..5a90a56a6c 100644
--- a/legacy/edje/data/vim/ftplugin/edc.vim
+++ b/data/edje/vim/ftplugin/edc.vim
diff --git a/legacy/edje/data/vim/indent/edc.vim b/data/edje/vim/indent/edc.vim
index 498be4a5b1..498be4a5b1 100644
--- a/legacy/edje/data/vim/indent/edc.vim
+++ b/data/edje/vim/indent/edc.vim
diff --git a/legacy/edje/data/vim/plugin-info.txt b/data/edje/vim/plugin-info.txt
index e01cb420e4..e01cb420e4 100644
--- a/legacy/edje/data/vim/plugin-info.txt
+++ b/data/edje/vim/plugin-info.txt
diff --git a/legacy/edje/data/vim/snippets/edc.snippets b/data/edje/vim/snippets/edc.snippets
index bb93e42265..bb93e42265 100644
--- a/legacy/edje/data/vim/snippets/edc.snippets
+++ b/data/edje/vim/snippets/edc.snippets
diff --git a/legacy/edje/data/vim/syntax/edc.vim b/data/edje/vim/syntax/edc.vim
index e21c01810d..e21c01810d 100644
--- a/legacy/edje/data/vim/syntax/edc.vim
+++ b/data/edje/vim/syntax/edc.vim
diff --git a/legacy/edje/data/vim/syntax/embryo.vim b/data/edje/vim/syntax/embryo.vim
index 11175d893f..11175d893f 100644
--- a/legacy/edje/data/vim/syntax/embryo.vim
+++ b/data/edje/vim/syntax/embryo.vim