aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-18 19:00:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-18 19:00:05 +0000
commit6a2879bfe766bdc09d26980d5dcdedfeee2055a5 (patch)
treecbcff442f83686af3d623f89d23343330d1e2f35
parent5884dd62545fad411d59aa12b6933c3bf44a0d7e (diff)
downloadupstream-6a2879bfe766bdc09d26980d5dcdedfeee2055a5.tar.gz
upstream-6a2879bfe766bdc09d26980d5dcdedfeee2055a5.tar.bz2
upstream-6a2879bfe766bdc09d26980d5dcdedfeee2055a5.zip
improve parallel building
SVN-Revision: 5208
-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 a3c714c688..251e985e8b 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 732911215e..b640405ddc 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 c8fad23236..eeadde2ed6 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