From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 16 Dec 2007 02:17:00 +0000 (-0200)
Subject: Include local.make in all Makefiles.
X-Git-Tag: release/2.11.37-1~34^2~1^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0dc684b24df1dd038d93c45dca8e1fa22148a715;p=lilypond.git

Include local.make in all Makefiles.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 219af763fd..ec900d6f97 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -32,12 +32,6 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
-#
-# suggested settings
-#
-# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
-# 
-include local.make
 
 local-dist: dist-toplevel-txt-files 
 
@@ -239,3 +233,4 @@ test-redo:
 
 test-clean:
 	$(MAKE) -C input/regression/ out=test clean
+
diff --git a/make/stepmake.make b/make/stepmake.make
index 14d357cc8f..604341be63 100644
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -69,6 +69,14 @@ 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