cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e109341fdbf11318aaca6903c5ab6e50308d207f

commit e109341fdbf11318aaca6903c5ab6e50308d207f
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Wed Apr 13 17:28:31 2016 -0700

    autotools: allow reuse of some macro for subdirectory Eolian build.
---
 ...n_Helper.am => Makefile_Eolian_Files_Helper.am} |  7 ------
 src/Makefile_Eolian_Helper.am                      | 26 +---------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Files_Helper.am
similarity index 75%
copy from src/Makefile_Eolian_Helper.am
copy to src/Makefile_Eolian_Files_Helper.am
index 87a4f39..1260d71 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Files_Helper.am
@@ -1,10 +1,3 @@
-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/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@)
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index 87a4f39..ddf09e5 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -6,28 +6,4 @@ 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 .eot .eot.h
-
-%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
-       $(AM_V_EOL) \
-       $(MKDIR_P) $(dir $@); \
-       $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
-
-%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
-       $(AM_V_EOL) \
-       $(MKDIR_P) $(dir $@); \
-       $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
-
-%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
-       $(AM_V_EOL) \
-       $(MKDIR_P) $(dir $@); \
-       $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
-
-%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
-       $(AM_V_EOL) \
-       $(MKDIR_P) $(dir $@); \
-       $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
+include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am

-- 


Reply via email to