From 0e0a6e95e895d295a50d121a4f3523939d3b78ad Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 4 Jan 2022 21:59:13 +0100 Subject: [PATCH] - add Makefile.in --- Makefile | 3 +++ make/environment-build.mk | 22 ---------------------- package/Makefile | 3 --- package/Makefile.in | 29 +++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 package/Makefile create mode 100644 package/Makefile.in diff --git a/Makefile b/Makefile index 5db224e1..ef8fbf6d 100755 --- a/Makefile +++ b/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 diff --git a/make/environment-build.mk b/make/environment-build.mk index 4b4067d6..3fcadbf0 100644 --- a/make/environment-build.mk +++ b/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 diff --git a/package/Makefile b/package/Makefile deleted file mode 100644 index ab7bc0df..00000000 --- a/package/Makefile +++ /dev/null @@ -1,3 +0,0 @@ - -include package/pkg-autotools.mk -include package/pkg-cmake.mk diff --git a/package/Makefile.in b/package/Makefile.in new file mode 100644 index 00000000..3bf73b7e --- /dev/null +++ b/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