aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.(none)>2005-07-25 08:51:08 -0400
committerSam Ravnborg <sam@mars.(none)>2005-07-25 08:51:08 -0400
commit7c6b155fb49fbc63e0b30a1d49552693c0b45be7 (patch)
tree55451f57b3963421522a2662bc3d537f6b58f5cd
parent43af5f23354dbd67d2fd2d523eefad8053ac388b (diff)
kbuild: drop descend - converting existing users
There was only two users left of descend. Fix them so they use $(clean)= and $(build)=. Drop definition of descend. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---
-rw-r--r--Makefile5
-rw-r--r--arch/m68knommu/Makefile2
-rw-r--r--arch/mips/Makefile2
-rw-r--r--scripts/Makefile.lib5
4 files changed, 2 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 77198748ad71..7e4624a14586 100644
--- a/Makefile
+++ b/Makefile
@@ -1356,11 +1356,6 @@ build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
1356# $(Q)$(MAKE) $(clean)=dir 1356# $(Q)$(MAKE) $(clean)=dir
1357clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj 1357clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
1358 1358
1359# $(call descend,<dir>,<target>)
1360# Recursively call a sub-make in <dir> with target <target>
1361# Usage is deprecated, because make does not see this as an invocation of make.
1362descend =$(Q)$(MAKE) -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj=$(1) $(2)
1363
1364endif # skip-makefile 1359endif # skip-makefile
1365 1360
1366FORCE: 1361FORCE:
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index a254aa9d4998..58c9fa57ca67 100644
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -109,7 +109,7 @@ libs-y += arch/m68knommu/lib/
109prepare: include/asm-$(ARCH)/asm-offsets.h 109prepare: include/asm-$(ARCH)/asm-offsets.h
110 110
111archclean: 111archclean:
112 $(call descend arch/$(ARCH)/boot, subdirclean) 112 $(Q)$(MAKE) $(clean)=arch/m68knommu/boot
113 113
114include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ 114include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
115 include/asm include/linux/version.h \ 115 include/asm include/linux/version.h \
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index bc1c44274a58..26528b600b97 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -683,7 +683,7 @@ drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/
683 683
684ifdef CONFIG_LASAT 684ifdef CONFIG_LASAT
685rom.bin rom.sw: vmlinux 685rom.bin rom.sw: vmlinux
686 $(call descend,arch/mips/lasat/image,$@) 686 $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@
687endif 687endif
688 688
689# 689#
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 7cf75cc4f849..6e079f38a2c6 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -229,11 +229,6 @@ if_changed_rule = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
229 229
230cmd = @$(if $($(quiet)cmd_$(1)),echo ' $(subst ','\'',$($(quiet)cmd_$(1)))' &&) $(cmd_$(1)) 230cmd = @$(if $($(quiet)cmd_$(1)),echo ' $(subst ','\'',$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
231 231
232# $(call descend,<dir>,<target>)
233# Recursively call a sub-make in <dir> with target <target>
234# Usage is deprecated, because make do not see this as an invocation of make.
235descend =$(Q)$(MAKE) -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj=$(1) $(2)
236
237# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj= 232# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
238# Usage: 233# Usage:
239# $(Q)$(MAKE) $(build)=dir 234# $(Q)$(MAKE) $(build)=dir