Commit 6243571c authored by Sam Ravnborg's avatar Sam Ravnborg

kbuild: Got rid of $(call descend ...) in top-level Makefile

Replaced by the more readable $(Q)$(MAKE) construct
parent b6ebbc09
...@@ -195,7 +195,7 @@ scripts/docproc scripts/fixdep scripts/split-include : scripts ; ...@@ -195,7 +195,7 @@ scripts/docproc scripts/fixdep scripts/split-include : scripts ;
.PHONY: scripts .PHONY: scripts
scripts: scripts:
+@$(call descend,scripts,) +@$(Q)$(MAKE) -f scripts/Makefile.build obj=scripts
# Objects we will link into vmlinux / subdirs we need to visit # Objects we will link into vmlinux / subdirs we need to visit
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -314,7 +314,7 @@ define rule_vmlinux__ ...@@ -314,7 +314,7 @@ define rule_vmlinux__
echo ' Generating build number' echo ' Generating build number'
. scripts/mkversion > .tmp_version . scripts/mkversion > .tmp_version
mv -f .tmp_version .version mv -f .tmp_version .version
+$(call descend,init,) $(Q)$(MAKE) -f scripts/Makefile.build obj=init
) )
$(call cmd,vmlinux__) $(call cmd,vmlinux__)
echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
...@@ -373,7 +373,7 @@ $(sort $(vmlinux-objs)): $(SUBDIRS) ; ...@@ -373,7 +373,7 @@ $(sort $(vmlinux-objs)): $(SUBDIRS) ;
.PHONY: $(SUBDIRS) .PHONY: $(SUBDIRS)
$(SUBDIRS): .hdepend prepare $(SUBDIRS): .hdepend prepare
+$(call descend,$@,) $(Q)$(MAKE) -f scripts/Makefile.build obj=$@
# Things we need done before we descend to build or make # Things we need done before we descend to build or make
# module versions are listed in "prepare" # module versions are listed in "prepare"
...@@ -396,17 +396,17 @@ targets += arch/$(ARCH)/vmlinux.lds.s ...@@ -396,17 +396,17 @@ targets += arch/$(ARCH)/vmlinux.lds.s
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
%.s: %.c scripts FORCE %.s: %.c scripts FORCE
+@$(call descend,$(@D),$@) $(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
%.i: %.c scripts FORCE %.i: %.c scripts FORCE
+@$(call descend,$(@D),$@) $(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
%.o: %.c scripts FORCE %.o: %.c scripts FORCE
+@$(call descend,$(@D),$@) $(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
%.lst: %.c scripts FORCE %.lst: %.c scripts FORCE
+@$(call descend,$(@D),$@) $(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
%.s: %.S scripts FORCE %.s: %.S scripts FORCE
+@$(call descend,$(@D),$@) $(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
%.o: %.S scripts FORCE %.o: %.S scripts FORCE
+@$(call descend,$(@D),$@) $(Q)$(MAKE) -f scripts/Makefile.build obj=$(@D) $@
# FIXME: The asm symlink changes when $(ARCH) changes. That's # FIXME: The asm symlink changes when $(ARCH) changes. That's
# hard to detect, but I suppose "make mrproper" is a good idea # hard to detect, but I suppose "make mrproper" is a good idea
...@@ -648,11 +648,11 @@ ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) ...@@ -648,11 +648,11 @@ ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
make_with_config make_with_config
xconfig: xconfig:
+@$(call descend,scripts,scripts/kconfig.tk) $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts scripts/kconfig.tk
wish -f scripts/kconfig.tk wish -f scripts/kconfig.tk
menuconfig: menuconfig:
+@$(call descend,scripts,lxdialog) $(Q)$(MAKE) -f scripts/Makefile.build obj=scripts lxdialog
$(CONFIG_SHELL) $(src)/scripts/Menuconfig arch/$(ARCH)/config.in $(CONFIG_SHELL) $(src)/scripts/Menuconfig arch/$(ARCH)/config.in
config: config:
...@@ -808,7 +808,7 @@ help: ...@@ -808,7 +808,7 @@ help:
# Documentation targets # Documentation targets
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
sgmldocs psdocs pdfdocs htmldocs: scripts sgmldocs psdocs pdfdocs htmldocs: scripts
+@$(call descend,Documentation/DocBook,$@) $(Q)$(MAKE) -f Documentation/DocBook/Makefile $@
# Scripts to check various things for consistency # Scripts to check various things for consistency
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -894,9 +894,4 @@ define update-if-changed ...@@ -894,9 +894,4 @@ define update-if-changed
fi fi
endef endef
# $(call descend,<dir>,<target>)
# Recursively call a sub-make in <dir> with target <target>
descend = $(Q)$(MAKE) -f scripts/Makefile.build obj=$(1) $(2)
FORCE: FORCE:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment