summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-03-05 10:19:08 +0000
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-03-06 15:12:51 +0200
commitb5f0df20dc049888463c7b7caa1819ba5c91bb0c (patch)
treeb4a4690cf2621e4395d869b4cab0697334caab1f
parenta9748e6445016d276b0fa344c61646de3d7febf2 (diff)
downloadefl-b5f0df20dc049888463c7b7caa1819ba5c91bb0c.tar.gz
Eolian helper: Fixed rule dependency to correctly depend on eolian_gen.
Without this change, bootstrapping doesn't work as well.
-rw-r--r--src/Makefile.am1
-rw-r--r--src/Makefile_Eolian_Helper.am12
2 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e70de8cfe2..eb158223b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES =
BUILT_SOURCES =
+EOLIAN_FLAGS =
DIST_SUBDIRS =
SUBDIRS =
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index d6be928bdf..1781795160 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -1,22 +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 " $@;
-#EOLIAN RELATED, THAT SHOULD BE PUT IN M4
SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h
-.eo.eo.c:
+%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN_GEN) --eo1 --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
-.eo.eo.h:
+%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN_GEN) --eo1 $(EOLIAN_FLAGS) --gh -o $@ $<
-.eo.eo.legacy.h:
+.eo.eo.legacy.h: ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
-#END OF EOLIAN RELATED
+
+CLEANFILES += $(BUILT_SOURCES)