* stepmake/stepmake/generic-vars.make (LOOP): Add PLUS to keep -j

[lilypond.git] / stepmake / stepmake / generic-vars.make

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 48b1c90edefb680f4afb2a84e93d01456381e568..2d36dd8435a99c0753c54e728c00d53e4f7085d0 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -38,6 +38,9 @@ step-bindir = $(stepmake)/bin
 # stepmake package support.
 DEPTH = $(depth)/$(package-depth)
 
+INSTALLPY=$(PYTHON) $(step-bindir)/install.py -c
+INSTALL=$(INSTALLPY)
+
 group-dir = $(shell cd $(DEPTH);pwd)/..
 release-dir = $(group-dir)/releases
 patch-dir = $(group-dir)/patches
@@ -72,18 +75,18 @@ INCLUDES = $(src-dir)/include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES
 
 M4 = m4
 
-DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(src-wildcard,SConscript) $(wildcard SConscript)
+DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SConscript)
 DOCDIR=$(depth)/$(outdir)
 
 #?
-STRIPDEBUG=true 
+STRIPDEBUG=true
 STRIP=strip --strip-debug
 DO_STRIP=true
 
-LOOP=$(foreach i,  $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C $(i) $@ &&) true
+LOOP=+$(foreach i, $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C $(i) $@ &&) true
 
 ETAGS_FLAGS =
-CTAGS_FLAGS = 
+CTAGS_FLAGS =
 
 makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%))))
 
@@ -98,9 +101,15 @@ ALL_SOURCES = $(SOURCE_FILES)
 # Check if we are building for Cygwin
 #
 HOST_ARCH=$(shell $(CC) -dumpmachine)
-ifeq ($(HOST_ARCH),i686-pc-cygwin)
+
+ifeq (cygwin,$(findstring cygwin,$(HOST_ARCH)))
 CYGWIN_BUILD = yes
 endif
-ifeq ($(HOST_ARCH),i686-cygwin)
-CYGWIN_BUILD = yes
+
+ifeq (mingw,$(findstring mingw,$(HOST_ARCH)))
+MINGW_BUILD = yes
+endif
+
+ifeq (darwin,$(findstring darwin,$(HOST_ARCH)))
+DARWIN_BUILD = yes
 endif