diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-03-25 15:30:02 +0900 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-26 07:14:10 +0100 |
| commit | 2b16b858071764f5537c17262221a07e012a947a (patch) | |
| tree | 1954e7006cf738a5ab5743a7edf2d44a69527327 /scripts | |
| parent | 157e861aa6e93a72018c408e82863a3253550a4d (diff) | |
| download | barebox-2b16b858071764f5537c17262221a07e012a947a.tar.gz barebox-2b16b858071764f5537c17262221a07e012a947a.tar.xz | |
kbuild: remove clean-dirs syntax
[ Linux comit 1634f2bfdb846ed0a8b73131a9dff7c420fb3fe1 ]
The only the difference between clean-files and clean-dirs is the -r
option passed to the 'rm' command.
You can always pass -r, and then remove the clean-dirs syntax.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.clean | 15 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 2 |
2 files changed, 2 insertions, 15 deletions
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index 41712f8975..d1e4a7800e 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean @@ -46,28 +46,15 @@ __clean-files := $(wildcard \ $(addprefix $(obj)/, $(filter-out /%, $(__clean-files))) \ $(filter /%, $(__clean-files))) -# as clean-dirs is given relative to the current directory, this adds -# a $(obj) prefix, except for absolute paths - -__clean-dirs := $(wildcard \ - $(addprefix $(obj)/, $(filter-out /%, $(clean-dirs))) \ - $(filter /%, $(clean-dirs))) - # ========================================================================== quiet_cmd_clean = CLEAN $(obj) - cmd_clean = rm -f $(__clean-files) -quiet_cmd_cleandir = CLEAN $(__clean-dirs) - cmd_cleandir = rm -rf $(__clean-dirs) - + cmd_clean = rm -rf $(__clean-files) __clean: $(subdir-ymn) ifneq ($(strip $(__clean-files)),) +$(call cmd,clean) endif -ifneq ($(strip $(__clean-dirs)),) - +$(call cmd,cleandir) -endif @: diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 7656e1137b..bed7a5a2fb 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -114,7 +114,7 @@ testconfig: $(obj)/conf $(PYTHON3) -B -m pytest $(srctree)/$(src)/tests \ -o cache_dir=$(abspath $(obj)/tests/.cache) \ $(if $(findstring 1,$(KBUILD_VERBOSE)),--capture=no) -clean-dirs += tests/.cache +clean-files += tests/.cache # Help text used by make help help: |