[PATCH] arm64: clean up tools Makefile

Masahiro Yamada posted 1 patch 4 years, 3 months ago
arch/arm64/tools/Makefile | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
[PATCH] arm64: clean up tools Makefile
Posted by Masahiro Yamada 4 years, 3 months ago
Remove unused gen-y.

Remove redundant $(shell ...) because 'mkdir' is done in cmd_gen_cpucaps.

Replace $(filter-out $(PHONY), $^) with the $(real-prereqs) shorthand.

The '&&' in cmd_gen_cpucaps should be replaced with ';' because it is
run under 'set -e' environment.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/arm64/tools/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/tools/Makefile b/arch/arm64/tools/Makefile
index 932b4fe5c768..cf1307188150 100644
--- a/arch/arm64/tools/Makefile
+++ b/arch/arm64/tools/Makefile
@@ -5,18 +5,14 @@ kapi := $(gen)/asm
 
 kapi-hdrs-y := $(kapi)/cpucaps.h
 
-targets += $(addprefix ../../../,$(gen-y) $(kapi-hdrs-y))
+targets += $(addprefix ../../../, $(kapi-hdrs-y))
 
 PHONY += kapi
 
-kapi:   $(kapi-hdrs-y) $(gen-y)
-
-# Create output directory if not already present
-_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+kapi:   $(kapi-hdrs-y)
 
 quiet_cmd_gen_cpucaps = GEN     $@
-      cmd_gen_cpucaps = mkdir -p $(dir $@) && \
-                     $(AWK) -f $(filter-out $(PHONY),$^) > $@
+      cmd_gen_cpucaps = mkdir -p $(dir $@); $(AWK) -f $(real-prereqs) > $@
 
 $(kapi)/cpucaps.h: $(src)/gen-cpucaps.awk $(src)/cpucaps FORCE
 	$(call if_changed,gen_cpucaps)
-- 
2.32.0
Re: [PATCH] arm64: clean up tools Makefile
Posted by Will Deacon 4 years, 3 months ago
On Sun, 27 Feb 2022 17:52:32 +0900, Masahiro Yamada wrote:
> Remove unused gen-y.
> 
> Remove redundant $(shell ...) because 'mkdir' is done in cmd_gen_cpucaps.
> 
> Replace $(filter-out $(PHONY), $^) with the $(real-prereqs) shorthand.
> 
> The '&&' in cmd_gen_cpucaps should be replaced with ';' because it is
> run under 'set -e' environment.
> 
> [...]

Applied to arm64 (for-next/misc), thanks!

[1/1] arm64: clean up tools Makefile
      https://git.kernel.org/arm64/c/819a47d24b61

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev