tasn pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f204eecf6bdb656a6d2da46b85e81ec64c76e396
commit f204eecf6bdb656a6d2da46b85e81ec64c76e396 Author: Tom Hacohen <[email protected]> Date: Tue Mar 11 09:50:59 2014 +0000 Added Eolian support. This adds needed support for compilation of .eo files. --- Makefile_Eolian_Helper.am | 24 ++++++++++++++++++++++++ configure.ac | 1 + src/lib/Makefile.am | 2 ++ 3 files changed, 27 insertions(+) diff --git a/Makefile_Eolian_Helper.am b/Makefile_Eolian_Helper.am new file mode 100644 index 0000000..6106379 --- /dev/null +++ b/Makefile_Eolian_Helper.am @@ -0,0 +1,24 @@ +if HAVE_EOLIAN_GEN +EOLIAN_GEN = @eolian_gen@ +_EOLIAN_GEN_DEP = +else +EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} +_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT} +endif + +AM_V_EOL = $(am__v_EOL_@AM_V@) +am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) +am__v_EOL_0 = @echo " EOLIAN " $@; + +SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h + +%.eo.c: %.eo ${_EOLIAN_GEN_DEP} + $(AM_V_EOL)$(EOLIAN_GEN) --eo1 --legacy $(EOLIAN_FLAGS) --gc -o $@ $< + +%.eo.h: %.eo ${_EOLIAN_GEN_DEP} + $(AM_V_EOL)$(EOLIAN_GEN) --eo1 $(EOLIAN_FLAGS) --gh -o $@ $< + +%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP} + $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< + +CLEANFILES += $(BUILT_SOURCES) diff --git a/configure.ac b/configure.ac index 99d8e3b..4a95272 100644 --- a/configure.ac +++ b/configure.ac @@ -649,6 +649,7 @@ AC_SUBST(requirement_elm) EFL_WITH_BIN([eet], [eet-eet], [eet]) EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) +EFL_WITH_BIN([eolian], [eolian-codegen], [eolian_codegen]) EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen]) EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc]) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 1d046c4..9bea7ba 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in +include ../../Makefile_Eolian_Helper.am + AM_CPPFLAGS = \ -DELM_INTERNAL_API_ARGESFSDFEFC=1 \ -DMODULES_PATH=\"$(libdir)/elementary/modules\" \ --
