|
@@ -7,10 +7,7 @@ src := $(obj)
|
|
|
PHONY := __clean
|
|
|
__clean:
|
|
|
|
|
|
-# Shorthand for $(Q)$(MAKE) scripts/Makefile.clean obj=dir
|
|
|
-# Usage:
|
|
|
-# $(Q)$(MAKE) $(clean)=dir
|
|
|
-clean := -f $(srctree)/scripts/Makefile.clean obj
|
|
|
+include scripts/Kbuild.include
|
|
|
|
|
|
# The filename Kbuild has precedence over Makefile
|
|
|
kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
|
|
@@ -50,19 +47,19 @@ __clean-files := $(extra-y) $(extra-m) $(extra-) \
|
|
|
|
|
|
__clean-files := $(filter-out $(no-clean-files), $(__clean-files))
|
|
|
|
|
|
-# as clean-files is given relative to the current directory, this adds
|
|
|
-# a $(obj) prefix, except for absolute paths
|
|
|
+# clean-files is given relative to the current directory, unless it
|
|
|
+# starts with $(objtree)/ (which means "./", so do not add "./" unless
|
|
|
+# you want to delete a file from the toplevel object directory).
|
|
|
|
|
|
__clean-files := $(wildcard \
|
|
|
- $(addprefix $(obj)/, $(filter-out /%, $(__clean-files))) \
|
|
|
- $(filter /%, $(__clean-files)))
|
|
|
+ $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(__clean-files))) \
|
|
|
+ $(filter $(objtree)/%, $(__clean-files)))
|
|
|
|
|
|
-# as clean-dirs is given relative to the current directory, this adds
|
|
|
-# a $(obj) prefix, except for absolute paths
|
|
|
+# same as clean-files
|
|
|
|
|
|
__clean-dirs := $(wildcard \
|
|
|
- $(addprefix $(obj)/, $(filter-out /%, $(clean-dirs))) \
|
|
|
- $(filter /%, $(clean-dirs)))
|
|
|
+ $(addprefix $(obj)/, $(filter-out $(objtree)/%, $(clean-dirs))) \
|
|
|
+ $(filter $(objtree)/%, $(clean-dirs)))
|
|
|
|
|
|
# ==========================================================================
|
|
|
|
|
@@ -78,9 +75,6 @@ ifneq ($(strip $(__clean-files)),)
|
|
|
endif
|
|
|
ifneq ($(strip $(__clean-dirs)),)
|
|
|
+$(call cmd,cleandir)
|
|
|
-endif
|
|
|
-ifneq ($(strip $(clean-rule)),)
|
|
|
- +$(clean-rule)
|
|
|
endif
|
|
|
@:
|
|
|
|
|
@@ -96,11 +90,6 @@ PHONY += $(subdir-ymn)
|
|
|
$(subdir-ymn):
|
|
|
$(Q)$(MAKE) $(clean)=$@
|
|
|
|
|
|
-# If quiet is set, only print short version of command
|
|
|
-
|
|
|
-cmd = @$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))' &&) $(cmd_$(1))
|
|
|
-
|
|
|
-
|
|
|
# Declare the contents of the .PHONY variable as phony. We keep that
|
|
|
# information in a variable se we can use it in if_changed and friends.
|
|
|
|