share/mk/: Unify local variable names

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/share/mk/lint/c/checkpatch.mk b/share/mk/lint/c/checkpatch.mk
index a1a9f26305f2af3bd2cf52a137b7501dbf778f3a..05f815c03b7b180ce602a7e439375ab53705c624 100644 (file)
--- a/share/mk/lint/c/checkpatch.mk
+++ b/share/mk/lint/c/checkpatch.mk
@@ -16,32 +16,31 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .lint-c.checkpatch.touch
 xfail := $(MAKEFILEDIR)/lint/c/iwyu.xfail
 
-tgts := $(patsubst %, %$(ext), $(_EX_TU_src))
+tgts_EX := $(patsubst %, %$(ext), $(_EX_TU_src))
 ifeq ($(SKIP_XFAIL),yes)
-tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
+tgts_EX := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts_EX))
 endif
 
+tgts := $(tgts_EX)
 
-_LINT_c_EX_checkpatch   := $(tgts)
-_LINT_c_checkpatch      := $(_LINT_c_EX_checkpatch)
 
+$(tgts_EX): %.lint-c.checkpatch.touch: %
+$(tgts): $(CHECKPATCH_CONF) $(MK) | $$(@D)/
 
-$(_LINT_c_EX_checkpatch): %.lint-c.checkpatch.touch: %
-$(_LINT_c_checkpatch): $(CHECKPATCH_CONF) $(MK) | $$(@D)/
 
-
-$(_LINT_c_checkpatch):
+$(tgts):
        $(info  $(INFO_)CHECKPATCH      $@)
        $(CHECKPATCH) $(CHECKPATCHFLAGS_) -f $< >&2
        $(TOUCH) $@
 
 
 .PHONY: lint-c-checkpatch
-lint-c-checkpatch: $(_LINT_c_checkpatch);
+lint-c-checkpatch: $(tgts);
 
 
 undefine ext
 undefine xfail
+undefine tgts_EX
 undefine tgts
 
 

diff --git a/share/mk/lint/c/clang-tidy.mk b/share/mk/lint/c/clang-tidy.mk
index 7b1da57d05658fc35473d6c26d40c5cb39eff0d3..2d4d126393eb3cfd3b217dbbd120d7753c04b1f6 100644 (file)
--- a/share/mk/lint/c/clang-tidy.mk
+++ b/share/mk/lint/c/clang-tidy.mk
@@ -19,21 +19,19 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .lint-c.clang-tidy.touch
 xfail := $(MAKEFILEDIR)/lint/c/clang-tidy.xfail
 
-tgts := $(patsubst %, %$(ext), $(_EX_TU_src))
+tgts_EX := $(patsubst %, %$(ext), $(_EX_TU_src))
 ifeq ($(SKIP_XFAIL),yes)
-tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
+tgts_EX := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts_EX))
 endif
 
+tgts := $(tgts_EX)
 
-_LINT_c_EX_clang_tidy   := $(tgts)
-_LINT_c_clang_tidy      := $(_LINT_c_EX_clang_tidy)
 
+$(tgts_EX): %.lint-c.clang-tidy.touch: %
+$(tgts): $(CLANG_TIDY_CONF) $(MK) | $$(@D)/
 
-$(_LINT_c_EX_clang_tidy): %.lint-c.clang-tidy.touch: %
-$(_LINT_c_clang_tidy): $(CLANG_TIDY_CONF) $(MK) | $$(@D)/
 
-
-$(_LINT_c_clang_tidy):
+$(tgts):
        $(info  $(INFO_)CLANG_TIDY      $@)
        $(CLANG_TIDY) $(CLANG_TIDYFLAGS_) $< -- $(CLANGFLAGS_) $(CPPFLAGS_) 2>&1 \
        | $(SED) '/generated\.$$/d' >&2
@@ -41,11 +39,12 @@ $(_LINT_c_clang_tidy):
 
 
 .PHONY: lint-c-clang-tidy
-lint-c-clang-tidy: $(_LINT_c_clang_tidy);
+lint-c-clang-tidy: $(tgts);
 
 
 undefine ext
 undefine xfail
+undefine tgts_EX
 undefine tgts
 
 

