eolian gen2: move to eolian gen (as the old one is gone)devs/q66/eolian_gen_next

15 files changed, 21 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index a817fabc22..0192122f37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,6 @@ efl_deprecated_option="no"
 EFL_WITH_BIN([eet], [eet-eet])
 EFL_WITH_BIN([edje], [edje-cc])
 EFL_WITH_BIN([eolian], [eolian-gen])
-EFL_WITH_BIN([eolian2], [eolian-gen2])
 EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
 EFL_WITH_BIN([eolian-js], [eolian-js])
 EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index 9fc82c63c2..340aa01211 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -45,23 +45,23 @@ lib_eolian_libeolian_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 ### Binary
 
 bin_PROGRAMS += \
-                bin/eolian2/eolian_gen2
-
-bin_eolian2_eolian_gen2_SOURCES = \
-                bin/eolian2/main.c \
-                bin/eolian2/main.h \
-                bin/eolian2/types.c \
-                bin/eolian2/types.h \
-                bin/eolian2/headers.c \
-                bin/eolian2/headers.h \
-                bin/eolian2/sources.c \
-                bin/eolian2/sources.h \
-                bin/eolian2/docs.c \
-                bin/eolian2/docs.h
-
-bin_eolian2_eolian_gen2_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
-bin_eolian2_eolian_gen2_LDADD = @USE_EOLIAN_LIBS@
-bin_eolian2_eolian_gen2_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
+                bin/eolian/eolian_gen
+
+bin_eolian_eolian_gen_SOURCES = \
+                bin/eolian/main.c \
+                bin/eolian/main.h \
+                bin/eolian/types.c \
+                bin/eolian/types.h \
+                bin/eolian/headers.c \
+                bin/eolian/headers.h \
+                bin/eolian/sources.c \
+                bin/eolian/sources.h \
+                bin/eolian/docs.c \
+                bin/eolian/docs.h
+
+bin_eolian_eolian_gen_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
+bin_eolian_eolian_gen_LDADD = @USE_EOLIAN_LIBS@
+bin_eolian_eolian_gen_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
 
 ### Helper for other modules using Eolian
 include Makefile_Eolian_Helper.am
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index 1b013ab181..ddf09e54a4 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -2,8 +2,8 @@ if HAVE_EOLIAN_GEN
 EOLIAN_GEN = @eolian_gen@
 _EOLIAN_GEN_DEP = @eolian_gen@
 else
-EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian2/eolian_gen2${EXEEXT}
-_EOLIAN_GEN_DEP = bin/eolian2/eolian_gen2${EXEEXT}
+EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
+_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
 endif
 
 include $(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 0000000000..4757034e1b
--- /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 61f1d34fbb..61f1d34fbb 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 eaaa118b1f..eaaa118b1f 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 63ec73a5b1..63ec73a5b1 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 55b4c071b0..55b4c071b0 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 dbde5bc144..dbde5bc144 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 0dd0b793ff..0dd0b793ff 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 2c95db5700..2c95db5700 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 05d711458b..05d711458b 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 b1db266a67..b1db266a67 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 609d097287..609d097287 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 a31bd40ee1..0607269305 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
    if (getenv("EFL_RUN_IN_TREE"))
      {
         snprintf(eolian_gen_path, sizeof(eolian_gen_path),
-              "%s/src/bin/eolian2/eolian_gen2%s",
+              "%s/src/bin/eolian/eolian_gen%s",
               PACKAGE_BUILD_DIR, EXEEXT);
      }
    if (eolian_gen_path[0] == '\0')