kbuild: fix make -jN warnings

If you hide the sub-make in a function, 'make' needs a little help...

diff --git a/Makefile b/Makefile
index ce499cba9376a590247727dc7ff15e73fbcfe400..0397fee4dfaaa15b9df2d84a503793a930e6242c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ scripts/docproc scripts/fixdep scripts/split-include : scripts ;
 
 .PHONY: scripts
 scripts:
-       @$(call descend,scripts,)
+       +@$(call descend,scripts,)
 
 # Objects we will link into vmlinux / subdirs we need to visit
 # ---------------------------------------------------------------------------
@@ -374,7 +374,7 @@ $(sort $(vmlinux-objs)): $(SUBDIRS) ;
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS): .hdepend prepare
-       @$(call descend,$@,)
+       +@$(call descend,$@,)
 
 #      Things we need done before we descend to build or make
 #      module versions are listed in "prepare"
@@ -397,17 +397,17 @@ targets += arch/$(ARCH)/vmlinux.lds.s
 # ---------------------------------------------------------------------------
 
 %.s: %.c FORCE
-       @$(call descend,$(@D),$(@F))
+       +@$(call descend,$(@D),$(@F))
 %.i: %.c FORCE
-       @$(call descend,$(@D),$(@F))
+       +@$(call descend,$(@D),$(@F))
 %.o: %.c FORCE
-       @$(call descend,$(@D),$(@F))
+       +@$(call descend,$(@D),$(@F))
 %.lst: %.c FORCE
-       @$(call descend,$(@D),$(@F))
+       +@$(call descend,$(@D),$(@F))
 %.s: %.S FORCE
-       @$(call descend,$(@D),$(@F))
+       +@$(call descend,$(@D),$(@F))
 %.o: %.S FORCE
-       @$(call descend,$(@D),$(@F))
+       +@$(call descend,$(@D),$(@F))
 
 #      FIXME: The asm symlink changes when $(ARCH) changes. That's
 #      hard to detect, but I suppose "make mrproper" is a good idea
@@ -492,7 +492,7 @@ include/linux/modversions.h: scripts/fixdep prepare FORCE
        $(update-if-changed)
 
 $(patsubst %,_sfdep_%,$(SUBDIRS)): FORCE
-       @$(call descend,$(patsubst _sfdep_%,%,$@),fastdep)
+       +@$(call descend,$(patsubst _sfdep_%,%,$@),fastdep)
 
 else # !CONFIG_MODVERSIONS
 
@@ -544,7 +544,7 @@ _modinst_post:
 
 .PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
 $(patsubst %, _modinst_%, $(SUBDIRS)) :
-       @$(call descend,$(patsubst _modinst_%,%,$@),modules_install)
+       +@$(call descend,$(patsubst _modinst_%,%,$@),modules_install)
 
 else # CONFIG_MODULES
 
@@ -642,11 +642,11 @@ ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
        make_with_config
 
 xconfig:
-       @$(call descend,scripts,scripts/kconfig.tk)
+       +@$(call descend,scripts,scripts/kconfig.tk)
        wish -f scripts/kconfig.tk
 
 menuconfig:
-       @$(call descend,scripts,lxdialog)
+       +@$(call descend,scripts,lxdialog)
        $(CONFIG_SHELL) $(src)/scripts/Menuconfig arch/$(ARCH)/config.in
 
 config:
@@ -732,7 +732,7 @@ clean:      archclean
                -name .\*.tmp -o -name .\*.d \) -type f -print \
                | grep -v lxdialog/ | xargs rm -f
        @rm -f $(CLEAN_FILES)
-       @$(call descend,Documentation/DocBook,clean)
+       +@$(call descend,Documentation/DocBook,clean)
 
 mrproper: clean archmrproper
        @echo 'Making mrproper'
@@ -741,8 +741,8 @@ mrproper: clean archmrproper
                -type f -print | xargs rm -f
        @rm -rf $(MRPROPER_DIRS)
        @rm -f $(MRPROPER_FILES)
-       @$(call descend,scripts,mrproper)
-       @$(call descend,Documentation/DocBook,mrproper)
+       +@$(call descend,scripts,mrproper)
+       +@$(call descend,Documentation/DocBook,mrproper)
 
 distclean: mrproper
        @echo 'Making distclean'
@@ -829,7 +829,7 @@ help:
 # Documentation targets
 # ---------------------------------------------------------------------------
 sgmldocs psdocs pdfdocs htmldocs: scripts
-       @$(call descend,Documentation/DocBook,$@)
+       +@$(call descend,Documentation/DocBook,$@)
 
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------

diff --git a/Rules.make b/Rules.make
index f5e14435329a12187ee3086d20f9a2348a276699..3da6174f3d258a42dce27ae8a7b0f5304a5b5b69 100644 (file)
--- a/Rules.make
+++ b/Rules.make
@@ -482,7 +482,7 @@ cmd_gzip = gzip -f -9 < $< > $@
 .PHONY: $(subdir-ym)
 
 $(subdir-ym):
-       @$(call descend,$@,$(MAKECMDGOALS))
+       +@$(call descend,$@,$(MAKECMDGOALS))
 
 # Add FORCE to the prequisites of a target to force it to be always rebuilt.
 # ---------------------------------------------------------------------------

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 030cde7c91ca66ba393e0f52945bf03879c98739..c29bbe303c2ba08f654530cf6875b400fe9570fd 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -71,20 +71,20 @@ BOOTIMAGE=arch/i386/boot/bzImage
 zImage zlilo zdisk: BOOTIMAGE=arch/i386/boot/zImage
 
 zImage bzImage: vmlinux
-       @$(call makeboot,$(BOOTIMAGE))
+       +@$(call makeboot,$(BOOTIMAGE))
 
 compressed: zImage
 
 zlilo bzlilo: vmlinux
-       @$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) zlilo)
+       +@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) zlilo)
 
 zdisk bzdisk: vmlinux
-       @$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) zdisk)
+       +@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) zdisk)
 
 install: vmlinux
-       @$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) install)
+       +@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) install)
 
 archclean:
-       @$(call makeboot,clean)
+       +@$(call makeboot,clean)
 
 archmrproper:

diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index f0019d1a5317d1c3e3a5a31be5c3670e8383ab63..ef72d2e04650e9ea4eb1ab5fa5a3b7879bb585a6 100644 (file)
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -62,7 +62,7 @@ $(obj)/setup $(obj)/bootsect: %: %.o FORCE
        $(call if_changed,ld)
 
 $(obj)/compressed/vmlinux: FORCE
-       @$(call descend,$(obj)/compressed,IMAGE_OFFSET=$(IMAGE_OFFSET) \
+       +@$(call descend,$(obj)/compressed,IMAGE_OFFSET=$(IMAGE_OFFSET) \
                $(obj)/compressed/vmlinux)
 
 
@@ -83,7 +83,7 @@ clean:
        @echo 'Cleaning up (boot)'
        @rm -f $(addprefix $(obj)/,tools/build vmlinux.bin bvmlinux.bin \
                bootsect zImage bsetup bbootsect bzImage)
-       @$(call descend,$(obj)/compressed) clean
+       +@$(call descend,$(obj)/compressed) clean
 
 archhelp:
        @echo  '* bzImage       - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'