enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

autotools: Renamed EOS variable in the Makefiles uniquely. 

EOS in Makefile_Efl.am becomes EFL_EOS.
EOS in examples/eolian_cxx/Makefile.am becomes ECXX_EXAMPLE_EOS.
This commit is contained in:
Savio Sena 2014-09-12 16:07:34 -03:00
parent 24ac9a223d
commit becdaf89c8
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Makefile_Efl.am
View File

@ -1,21 +1,23 @@
EOS = \ EFL_EOS = \
lib/efl/interfaces/efl_control.eo \ lib/efl/interfaces/efl_control.eo \
lib/efl/interfaces/efl_file.eo \ lib/efl/interfaces/efl_file.eo \
lib/efl/interfaces/efl_image.eo \ lib/efl/interfaces/efl_image.eo \
lib/efl/interfaces/efl_player.eo \ lib/efl/interfaces/efl_player.eo \
lib/efl/interfaces/efl_text.eo \ lib/efl/interfaces/efl_text.eo \
lib/efl/interfaces/efl_text_properties.eo lib/efl/interfaces/efl_text_properties.eo
EOS_H = $(EOS:%.eo=%.eo.h) EFL_EOS_H = $(EFL_EOS:%.eo=%.eo.h)
EOS_C = $(EOS:%.eo=%.eo.c) EFL_EOS_C = $(EFL_EOS:%.eo=%.eo.c)
BUILT_SOURCES += $(EFL_EOS_C) $(EFL_EOS_H)
EXTRA_DIST += \ EXTRA_DIST += \
${efleolianfiles_DATA} \ ${efleolianfiles_DATA} \
lib/efl/Efl_Config.h \ lib/efl/Efl_Config.h \
lib/efl/Efl.h lib/efl/Efl.h \
$(EFL_EOS)
efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@ efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
efleolianfiles_DATA = $(EOS) efleolianfiles_DATA = $(EFL_EOS)
lib_LTLIBRARIES += lib/efl/libefl.la lib_LTLIBRARIES += lib/efl/libefl.la
@ -31,4 +33,4 @@ dist_installed_eflheaders_DATA = \
lib/efl/Efl.h lib/efl/Efl.h
installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
nodist_installed_eflinterfaces_DATA = $(EOS_H) nodist_installed_eflinterfaces_DATA = $(EFL_EOS_H)

6
src/examples/eolian_cxx/Makefile.am
View File

@ -69,7 +69,7 @@ GENERATED = \
BUILT_SOURCES = $(GENERATED) BUILT_SOURCES = $(GENERATED)
CLEANFILES += $(BUILT_SOURCES) CLEANFILES += $(BUILT_SOURCES)
EOS = \ ECXX_EXAMPLE_EOS = \
colourable.eo \ colourable.eo \
colourablesquare.eo colourablesquare.eo
@ -97,7 +97,7 @@ EXTRA_PROGRAMS = \
eolian_cxx_eo_events_01 \ eolian_cxx_eo_events_01 \
eolian_cxx_complex_types_01 eolian_cxx_complex_types_01
DATA_FILES = Makefile.examples $(EOS) DATA_FILES = Makefile.examples $(ECXX_EXAMPLE_EOS)
EXTRA_DIST = $(DATA_FILES) EXTRA_DIST = $(DATA_FILES)
eolian_cxx_simple_01_SOURCES = \ eolian_cxx_simple_01_SOURCES = \
@ -137,7 +137,7 @@ eolian_cxx_complex_types_01_SOURCES = eolian_cxx_complex_types_01.cc
%.eo.h: %.eo %.eo.h: %.eo
$(AM_V_EOL)$(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $< $(AM_V_EOL)$(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $<
examples: $(EOS) $(GENERATED) $(EXTRA_PROGRAMS) examples: $(ECXX_EXAMPLE_EOS) $(GENERATED) $(EXTRA_PROGRAMS)
clean-local: clean-local:
rm -f $(EXTRA_PROGRAMS) $(GENERATED) rm -f $(EXTRA_PROGRAMS) $(GENERATED)