summaryrefslogtreecommitdiff
path: root/src
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 /src
parenta9748e6445016d276b0fa344c61646de3d7febf2 (diff)
Eolian helper: Fixed rule dependency to correctly depend on eolian_gen.
Without this change, bootstrapping doesn't work as well.
Diffstat (limited to 'src')
-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 e70de8c..eb15822 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
3MAINTAINERCLEANFILES = Makefile.in 3MAINTAINERCLEANFILES = Makefile.in
4CLEANFILES = 4CLEANFILES =
5BUILT_SOURCES = 5BUILT_SOURCES =
6EOLIAN_FLAGS =
6 7
7DIST_SUBDIRS = 8DIST_SUBDIRS =
8SUBDIRS = 9SUBDIRS =
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index d6be928..1781795 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -1,22 +1,24 @@
1if HAVE_EOLIAN_GEN 1if HAVE_EOLIAN_GEN
2EOLIAN_GEN = @eolian_gen@ 2EOLIAN_GEN = @eolian_gen@
3_EOLIAN_GEN_DEP =
3else 4else
4EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} 5EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
6_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
5endif 7endif
6 8
7AM_V_EOL = $(am__v_EOL_@AM_V@) 9AM_V_EOL = $(am__v_EOL_@AM_V@)
8am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) 10am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
9am__v_EOL_0 = @echo " EOLIAN " $@; 11am__v_EOL_0 = @echo " EOLIAN " $@;
10 12
11#EOLIAN RELATED, THAT SHOULD BE PUT IN M4
12SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h 13SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h
13 14
14.eo.eo.c: 15%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
15 $(AM_V_EOL)$(EOLIAN_GEN) --eo1 --legacy $(EOLIAN_FLAGS) --gc -o $@ $< 16 $(AM_V_EOL)$(EOLIAN_GEN) --eo1 --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
16 17
17.eo.eo.h: 18%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
18 $(AM_V_EOL)$(EOLIAN_GEN) --eo1 $(EOLIAN_FLAGS) --gh -o $@ $< 19 $(AM_V_EOL)$(EOLIAN_GEN) --eo1 $(EOLIAN_FLAGS) --gh -o $@ $<
19 20
20.eo.eo.legacy.h: 21.eo.eo.legacy.h: ${_EOLIAN_GEN_DEP}
21 $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< 22 $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
22#END OF EOLIAN RELATED 23
24CLEANFILES += $(BUILT_SOURCES)