Merge branch 'master' into lilypond/translation

[lilypond.git] / stepmake / stepmake / executable-rules.make

diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
index e032d7ee59da0ee580e7967954f6938b5163084d..d2950ed0cdfd372cc2ef8d657dbed3fb9555bf1a 100644 (file)
--- a/stepmake/stepmake/executable-rules.make
+++ b/stepmake/stepmake/executable-rules.make
@@ -1,2 +1,11 @@
-# empty
 
+define MODULE_LIB_template \
+$(1)/$(outdir)/library.a : \
+       $(MAKE) -C $(1)
+endef
+
+$(foreach a, $(MODULE_LIBS), $(eval $(call MODULE_LIB_template,$(a))))
+
+$(EXECUTABLE): $(outdir)/config.hh $(O_FILES) $(outdir)/version.hh $(MODULE_LIBS:%=%/$(outdir)/library.a)
+       $(foreach a, $(MODULE_LIBS), $(MAKE) -C $(a) && ) true
+       $(LD) -o $@ $(O_FILES) $(LOADLIBES) $(ALL_LDFLAGS)