X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fstepmake.make;h=604341be638c6b0d0ec55ed27a599ae38e6b26c8;hb=3332fc2677f9c8d472ebe4adf05cc742a0089432;hp=71dde6f7f8940545c24dae69154970129f927c47;hpb=858dbb5226b37cb180192e9f71b504428b7c28f3;p=lilypond.git

diff --git a/make/stepmake.make b/make/stepmake.make
index 71dde6f7f8..604341be63 100644
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -30,11 +30,10 @@ $(MAKE_TARGETS): scons
 scons:
 	@echo "warning: $(SCONS_USER) detected, rerouting to scons"
 	cd $(depth) && scons $(here) $(MAKECMDGOALS)
-	false 
+	false
 endif
 endif
 
-include $(depth)/make/toplevel-version.make
 
 # Use alternate configurations alongside eachother:
 #
@@ -62,25 +61,30 @@ endif
 ifdef config
   config_make=$(config)
 else
-  ifeq ($(builddir),)
-    config_make=$(depth)/config$(CONFIGSUFFIX).make
-  else
-    config_make=$(builddir)/config$(CONFIGSUFFIX).make
-  endif
+  config_make=$(depth)/config$(CONFIGSUFFIX).make
 endif
 
-ifeq ($(builddir),)
-  outroot=.
-else
-  outroot=$(builddir)$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
-endif
+outroot=.
 
 include $(config_make)
 
+include $(depth)/make/toplevel-version.make
+
+#
+# suggested settings
+#
+# CPU_COUNT=2   ## for SMP/Multicore machine
+# 
+-include $(depth)/local.make
+
+MICRO_VERSION=$(PATCH_LEVEL)
+BUILD_VERSION=1
+
+
 outdir=$(outroot)/$(outbase)
 
-# why not generic ?? 
-config_h=$(builddir)/config$(CONFIGSUFFIX).hh
+# why not generic ??
+config_h=$(top-build-dir)/config$(CONFIGSUFFIX).hh
 
 # The outdir that was configured for: best guess to find binaries
 outconfbase=out$(CONFIGSUFFIX)
@@ -91,7 +95,7 @@ stepdir = $(stepmake)/stepmake
 # for stepmake package
 # stepdir = $(depth)/stepmake
 
-STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) 
+STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES)
 LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 
 # Don't try to outsmart us, you puny computer!
@@ -113,13 +117,11 @@ all:
 
 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))
 
-# ugh. need to do this because of PATH :=$(topdir)/..:$(PATH) 
-include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES))) 
-
-
-include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES))) 
-include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) 
-include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES))) 
-include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES))) 
+# ugh. need to do this because of PATH :=$(top-src-dir)/..:$(PATH)
+include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES)))
 
 
+include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES)))
+include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES)))
+include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES)))
+include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES)))