kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eolian helper: Fixed rule dependency to correctly depend on eolian_gen. 

Without this change, bootstrapping doesn't work as well.
This commit is contained in:
Tom Hacohen 2014-03-05 10:19:08 +00:00 committed by Daniel Zaoui
parent a9748e6445
commit b5f0df20dc
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = CLEANFILES =
BUILT_SOURCES = BUILT_SOURCES =
EOLIAN_FLAGS =
DIST_SUBDIRS = DIST_SUBDIRS =
SUBDIRS = SUBDIRS =

12
src/Makefile_Eolian_Helper.am
View File

@ -1,22 +1,24 @@
if HAVE_EOLIAN_GEN if HAVE_EOLIAN_GEN
EOLIAN_GEN = @eolian_gen@ EOLIAN_GEN = @eolian_gen@
_EOLIAN_GEN_DEP =
else else
EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT} EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
endif endif
AM_V_EOL = $(am__v_EOL_@AM_V@) AM_V_EOL = $(am__v_EOL_@AM_V@)
am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
am__v_EOL_0 = @echo " EOLIAN " $@; am__v_EOL_0 = @echo " EOLIAN " $@;
#EOLIAN RELATED, THAT SHOULD BE PUT IN M4
SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h 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 $@ $< $(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 $@ $< $(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 $@ $< $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
#END OF EOLIAN RELATED
CLEANFILES += $(BUILT_SOURCES)