EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some more build system cleanup

Browse Source 
SVN-Revision: 12329
This commit is contained in:
Felix Fietkau 2008-08-17 11:14:13 +00:00
parent a74bb3b417
commit bdb9c7351c
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/subdir.mk
View File

@ -28,8 +28,7 @@ define subdir
$(call warn,$(1),d,BD $(1)/$(bd)) $(call warn,$(1),d,BD $(1)/$(bd))
$(foreach target,$(SUBTARGETS), $(foreach target,$(SUBTARGETS),
$(call warn_eval,$(1)/$(bd),t,T,$(1)/$(bd)/$(target): $(if $(QUILT),,$($(1)/$(bd)/$(target)) $(call $(1)//$(target),$(1)/$(bd)))) $(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) \ +$$(SUBMAKE) -C $(1)/$(bd) $(target) $(if $(findstring $(bd),$($(1)/builddirs-ignore-$(target))), || $(call MESSAGE, ERROR: $(1)/$(bd) failed to build.))
-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)) $$(if $(call debug,$(1)/$(bd),v),,.SILENT: $(1)/$(bd)/$(target))
# legacy targets # legacy targets

1
target/Makefile
View File

@ -6,7 +6,6 @@
# #
curdir:=target curdir:=target
$(curdir)/builddirs-parallel:=linux
$(curdir)/builddirs:=linux sdk imagebuilder $(curdir)/builddirs:=linux sdk imagebuilder
$(curdir)/builddirs-default:=linux $(curdir)/builddirs-default:=linux
$(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder) $(curdir)/builddirs-install:=linux $(if $(CONFIG_SDK),sdk) $(if $(CONFIG_IB),imagebuilder)

2
target/imagebuilder/Makefile
View File

@ -10,6 +10,8 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/host.mk
override MAKEFLAGS=
PKG_OS:=$(shell uname -s) PKG_OS:=$(shell uname -s)
PKG_CPU:=$(shell uname -m | sed "s/ //g") PKG_CPU:=$(shell uname -m | sed "s/ //g")

2
target/sdk/Makefile
View File

@ -10,6 +10,8 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/host.mk
override MAKEFLAGS=
PKG_OS:=$(shell uname -s) PKG_OS:=$(shell uname -s)
PKG_CPU:=$(shell uname -m) PKG_CPU:=$(shell uname -m)