diff options
author | Tom Hacohen <tom@stosb.com> | 2014-03-05 10:19:08 +0000 |
---|---|---|
committer | Daniel Zaoui <daniel.zaoui@samsung.com> | 2014-03-06 15:12:51 +0200 |
commit | b5f0df20dc049888463c7b7caa1819ba5c91bb0c (patch) | |
tree | b4a4690cf2621e4395d869b4cab0697334caab1f /src | |
parent | a9748e6445016d276b0fa344c61646de3d7febf2 (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.am | 1 | ||||
-rw-r--r-- | src/Makefile_Eolian_Helper.am | 12 |
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 | |||
3 | MAINTAINERCLEANFILES = Makefile.in | 3 | MAINTAINERCLEANFILES = Makefile.in |
4 | CLEANFILES = | 4 | CLEANFILES = |
5 | BUILT_SOURCES = | 5 | BUILT_SOURCES = |
6 | EOLIAN_FLAGS = | ||
6 | 7 | ||
7 | DIST_SUBDIRS = | 8 | DIST_SUBDIRS = |
8 | SUBDIRS = | 9 | SUBDIRS = |
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 @@ | |||
1 | if HAVE_EOLIAN_GEN | 1 | if HAVE_EOLIAN_GEN |
2 | EOLIAN_GEN = @eolian_gen@ | 2 | EOLIAN_GEN = @eolian_gen@ |
3 | _EOLIAN_GEN_DEP = | ||
3 | else | 4 | else |
4 | EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} | 5 | EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} |
6 | _EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT} | ||
5 | endif | 7 | endif |
6 | 8 | ||
7 | AM_V_EOL = $(am__v_EOL_@AM_V@) | 9 | AM_V_EOL = $(am__v_EOL_@AM_V@) |
8 | am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) | 10 | am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) |
9 | am__v_EOL_0 = @echo " EOLIAN " $@; | 11 | am__v_EOL_0 = @echo " EOLIAN " $@; |
10 | 12 | ||
11 | #EOLIAN RELATED, THAT SHOULD BE PUT IN M4 | ||
12 | SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h | 13 | SUFFIXES = .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 | |
24 | CLEANFILES += $(BUILT_SOURCES) | ||