summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile_Eolian.am34
-rw-r--r--src/Makefile_Eolian_Helper.am4
-rw-r--r--src/bin/eolian/.gitignore1
-rw-r--r--src/bin/eolian/docs.c (renamed from src/bin/eolian2/docs.c)0
-rw-r--r--src/bin/eolian/docs.h (renamed from src/bin/eolian2/docs.h)0
-rw-r--r--src/bin/eolian/headers.c (renamed from src/bin/eolian2/headers.c)0
-rw-r--r--src/bin/eolian/headers.h (renamed from src/bin/eolian2/headers.h)0
-rw-r--r--src/bin/eolian/main.c (renamed from src/bin/eolian2/main.c)0
-rw-r--r--src/bin/eolian/main.h (renamed from src/bin/eolian2/main.h)0
-rw-r--r--src/bin/eolian/sources.c (renamed from src/bin/eolian2/sources.c)0
-rw-r--r--src/bin/eolian/sources.h (renamed from src/bin/eolian2/sources.h)0
-rw-r--r--src/bin/eolian/types.c (renamed from src/bin/eolian2/types.c)0
-rw-r--r--src/bin/eolian/types.h (renamed from src/bin/eolian2/types.h)0
-rw-r--r--src/tests/eolian/eolian_generation.c2
15 files changed, 21 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index a817fab..0192122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,6 @@ efl_deprecated_option="no"
157EFL_WITH_BIN([eet], [eet-eet]) 157EFL_WITH_BIN([eet], [eet-eet])
158EFL_WITH_BIN([edje], [edje-cc]) 158EFL_WITH_BIN([edje], [edje-cc])
159EFL_WITH_BIN([eolian], [eolian-gen]) 159EFL_WITH_BIN([eolian], [eolian-gen])
160EFL_WITH_BIN([eolian2], [eolian-gen2])
161EFL_WITH_BIN([eolian_cxx], [eolian-cxx]) 160EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
162EFL_WITH_BIN([eolian-js], [eolian-js]) 161EFL_WITH_BIN([eolian-js], [eolian-js])
163EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin]) 162EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index 9fc82c6..340aa01 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -45,23 +45,23 @@ lib_eolian_libeolian_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
45### Binary 45### Binary
46 46
47bin_PROGRAMS += \ 47bin_PROGRAMS += \
48 bin/eolian2/eolian_gen2 48 bin/eolian/eolian_gen
49 49
50bin_eolian2_eolian_gen2_SOURCES = \ 50bin_eolian_eolian_gen_SOURCES = \
51 bin/eolian2/main.c \ 51 bin/eolian/main.c \
52 bin/eolian2/main.h \ 52 bin/eolian/main.h \
53 bin/eolian2/types.c \ 53 bin/eolian/types.c \
54 bin/eolian2/types.h \ 54 bin/eolian/types.h \
55 bin/eolian2/headers.c \ 55 bin/eolian/headers.c \
56 bin/eolian2/headers.h \ 56 bin/eolian/headers.h \
57 bin/eolian2/sources.c \ 57 bin/eolian/sources.c \
58 bin/eolian2/sources.h \ 58 bin/eolian/sources.h \
59 bin/eolian2/docs.c \ 59 bin/eolian/docs.c \
60 bin/eolian2/docs.h 60 bin/eolian/docs.h
61 61
62bin_eolian2_eolian_gen2_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@ 62bin_eolian_eolian_gen_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
63bin_eolian2_eolian_gen2_LDADD = @USE_EOLIAN_LIBS@ 63bin_eolian_eolian_gen_LDADD = @USE_EOLIAN_LIBS@
64bin_eolian2_eolian_gen2_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ 64bin_eolian_eolian_gen_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
65 65
66### Helper for other modules using Eolian 66### Helper for other modules using Eolian
67include Makefile_Eolian_Helper.am 67include Makefile_Eolian_Helper.am
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index 1b013ab..ddf09e5 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -2,8 +2,8 @@ if HAVE_EOLIAN_GEN
2EOLIAN_GEN = @eolian_gen@ 2EOLIAN_GEN = @eolian_gen@
3_EOLIAN_GEN_DEP = @eolian_gen@ 3_EOLIAN_GEN_DEP = @eolian_gen@
4else 4else
5EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian2/eolian_gen2${EXEEXT} 5EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
6_EOLIAN_GEN_DEP = bin/eolian2/eolian_gen2${EXEEXT} 6_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
7endif 7endif
8 8
9include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am 9include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
diff --git a/src/bin/eolian/.gitignore b/src/bin/eolian/.gitignore
new file mode 100644
index 0000000..4757034
--- /dev/null
+++ b/src/bin/eolian/.gitignore
@@ -0,0 +1 @@
/eolian_gen
diff --git a/src/bin/eolian2/docs.c b/src/bin/eolian/docs.c
index 61f1d34..61f1d34 100644
--- a/src/bin/eolian2/docs.c
+++ b/src/bin/eolian/docs.c
diff --git a/src/bin/eolian2/docs.h b/src/bin/eolian/docs.h
index eaaa118..eaaa118 100644
--- a/src/bin/eolian2/docs.h
+++ b/src/bin/eolian/docs.h
diff --git a/src/bin/eolian2/headers.c b/src/bin/eolian/headers.c
index 63ec73a..63ec73a 100644
--- a/src/bin/eolian2/headers.c
+++ b/src/bin/eolian/headers.c
diff --git a/src/bin/eolian2/headers.h b/src/bin/eolian/headers.h
index 55b4c07..55b4c07 100644
--- a/src/bin/eolian2/headers.h
+++ b/src/bin/eolian/headers.h
diff --git a/src/bin/eolian2/main.c b/src/bin/eolian/main.c
index dbde5bc..dbde5bc 100644
--- a/src/bin/eolian2/main.c
+++ b/src/bin/eolian/main.c
diff --git a/src/bin/eolian2/main.h b/src/bin/eolian/main.h
index 0dd0b79..0dd0b79 100644
--- a/src/bin/eolian2/main.h
+++ b/src/bin/eolian/main.h
diff --git a/src/bin/eolian2/sources.c b/src/bin/eolian/sources.c
index 2c95db5..2c95db5 100644
--- a/src/bin/eolian2/sources.c
+++ b/src/bin/eolian/sources.c
diff --git a/src/bin/eolian2/sources.h b/src/bin/eolian/sources.h
index 05d7114..05d7114 100644
--- a/src/bin/eolian2/sources.h
+++ b/src/bin/eolian/sources.h
diff --git a/src/bin/eolian2/types.c b/src/bin/eolian/types.c
index b1db266..b1db266 100644
--- a/src/bin/eolian2/types.c
+++ b/src/bin/eolian/types.c
diff --git a/src/bin/eolian2/types.h b/src/bin/eolian/types.h
index 609d097..609d097 100644
--- a/src/bin/eolian2/types.h
+++ b/src/bin/eolian/types.h
diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c
index a31bd40..0607269 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -89,7 +89,7 @@ _eolian_gen_execute(const char *eo_filename, const char *options, const char *ou
89 if (getenv("EFL_RUN_IN_TREE")) 89 if (getenv("EFL_RUN_IN_TREE"))
90 { 90 {
91 snprintf(eolian_gen_path, sizeof(eolian_gen_path), 91 snprintf(eolian_gen_path, sizeof(eolian_gen_path),
92 "%s/src/bin/eolian2/eolian_gen2%s", 92 "%s/src/bin/eolian/eolian_gen%s",
93 PACKAGE_BUILD_DIR, EXEEXT); 93 PACKAGE_BUILD_DIR, EXEEXT);
94 } 94 }
95 if (eolian_gen_path[0] == '\0') 95 if (eolian_gen_path[0] == '\0')