Merge remote branch 'origin' into release/unstable

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

diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
index 5d25e923f5602aa9069559a3fa95f61b7a321a51..d2950ed0cdfd372cc2ef8d657dbed3fb9555bf1a 100644 (file)
--- a/stepmake/stepmake/executable-rules.make
+++ b/stepmake/stepmake/executable-rules.make
@@ -1,4 +1,11 @@
 
-$(EXECUTABLE): $(outdir)/config.h $(O_FILES) $(outdir)/version.hh
+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)