summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-03 18:30:00 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-03 18:30:00 +0000
commit26a4bd4099c0d2e39c6e86099645f31e64ffcdf9 (patch)
tree5f7ee957a630e68643fae8e09fccc3b8c37e791f
parent569469732686781aefa920944fa95495e1210c73 (diff)
clean up smp compiles
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4428 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/Makefile20
1 files changed, 13 insertions, 7 deletions
diff --git a/package/Makefile b/package/Makefile
index c2015b3a41..b9392c0490 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -19,22 +19,22 @@ $(STAMP_DIR) $(TARGET_DIR):
mkdir -p $@
%-prereq: $(STAMP_DIR) $(TARGET_DIR)
- $(MAKE) -C $(patsubst %-prereq,%,$@) prereq MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+ $(MAKE) -C $(patsubst %-prereq,%,$@) prereq
%-download: $(STAMP_DIR) $(TARGET_DIR)
- $(MAKE) -C $(patsubst %-download,%,$@) download MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+ $(MAKE) -C $(patsubst %-download,%,$@) download
%-prepare: $(STAMP_DIR) $(TARGET_DIR)
- $(MAKE) -C $(patsubst %-prepare,%,$@) prepare MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
%-compile: $(STAMP_DIR) $(TARGET_DIR)
- $(MAKE) -C $(patsubst %-compile,%,$@) compile MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+ $(MAKE) -C $(patsubst %-compile,%,$@) compile
%-install: $(STAMP_DIR) $(TARGET_DIR)
- $(MAKE) -C $(patsubst %-install,%,$@) install MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+ $(MAKE) -C $(patsubst %-install,%,$@) install
%-clean: $(STAMP_DIR) $(TARGET_DIR)
- $(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)"
+ $(MAKE) -C $(patsubst %-clean,%,$@) clean
ifeq ($(SDK),1)
GENDEP_OPTS := -s
@@ -49,7 +49,7 @@ prereq: $(PREREQ_PACKAGES)
download: $(DOWNLOAD_PACKAGES)
compile-targets: $(COMPILE_PACKAGES)
compile:
- $(MAKE) -j$(CONFIG_JLEVEL) compile-targets
+ $(MAKE) compile-targets
install-targets: base-files-install $(INSTALL_PACKAGES)
install:
rm -rf $(BUILD_DIR)/root
@@ -60,3 +60,9 @@ index: $(PACKAGE_DIR)/Packages
$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
(cd $(PACKAGE_DIR); $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages)
+
+ifeq ($(MAKECMDGOALS),compile-targets)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif