diff --git a/config/Makefile.am b/config/Makefile.am index 7ac3f5c1be..690067909d 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -9,7 +9,7 @@ filesdir = $(datadir)/elementary/config files_DATA = profile.cfg -.cfg: .src +%.cfg: %.src $(AM_V_EET) \ $(MKDIR_P) $(top_builddir)/config/; \ $(EET) -i $(top_builddir)/config/$@ config $< 0 diff --git a/config/default/Makefile.am b/config/default/Makefile.am index a3bab72bed..6211ff7e1f 100644 --- a/config/default/Makefile.am +++ b/config/default/Makefile.am @@ -13,7 +13,7 @@ files_DATA = \ icon.png \ base.cfg -.cfg: .src +%.cfg: %.src $(AM_V_EET) \ $(MKDIR_P) $(top_builddir)/config/default/; \ $(EET) -e $(top_builddir)/config/default/$@ config $< 1 diff --git a/config/mobile/Makefile.am b/config/mobile/Makefile.am index d5283eea2e..7cdfbd5881 100644 --- a/config/mobile/Makefile.am +++ b/config/mobile/Makefile.am @@ -13,7 +13,7 @@ files_DATA = \ icon.png \ base.cfg -.cfg: .src +%.cfg: %.src $(AM_V_EET) \ $(MKDIR_P) $(top_builddir)/config/; \ $(EET) -e $(top_builddir)/config/mobile/$@ config $< 1 diff --git a/config/standard/Makefile.am b/config/standard/Makefile.am index a6d415a789..3dd3c88c68 100644 --- a/config/standard/Makefile.am +++ b/config/standard/Makefile.am @@ -13,7 +13,7 @@ files_DATA = \ icon.png \ base.cfg -.cfg: .src +%.cfg: %.src $(AM_V_EET) \ $(MKDIR_P) $(top_builddir)/config/standard/; \ $(EET) -e $(top_builddir)/config/standard/$@ config $< 1 diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am index e56c40fdc0..a204e259fa 100644 --- a/src/Makefile_Elua_Helper.am +++ b/src/Makefile_Elua_Helper.am @@ -19,5 +19,5 @@ am__v_ELUA_0 = @echo " ELUA " $@; SUFFIXES += .lua -.eo.lua: .eo ${_ELUA_GEN_DEP} +%.eo.lua: %.eo ${_ELUA_GEN_DEP} $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $< diff --git a/src/Makefile_Eolian_Files_Helper.am b/src/Makefile_Eolian_Files_Helper.am index 01ed30e4f1..1260d718c5 100644 --- a/src/Makefile_Eolian_Files_Helper.am +++ b/src/Makefile_Eolian_Files_Helper.am @@ -5,22 +5,22 @@ am__v_EOL_0 = @echo " EOLIAN " $@; SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h -.eo.c: .eo ${_EOLIAN_GEN_DEP} +%.eo.c: %.eo ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $< -.eo.h: .eo ${_EOLIAN_GEN_DEP} +%.eo.h: %.eo ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $< -.eot.h: .eot ${_EOLIAN_GEN_DEP} +%.eot.h: %.eot ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $< -.eo.legacy.h: .eo ${_EOLIAN_GEN_DEP} +%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP} $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< diff --git a/src/Makefile_Eolian_Js_Helper.am b/src/Makefile_Eolian_Js_Helper.am index 47253d36e0..fc60a8db0d 100644 --- a/src/Makefile_Eolian_Js_Helper.am +++ b/src/Makefile_Eolian_Js_Helper.am @@ -12,5 +12,5 @@ am__v_EOLJS_0 = @echo " EOLJS " $@; SUFFIXES += .eo.js.cc -.eo.js.cc: .eo $(_EOLIAN_JS_DEP) +%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP) $(AM_V_EOLJS)$(EOLIAN_JS) $(EOLIAN_FLAGS) -o $@ $< diff --git a/src/examples/elementary/Makefile.am b/src/examples/elementary/Makefile.am index db23b204f4..e36408079e 100644 --- a/src/examples/elementary/Makefile.am +++ b/src/examples/elementary/Makefile.am @@ -239,7 +239,7 @@ clean-local: ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example codegen_example_generated.c codegen_example_generated.h: codegen_example.edj - $(AM_V_CODEGEN)$(ELEMENTARY_CODEGEN) $(ELEMENTARY_CODEGEN_FLAGS) $< elm/example/mylayout/default codegen_example_generated.c codegen_example_generated.h + $(AM_V_CODEGEN)$(ELEMENTARY_CODEGEN) $(ELEMENTARY_CODEGEN_FLAGS) $(<) elm/example/mylayout/default codegen_example_generated.c codegen_example_generated.h BUILT_SOURCES = codegen_example_generated.c codegen_example_generated.h diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am index 67e6af47b7..bfc44b73e9 100644 --- a/src/examples/eolian_cxx/Makefile.am +++ b/src/examples/eolian_cxx/Makefile.am @@ -1,4 +1,3 @@ - MAINTAINERCLEANFILES = Makefile.in CLEANFILES = @@ -133,16 +132,16 @@ eolian_cxx_inherit_01.$(OBJEXT): $(GENERATED) eolian_cxx_callbacks_01_SOURCES = eolian_cxx_callbacks_01.cc -.eo.hh: .eo +%.eo.hh: %.eo $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I${abs_srcdir} -o $@ $< -.eo.impl.hh: .eo.hh +%.eo.impl.hh: %.eo.hh true $< -.eo.c: .eo +%.eo.c: %.eo $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $< -.eo.h: .eo +%.eo.h: %.eo $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $< examples: $(ECXX_EXAMPLE_EOS) $(GENERATED) $(EXTRA_PROGRAMS)