Jelajahi Sumber

some more build system cleanup

SVN-Revision: 12329
Felix Fietkau 17 tahun lalu
induk
melakukan
bdb9c7351c
4 mengubah file dengan 5 tambahan dan 3 penghapusan
  1. 1 2
      include/subdir.mk
  2. 0 1
      target/Makefile
  3. 2 0
      target/imagebuilder/Makefile
  4. 2 0
      target/sdk/Makefile

+ 1 - 2
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

+ 0 - 1
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)

+ 2 - 0
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")
 

+ 2 - 0
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)