diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-23 20:56:35 +0300 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-23 20:56:35 +0300 |
commit | aeb8f932080d62cdc305a7ccca9d60de34908b30 (patch) | |
tree | f563df19e10e0d1fb5f8ab73902cc1d39f2ec177 /scripts/Makefile.clean | |
parent | caf1578aefe7ebbc22376737e91ffa29ac14a33f (diff) | |
parent | 9e6f3f472c8f95021ad048acc7cd3e40a827f8ce (diff) | |
download | linux-aeb8f932080d62cdc305a7ccca9d60de34908b30.tar.xz |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'scripts/Makefile.clean')
-rw-r--r-- | scripts/Makefile.clean | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index a651cee84f2a..b1c668dc6815 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean @@ -10,7 +10,7 @@ __clean: # Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir # Usage: # $(Q)$(MAKE) $(clean)=dir -clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj +clean := -f $(srctree)/scripts/Makefile.clean obj # The filename Kbuild has precedence over Makefile kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) @@ -23,15 +23,13 @@ __subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y))) subdir-y += $(__subdir-y) __subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m))) subdir-m += $(__subdir-m) -__subdir-n := $(patsubst %/,%,$(filter %/, $(obj-n))) -subdir-n += $(__subdir-n) __subdir- := $(patsubst %/,%,$(filter %/, $(obj-))) subdir- += $(__subdir-) # Subdirectories we need to descend into subdir-ym := $(sort $(subdir-y) $(subdir-m)) -subdir-ymn := $(sort $(subdir-ym) $(subdir-n) $(subdir-)) +subdir-ymn := $(sort $(subdir-ym) $(subdir-)) # Add subdir path |