patch::: 1.4.1.jcn2

[lilypond.git] / stepmake / make / stepmake.make

diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make
index 3c7dade6d78e94a61627123c8d5a7d907b42a066..f0fb538cab0e1c668ed4200955c423481de707ff 100644 (file)
--- a/stepmake/make/stepmake.make
+++ b/stepmake/make/stepmake.make
@@ -2,36 +2,76 @@
 
 include $(depth)/make/toplevel-version.make
 
-# Don't try to outsmart us, you puny computer!
-ifeq (0,${MAKELEVEL})
-  MAKE:=$(MAKE) --no-builtin-rules
+# Use alternate configurations alongside eachother:
+#
+#     ./configure --enable-config=debug
+#     make conf=debug
+#
+# uses config-debug.make and config-debug.h; output goes to out-debug.
+#
+ifdef conf
+  CONFIGSUFFIX=-$(conf)
 endif
-.SUFFIXES:
 
+# Use same configuration, but different output directory:
+#
+#     make out=www
+#
+# uses config.make and config.h; output goes to out-www.
+#
+ifdef out
+  outbase=out-$(out)
+else
+  outbase=out$(CONFIGSUFFIX)
+endif
 
-ifndef config
-  configuration=config
+ifdef config
+  configuration=$(config)
 else
-  configuration=config-$(config)
+  ifeq ($(builddir),.)
+    configuration=$(depth)/config$(CONFIGSUFFIX).make
+  else
+    # user package
+    configuration=$(depth)/$(builddir)/config$(CONFIGSUFFIX).make
+    # stepmake package
+    configuration=$(depth)/../$(builddir)/stepmake/config$(CONFIGSUFFIX).make
+  endif
 endif
 
-include $(depth)/$(configuration).make
+include $(configuration)
 
-ifdef CONFIGSUFFIX
-outdir=out-$(CONFIGSUFFIX)
+ifeq ($(builddir),.)
+  outroot=$(builddir)
 else
-outdir=out
+  outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
 endif
 
+outdir=$(outroot)/$(outbase)
+config_h=$(depth)/$(builddir)/config$(CONFIGSUFFIX).h
+
+# The outdir that was configured for: best guess to find binaries
+outconfbase=out$(CONFIGSUFFIX)
+outconfdir=$(outroot)/$(outconfbase)
+
 # user package
 # stepdir = $(stepmake)/stepmake
-# for stepmake packageg
+# for stepmake package
 stepdir = $(depth)/stepmake
 
 STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) 
 LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 
 
+# Don't try to outsmart us, you puny computer!
+# Well, UGH.  This only removes builtin rules from
+# subsequent $(MAKE)s, *not* from the current run!
+ifeq ($(BUILTINS_REMOVED),)
+  export BUILTINS_REMOVED = yes
+  MAKE:=$(MAKE) --no-builtin-rules
+  include $(stepdir)/no-builtin-rules.make
+endif
+.SUFFIXES:
+
 all:
 
 -include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(LOCALSTEPMAKE_TEMPLATES)))