Make object files depend on out/config.hh.

This is needed to ensure that out/config.h is copied there before
C++ compilation starts.

Most of lilypond already depends on config.h, through std-vector.h.

diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
index d2950ed0cdfd372cc2ef8d657dbed3fb9555bf1a..785be9ef6f4ee1e1ba84e1db581facab63aef0d8 100644 (file)
--- a/stepmake/stepmake/executable-rules.make
+++ b/stepmake/stepmake/executable-rules.make
@@ -6,6 +6,8 @@ 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)
+$(O_FILES): $(outdir)/config.hh
+
+$(EXECUTABLE): $(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)

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index 6c176bac5e7b0995cf33ee66ed452cb4e2bc802a..9e2f042128d0fd8a6d00ae6a6698d7f7b14fb2af 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -23,6 +23,7 @@ endif
 
 ifeq ($(strip $(CROSS)),no)
 $(outdir)/%.1: $(outdir)/% $(buildscript-dir)/help2man
+       echo $(buildscript-dir)/help2man
        $(HELP2MAN_COMMAND)
 else
 # When cross building, some manpages will not build because the

diff --git a/stepmake/stepmake/library-rules.make b/stepmake/stepmake/library-rules.make
index 942c4f01df369ce397b4fa02d302b253bba66a89..18b1066e2b91542e4c6feb1ce0a879de19952c4a 100644 (file)
--- a/stepmake/stepmake/library-rules.make
+++ b/stepmake/stepmake/library-rules.make
@@ -1,5 +1,7 @@
 
-$(LIBRARY): $(outdir)/config.hh $(O_FILES)
+$(O_FILES): $(outdir)/config.hh
+
+$(LIBRARY): $(O_FILES)
        $(AR) $(ARFLAGS) $@ $(O_FILES)
 # thanks to Nelson Beebe for this trick.
        $(RANLIB) $@ || $(AR) ts $@ || true

diff --git a/stepmake/stepmake/shared-library-rules.make b/stepmake/stepmake/shared-library-rules.make
index 62b2db26d2c21453af070a1114333cc774438d72..3c80a08de486fef456990af8e6e8528a74880429 100644 (file)
--- a/stepmake/stepmake/shared-library-rules.make
+++ b/stepmake/stepmake/shared-library-rules.make
@@ -1,4 +1,5 @@
 
+$(O_FILES): $(outdir)/config.hh
 
-$(SHARED_LIBRARY): $(outdir)/config.hh $(LO_FILES)
+$(SHARED_LIBRARY): $(LO_FILES)
        $(LD) $(SHARED_FLAGS) -o $@ $(LO_FILES) $(ALL_LDFLAGS)

diff --git a/stepmake/stepmake/test-rules.make b/stepmake/stepmake/test-rules.make
index d733dbbe69c10920ec1f094f12e160892b8cabab..e10e83c7d8fbdee9b4bc110de4d961d7bdd9caf6 100644 (file)
--- a/stepmake/stepmake/test-rules.make
+++ b/stepmake/stepmake/test-rules.make
@@ -6,6 +6,6 @@ endef
 
 $(foreach a, $(MODULE_LIBS), $(eval $(call MODULE_LIB_template,$(a))))
 
-$(TEST_EXECUTABLE): $(outdir)/config.hh $(TEST_O_FILES) $(TEST_MODULE_LIBS:%=%/$(outdir)/library.a)
+$(TEST_EXECUTABLE): $(TEST_O_FILES) $(TEST_MODULE_LIBS:%=%/$(outdir)/library.a)
        $(foreach a, $(TEST_MODULE_LIBS), $(MAKE) -C $(a) && ) true
        $(LD) -o $@ $(TEST_O_FILES) $(TEST_LOADLIBES) $(ALL_LDFLAGS)