diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-08-17 11:14:13 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-08-17 11:14:13 +0000 |
| commit | bdb9c7351ce20a84c4aca2139d1526e57a828b70 (patch) | |
| tree | e524313fd5211d7d2ba00520d2c162e21d44344f | |
| parent | a74bb3b4173ed5cd86bece29312c2103bd79dc37 (diff) | |
| download | master-31e0f0ae-bdb9c7351ce20a84c4aca2139d1526e57a828b70.tar.gz master-31e0f0ae-bdb9c7351ce20a84c4aca2139d1526e57a828b70.tar.bz2 master-31e0f0ae-bdb9c7351ce20a84c4aca2139d1526e57a828b70.zip | |
some more build system cleanup
SVN-Revision: 12329
| -rw-r--r-- | include/subdir.mk | 3 | ||||
| -rw-r--r-- | target/Makefile | 1 | ||||
| -rw-r--r-- | target/imagebuilder/Makefile | 2 | ||||
| -rw-r--r-- | target/sdk/Makefile | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index 4fa1bdfd52..3bf1a4bb79 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -28,8 +28,7 @@ define subdir $(call warn,$(1),d,BD $(1)/$(bd)) $(foreach target,$(SUBTARGETS), $(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))) - +$(if $(findstring $(bd),$($(1)/builddirs-parallel)),$$(SUBMAKE),$(_SINGLE)$$(SUBMAKE) -j1) \ - -C $(1)/$(bd) $(target) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.)) + +$$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.)) $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target)) # legacy targets diff --git a/target/Makefile b/target/Makefile index 4c746e2f00..3d36d26718 100644 --- a/target/Makefile +++ b/target/Makefile @@ -6,7 +6,6 @@ # curdir:=target -$(curdir)/builddirs-parallel:=linux $(curdir)/builddirs:=linux sdk imagebuilder $(curdir)/builddirs-default:=linux $(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index dcd5ca82cc..8a3ac7fed9 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -10,6 +10,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk +override MAKEFLAGS= + PKG_OS:=$(shell uname -s) PKG_CPU:=$(shell uname -m | sed "s/ //g") diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 05ae321616..de00da825b 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -10,6 +10,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/host.mk +override MAKEFLAGS= + PKG_OS:=$(shell uname -s) PKG_CPU:=$(shell uname -m) |