- add Makefile.in

Makefile

@@ -196,6 +196,9 @@ everything: $(shell find package/*/*.mk -type f | cut -d'/' -f2 | sort | uniq)
 # -----------------------------------------------------------------------------
 
 -include config.local
+
+include package/Makefile.in
+
 include make/environment-box.mk
 include make/environment-linux.mk
 include make/environment-build.mk

make/environment-build.mk

@@ -8,24 +8,6 @@ export LD_LIBRARY_PATH
 
 # -----------------------------------------------------------------------------
 
-ifndef MAKE
-MAKE := make
-endif
-ifndef HOSTMAKE
-HOSTMAKE = $(MAKE)
-endif
-HOSTMAKE := $(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
-
-PARALLEL_JOBS := $(shell echo \
-	$$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
-
-MAKE1 := $(HOSTMAKE) -j1
-override MAKE = $(HOSTMAKE) \
-	$(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS))
-
-MAKEFLAGS += --no-print-directory
-#MAKEFLAGS += --silent
-
 TARGET_VENDOR = NI-Buildsystem
 
 TARGET_OS = linux
@@ -442,10 +424,6 @@ NINJA_INSTALL = DESTDIR=$(TARGET_DIR) \
 
 # -----------------------------------------------------------------------------
 
-include package/Makefile
-
-# -----------------------------------------------------------------------------
-
 GITHUB			= https://github.com
 GITHUB_SSH		= git@github.com
 BITBUCKET		= https://bitbucket.org

package/Makefile

@@ -1,3 +0,0 @@
-
-include package/pkg-autotools.mk
-include package/pkg-cmake.mk

package/Makefile.in

@@ -0,0 +1,29 @@
+ifndef MAKE
+MAKE := make
+endif
+ifndef HOSTMAKE
+HOSTMAKE = $(MAKE)
+endif
+HOSTMAKE := $(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make)
+
+# If BS_JLEVEL is 0, scale the maximum concurrency with the number of
+# CPUs. An additional job is used in order to keep processors busy
+# while waiting on I/O.
+# If the number of processors is not available, assume one.
+BS_JLEVEL ?= 0
+ifeq ($(BS_JLEVEL),0)
+PARALLEL_JOBS := $(shell echo \
+	$$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`)))
+else
+PARALLEL_JOBS := $(BS_JLEVEL)
+endif
+
+MAKE1 := $(HOSTMAKE) -j1
+override MAKE = $(HOSTMAKE) \
+	$(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS))
+
+MAKEFLAGS += --no-print-directory
+#MAKEFLAGS += --silent
+
+include package/pkg-autotools.mk
+include package/pkg-cmake.mk