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>
---

diff --git a/Makefile b/Makefile
index 77198748ad71b455838cc6b4ac443e679c049a3c..7e4624a145867e2c43500d949c21e22d2ba86a50 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1356,11 +1356,6 @@ build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
 # $(Q)$(MAKE) $(clean)=dir
 clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj
 
-#      $(call descend,<dir>,<target>)
-#      Recursively call a sub-make in <dir> with target <target>
-# Usage is deprecated, because make does not see this as an invocation of make.
-descend =$(Q)$(MAKE) -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj=$(1) $(2)
-
 endif  # skip-makefile
 
 FORCE:

diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index a254aa9d49986eb2ff03137fa72bd96b99ba6949..58c9fa57ca67075cd52618974b120b577dcd3b69 100644 (file)
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -109,7 +109,7 @@ libs-y      += arch/m68knommu/lib/
 prepare: include/asm-$(ARCH)/asm-offsets.h
 
 archclean:
-       $(call descend arch/$(ARCH)/boot, subdirclean)
+       $(Q)$(MAKE) $(clean)=arch/m68knommu/boot
 
 include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
                                   include/asm include/linux/version.h \

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index bc1c44274a58a4f5e165d35384b1af13d08c8af1..26528b600b972c06b52ce47b8d22c537c7c47f8a 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -683,7 +683,7 @@ drivers-$(CONFIG_OPROFILE)  += arch/mips/oprofile/
 
 ifdef CONFIG_LASAT
 rom.bin rom.sw: vmlinux
-       $(call descend,arch/mips/lasat/image,$@)
+       $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@
 endif
 
 #

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 7cf75cc4f849dfe8a75a05a604809c2ec5a19bed..6e079f38a2c68026dddee4afe20c2cda498bb6da 100644 (file)
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -229,11 +229,6 @@ if_changed_rule = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
 
 cmd = @$(if $($(quiet)cmd_$(1)),echo '  $(subst ','\'',$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
 
-#      $(call descend,<dir>,<target>)
-#      Recursively call a sub-make in <dir> with target <target> 
-# Usage is deprecated, because make do not see this as an invocation of make.
-descend =$(Q)$(MAKE) -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj=$(1) $(2)
-
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
 # Usage:
 # $(Q)$(MAKE) $(build)=dir