diff --git a/share/mk/lint/c/cppcheck.mk b/share/mk/lint/c/cppcheck.mk
index 7708b4a5516cd2c3fdf114df05e399f5497be2b8..11270ba0947aa7c29d0e64dce9b21e7988a07d92 100644 (file)
--- a/share/mk/lint/c/cppcheck.mk
+++ b/share/mk/lint/c/cppcheck.mk
@@ -16,32 +16,31 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .lint-c.cppcheck.touch
 xfail := $(MAKEFILEDIR)/lint/c/cppcheck.xfail
 
-tgts := $(patsubst %, %$(ext), $(_EX_TU_src))
+tgts_EX := $(patsubst %, %$(ext), $(_EX_TU_src))
 ifeq ($(SKIP_XFAIL),yes)
-tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
+tgts_EX := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts_EX))
 endif
 
+tgts := $(tgts_EX)
 
-_LINT_c_EX_cppcheck   := $(tgts)
-_LINT_c_cppcheck      := $(_LINT_c_EX_cppcheck)
 
+$(tgts_EX): %.lint-c.cppcheck.touch: %
+$(tgts): $(CPPCHECK_SUPPRESS) $(MK) | $$(@D)/
 
-$(_LINT_c_EX_cppcheck): %.lint-c.cppcheck.touch: %
-$(_LINT_c_cppcheck): $(CPPCHECK_SUPPRESS) $(MK) | $$(@D)/
 
-
-$(_LINT_c_EX_cppcheck):
+$(tgts):
        $(info  $(INFO_)CPPCHECK        $@)
        $(CPPCHECK) $(CPPCHECKFLAGS_) $<
        $(TOUCH) $@
 
 
 .PHONY: lint-c-cppcheck
-lint-c-cppcheck: $(_LINT_c_cppcheck);
+lint-c-cppcheck: $(tgts);
 
 
 undefine ext
 undefine xfail
+undefine tgts_EX
 undefine tgts
 
 

diff --git a/share/mk/lint/c/cpplint.mk b/share/mk/lint/c/cpplint.mk
index 5dacee966c5b5a3ae871360ac62c7175d18796fd..43408c1ec124a1dece674f73ce51162dfda28b74 100644 (file)
--- a/share/mk/lint/c/cpplint.mk
+++ b/share/mk/lint/c/cpplint.mk
@@ -11,22 +11,26 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
 include $(MAKEFILEDIR)/configure/build-depends/cpplint/cpplint.mk
 
 
-_LINT_c_EX_cpplint   := $(patsubst %, %.lint-c.cpplint.touch, $(_EX_TU_src))
-_LINT_c_cpplint      := $(_LINT_c_EX_cpplint)
+tgts_EX := $(patsubst %, %.lint-c.cpplint.touch, $(_EX_TU_src))
+tgts    := $(tgts_EX)
 
 
-$(_LINT_c_EX_cpplint): %.lint-c.cpplint.touch: %
-$(_LINT_c_cpplint): $(CPPLINT_CONF) $(MK) | $$(@D)/
+$(tgts_EX): %.lint-c.cpplint.touch: %
+$(tgts): $(CPPLINT_CONF) $(MK) | $$(@D)/
 
 
-$(_LINT_c_cpplint):
+$(tgts):
        $(info  $(INFO_)CPPLINT         $@)
        $(CPPLINT) $(CPPLINTFLAGS_) $< >/dev/null
        $(TOUCH) $@
 
 
 .PHONY: lint-c-cpplint
-lint-c-cpplint: $(_LINT_c_cpplint);
+lint-c-cpplint: $(tgts);
+
+
+undefine tgts_EX
+undefine tgts
 
 
 endif  # include guard

diff --git a/share/mk/lint/c/iwyu.mk b/share/mk/lint/c/iwyu.mk
index 9de262574213217ce75a541552f4bc93a7c16862..0f34100970827ba716727571d468102c3cd10053 100644 (file)
--- a/share/mk/lint/c/iwyu.mk
+++ b/share/mk/lint/c/iwyu.mk
@@ -22,21 +22,19 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .lint-c.iwyu.touch
 xfail := $(MAKEFILEDIR)/lint/c/iwyu.xfail
 
-tgts := $(patsubst %, %$(ext), $(_EX_TU_src))
+tgts_EX := $(patsubst %, %$(ext), $(_EX_TU_src))
 ifeq ($(SKIP_XFAIL),yes)
-tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
+tgts_EX := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts_EX))
 endif
 
+tgts := $(tgts_EX)
 
-_LINT_c_EX_iwyu   := $(tgts)
-_LINT_c_iwyu      := $(_LINT_c_EX_iwyu)
 
+$(tgts_EX): %.lint-c.iwyu.touch: %
+$(tgts): $(MK) | $$(@D)/
 
-$(_LINT_c_EX_iwyu): %.lint-c.iwyu.touch: %
-$(_LINT_c_iwyu): $(MK) | $$(@D)/
 
-
-$(_LINT_c_iwyu):
+$(tgts):
        $(info  $(INFO_)IWYU            $@)
        ! ($(IWYU) $(IWYUFLAGS_) $(CLANGFLAGS_) $(CPPFLAGS_) $< 2>&1 \
           | $(SED) -n '/should add these lines:/,$$p' \
@@ -50,11 +48,12 @@ $(_LINT_c_iwyu):
 
 
 .PHONY: lint-c-iwyu
-lint-c-iwyu: $(_LINT_c_iwyu);
+lint-c-iwyu: $(tgts);
 
 
 undefine ext
 undefine xfail
+undefine tgts_EX
 undefine tgts
 
 

diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk
index e2054f5dbb598826130573cda51863dccdb72912..665fec4372c03297a3f45f3f487722b857dd1d20 100644 (file)
--- a/share/mk/lint/man/tbl.mk
+++ b/share/mk/lint/man/tbl.mk
@@ -15,10 +15,10 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 
 
-_LINT_man_tbl := $(patsubst %, %.lint-man.tbl.touch, $(_NONSO_MAN))
+tgts := $(patsubst %, %.lint-man.tbl.touch, $(_NONSO_MAN))
 
 
-$(_LINT_man_tbl): %.lint-man.tbl.touch: % $(MK) | $$(@D)/
+$(tgts): %.lint-man.tbl.touch: % $(MK) | $$(@D)/
        $(info  $(INFO_)GREP            $@)
        $(HEAD) -n1 <$< \
        | if $(GREP) '\\" t$$' >/dev/null; then \
@@ -46,7 +46,10 @@ $(_LINT_man_tbl): %.lint-man.tbl.touch: % $(MK) | $$(@D)/
 
 
 .PHONY: lint-man-tbl
-lint-man-tbl: $(_LINT_man_tbl);
+lint-man-tbl: $(tgts);
+
+
+undefine tgts
 
 
 endif  # include guard

diff --git a/share/mk/lint/sh/shellcheck.mk b/share/mk/lint/sh/shellcheck.mk
index 8c07bc40743298a06b3f8f0df664c38ca078142f..ad0e89459a73ac81a5fe01de72cfc51120b7b092 100644 (file)
--- a/share/mk/lint/sh/shellcheck.mk
+++ b/share/mk/lint/sh/shellcheck.mk
@@ -11,17 +11,20 @@ include $(MAKEFILEDIR)/configure/build-depends/shellcheck/shellcheck.mk
 include $(MAKEFILEDIR)/src/sh.mk
 
 
-_LINT_sh_shellcheck := $(patsubst $(SRCBINDIR)/%, $(builddir)/%.lint-sh.shellcheck.touch, $(BIN_sh))
+tgts := $(patsubst $(SRCBINDIR)/%, $(builddir)/%.lint-sh.shellcheck.touch, $(BIN_sh))
 
 
-$(_LINT_sh_shellcheck): $(builddir)/%.lint-sh.shellcheck.touch: $(SRCBINDIR)/% $(SHELLCHECK_CONF) $(MK) | $$(@D)/
+$(tgts): $(builddir)/%.lint-sh.shellcheck.touch: $(SRCBINDIR)/% $(SHELLCHECK_CONF) $(MK) | $$(@D)/
        $(info  $(INFO_)SHELLCHECK      $@)
        $(SHELLCHECK) $(SHELLCHECKFLAGS_) $<
        $(TOUCH) $@
 
 
 .PHONY: lint-sh-shellcheck
-lint-sh-shellcheck: $(_LINT_sh_shellcheck);
+lint-sh-shellcheck: $(tgts);
+
+
+undefine tgts
 
 
 endif  # include guard