patch::: 1.3.0.jcn1

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

diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make
index 3b175b5ad79d0f345d59894a72b151141cee9623..85d77ef212e0019d39bcedcd551dcd0c04ff968a 100644 (file)
--- a/stepmake/stepmake/executable-targets.make
+++ b/stepmake/stepmake/executable-targets.make
@@ -5,9 +5,9 @@
 
 default: $(EXECUTABLE)
 
-$(EXECUTABLE): $(configheader) $(O_FILES) $(outdir)/version.hh $(MODULE_LIBES)
-       $(foreach a, $(MODULE_LIBS), $(MAKE) -C $a && ) true
-       $(LD_COMMAND) $(O_FILES) $(LOADLIBES)
+$(EXECUTABLE): $(depth)/config.h $(O_FILES) $(outdir)/version.hh
+       $(foreach a, $(MODULE_LIBS), $(MAKE) -C $(a) && ) true
+       $(LD_COMMAND) $(O_FILES) $(LOADLIBES) $(USER_LDFLAGS)
 
 exe: $(EXECUTABLE)
 
@@ -30,5 +30,9 @@ uninstallexe:
        $(foreach a, $(SEXECUTABLES), rm -f $(bindir)/$(a) &&) true
 
 
-%/$(outdir)/library.a:
-       $(MAKE) -C $(dir $@)/.. default
+# Piss off.  Use MODULE_LIBS
+#
+# UGH. fucks up if $(outdir) not created.
+#
+#%/$(outdir)/library.a:
+#      $(MAKE) -C $(dir $@)/.. default