summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-18 19:00:05 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-18 19:00:05 +0000
commit9f03dd783ed007d16cdf7515a17d6277b8daeb03 (patch)
tree3775ecd28a8a1b6ff55b21ac0e8fc59bc3fc61b3
parent6c005dac22e0ed2d6bb02840fe3d3ea4ff8d7ef3 (diff)
improve parallel building
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5208 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel-build.mk4
-rw-r--r--toolchain/uClibc/Makefile2
-rw-r--r--tools/Makefile9
3 files changed, 11 insertions, 4 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index a3c714c68..251e985e8 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -85,7 +85,7 @@ else
endif
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
- $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
+ $(MAKE) -j$(CONFIG_JLEVEL) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
@@ -93,7 +93,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(LINUX_DIR)/.modules_done:
rm -rf $(KERNEL_BUILD_DIR)/modules
- $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
+ $(MAKE) -j$(CONFIG_JLEVEL) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
touch $(LINUX_DIR)/.modules_done
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 732911215..b640405dd 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -68,7 +68,7 @@ define Build/Configure
endef
define Build/Compile
- PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
+ PATH=$(TARGET_PATH) $(MAKE) -j $(CONFIG_JLEVEL) -C $(PKG_BUILD_DIR) \
PREFIX= \
DEVEL_PREFIX=/ \
RUNTIME_PREFIX=/ \
diff --git a/tools/Makefile b/tools/Makefile
index c8fad2323..eeadde2ed 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -16,7 +16,9 @@ TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
all: install
download: $(TARGETS_DOWNLOAD)
-install: $(TARGETS_INSTALL)
+install:
+ $(MAKE) install-targets
+install-targets: $(TARGETS_INSTALL)
clean: $(TARGETS_CLEAN)
squashfs-compile: lzma-install
@@ -58,3 +60,8 @@ $(TOOL_BUILD_DIR):
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
@rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-*
+ifeq ($(MAKECMDGOALS),install-targets)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif