share/mk/: Use $ext to simplify

This reduces differences between makefiles, and also makes each makefile
specify the file extension only once, which reduces mistakes.

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

diff --git a/share/mk/build/catman/eqn.mk b/share/mk/build/catman/eqn.mk
index e9457180ed720bdb7e6311c38223778d57551b5c..2e2968fbfaf8ddfec53c9a4f3e84790bbf8a1d60 100644 (file)
--- a/share/mk/build/catman/eqn.mk
+++ b/share/mk/build/catman/eqn.mk
@@ -12,10 +12,13 @@ include $(MAKEFILEDIR)/configure/build-depends/groff-base/eqn.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/nroff.mk
 
 
-_CATMAN_troff := $(patsubst %.eqn, %.cat.troff, $(_MAN_eqn))
+ext := .cat.troff
 
 
-$(_CATMAN_troff): %.cat.troff: %.eqn $(MK) | $$(@D)/
+_CATMAN_troff := $(patsubst %.eqn, %$(ext), $(_MAN_eqn))
+
+
+$(_CATMAN_troff): %$(ext): %.eqn $(MK) | $$(@D)/
        $(info  $(INFO_)EQN             $@)
        ! ($(EQN) -T$(NROFF_OUT_DEVICE) $(EQNFLAGS_) <$< 2>&1 >$@) \
        | $(GREP) ^ >&2
@@ -25,4 +28,7 @@ $(_CATMAN_troff): %.cat.troff: %.eqn $(MK) | $$(@D)/
 build-catman-eqn: $(_CATMAN_troff);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/catman/grotty.mk b/share/mk/build/catman/grotty.mk
index 61e35271d65438d71cb3523cdd5672a959ef56b9..ad626d0caabd369b82a946670693ca536479296b 100644 (file)
--- a/share/mk/build/catman/grotty.mk
+++ b/share/mk/build/catman/grotty.mk
@@ -10,10 +10,13 @@ include $(MAKEFILEDIR)/build/catman/troff.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/grotty.mk
 
 
-_CATMAN := $(patsubst %.cat.set, %.cat, $(_CATMAN_set))
+ext := .cat
 
 
-$(_CATMAN): %.cat: %.cat.set $(MK) | $$(@D)/
+_CATMAN := $(patsubst %.cat.set, %$(ext), $(_CATMAN_set))
+
+
+$(_CATMAN): %$(ext): %.cat.set $(MK) | $$(@D)/
        $(info  $(INFO_)GROTTY          $@)
        $(GROTTY) $(GROTTYFLAGS_) <$< >$@
 
@@ -22,4 +25,7 @@ $(_CATMAN): %.cat: %.cat.set $(MK) | $$(@D)/
 build-catman-grotty: $(_CATMAN);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk
index f8cc408467efb21dcffa01fdadef7531564fc5b1..c1623de929549a7a9e252866a621091d202cdf16 100644 (file)
--- a/share/mk/build/catman/troff.mk
+++ b/share/mk/build/catman/troff.mk
@@ -31,7 +31,7 @@ troff_catman_ignore_grep := $(MAKEFILEDIR)/build/catman/troff.ignore.grep
 _CATMAN_set := $(tgts)
 
 
-$(_CATMAN_set): %.cat.set: %.cat.troff $(troff_catman_ignore_grep) $(MK) | $$(@D)/
+$(_CATMAN_set): %$(ext): %.cat.troff $(troff_catman_ignore_grep) $(MK) | $$(@D)/
        $(info  $(INFO_)TROFF           $@)
        ! ($(TROFF) -mandoc $(TROFFFLAGS_) $(NROFFFLAGS_) <$< 2>&1 >$@ \
           | $(GREP) -v -f '$(troff_catman_ignore_grep)' \

diff --git a/share/mk/build/examples/cc.mk b/share/mk/build/examples/cc.mk
index db6380de54b6900e462736056426b966d50ec15e..e445aa426c0e813fff0b3b708035f39b9282e17a 100644 (file)
--- a/share/mk/build/examples/cc.mk
+++ b/share/mk/build/examples/cc.mk
@@ -25,7 +25,7 @@ endif
 _EX_TU_o := $(tgts)
 
 
-$(_EX_TU_o): %.o: %.c $(MK)
+$(_EX_TU_o): %$(ext): %.c $(MK)
        $(info  $(INFO_)CC              $@)
        $(CC) -c $(CFLAGS_) $(CPPFLAGS_) -o $@ $<
 

diff --git a/share/mk/build/html/post-grohtml.mk b/share/mk/build/html/post-grohtml.mk
index be679853c7108705ce8264929ad3dcf247723485..d55dacb319c7db8f90b3e13aa50cb5f7f22eed57 100644 (file)
--- a/share/mk/build/html/post-grohtml.mk
+++ b/share/mk/build/html/post-grohtml.mk
@@ -10,10 +10,13 @@ include $(MAKEFILEDIR)/build/html/troff.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff/post-grohtml.mk
 
 
-_HTMLMAN := $(patsubst %.html.set, %.html, $(_HTMLMAN_set))
+ext := .html
 
 
-$(_HTMLMAN): %.html: %.html.set $(MK) | $$(@D)/
+_HTMLMAN := $(patsubst %.html.set, %$(ext), $(_HTMLMAN_set))
+
+
+$(_HTMLMAN): %$(ext): %.html.set $(MK) | $$(@D)/
        $(info  $(INFO_)POST_GROHTML    $@)
        $(POST_GROHTML) $(POST_GROHTMLFLAGS_) <$< >$@
 
@@ -22,4 +25,7 @@ $(_HTMLMAN): %.html: %.html.set $(MK) | $$(@D)/
 build-html-post-grohtml: $(_HTMLMAN);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/html/troff.mk b/share/mk/build/html/troff.mk
index d6c2b933c247a631057a8e8e3cb85b35b66cef85..e2ff319385bacb3bd8396a2a96034c277c22c93c 100644 (file)
--- a/share/mk/build/html/troff.mk
+++ b/share/mk/build/html/troff.mk
@@ -26,7 +26,7 @@ endif
 _HTMLMAN_set  := $(tgts)
 
 
-$(_HTMLMAN_set): %.html.set: %.eqn $(MK) | $$(@D)/
+$(_HTMLMAN_set): %$(ext): %.eqn $(MK) | $$(@D)/
        $(info  $(INFO_)TROFF           $@)
        ! ($(TROFF) -mandoc -Thtml $(TROFFFLAGS_) <$< 2>&1 >$@) \
        | $(GREP) ^ >&2

diff --git a/share/mk/build/pdf/pages/eqn.mk b/share/mk/build/pdf/pages/eqn.mk
index 4e1cbf18eb7b095b40720f59034109943829863c..c826b98b1cc5ad521ce1533fa3ab3b73bd79ad3f 100644 (file)
--- a/share/mk/build/pdf/pages/eqn.mk
+++ b/share/mk/build/pdf/pages/eqn.mk
@@ -11,10 +11,13 @@ include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/eqn.mk
 
 
-_PDFMAN_troff := $(patsubst %.eqn, %.pdf.troff, $(_MAN_eqn))
+ext := .pdf.troff
 
 
-$(_PDFMAN_troff): %.pdf.troff: %.eqn $(MK) | $$(@D)/
+_PDFMAN_troff := $(patsubst %.eqn, %$(ext), $(_MAN_eqn))
+
+
+$(_PDFMAN_troff): %$(ext): %.eqn $(MK) | $$(@D)/
        $(info  $(INFO_)EQN             $@)
        ! ($(EQN) -Tpdf $(EQNFLAGS_) <$< 2>&1 >$@) \
        | $(GREP) ^ >&2
@@ -24,4 +27,7 @@ $(_PDFMAN_troff): %.pdf.troff: %.eqn $(MK) | $$(@D)/
 build-pdf-pages-eqn: $(_PDFMAN_troff);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/pdf/pages/gropdf.mk b/share/mk/build/pdf/pages/gropdf.mk
index 6c8acfbb25b997ef2480587dbe5306e79884e155..d9a46fb9f3799a5b1922660e4b98ceccbed4db0e 100644 (file)
--- a/share/mk/build/pdf/pages/gropdf.mk
+++ b/share/mk/build/pdf/pages/gropdf.mk
@@ -10,10 +10,13 @@ include $(MAKEFILEDIR)/build/pdf/pages/troff.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff/gropdf.mk
 
 
-_PDFMAN := $(patsubst %.pdf.set, %.pdf, $(_PDFMAN_set))
+ext := .pdf
 
 
-$(_PDFMAN): %.pdf: %.pdf.set $(MK) | $$(@D)/
+_PDFMAN := $(patsubst %.pdf.set, %$(ext), $(_PDFMAN_set))
+
+
+$(_PDFMAN): %$(ext): %.pdf.set $(MK) | $$(@D)/
        $(info  $(INFO_)GROPDF          $@)
        $(GROPDF) $(GROPDFFLAGS_) <$< >$@
 
@@ -22,4 +25,7 @@ $(_PDFMAN): %.pdf: %.pdf.set $(MK) | $$(@D)/
 build-pdf-pages-gropdf: $(_PDFMAN);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/pdf/pages/troff.mk b/share/mk/build/pdf/pages/troff.mk
index 1cd9790ce0c2eb0970dddd9ded9a871432855bb6..af1a0f6039bb711cdb248884e5be960008b921df 100644 (file)
--- a/share/mk/build/pdf/pages/troff.mk
+++ b/share/mk/build/pdf/pages/troff.mk
@@ -26,7 +26,7 @@ endif
 _PDFMAN_set  := $(tgts)
 
 
-$(_PDFMAN_set): %.pdf.set: %.pdf.troff $(MK) | $$(@D)/
+$(_PDFMAN_set): %$(ext): %.pdf.troff $(MK) | $$(@D)/
        $(info  $(INFO_)TROFF           $@)
        ! ($(TROFF) -mandoc -Tpdf $(TROFFFLAGS_) <$< 2>&1 >$@) \
        | $(GREP) ^ >&2

diff --git a/share/mk/build/pre/preconv.mk b/share/mk/build/pre/preconv.mk
index b827b77f041a69cc3bffa8c609d21a7b4d1b1e57..5b68d466f9b434db54c27f1fcc111b8b9b3f40d7 100644 (file)
--- a/share/mk/build/pre/preconv.mk
+++ b/share/mk/build/pre/preconv.mk
@@ -11,10 +11,13 @@ include $(MAKEFILEDIR)/build/man/mdoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/preconv.mk
 
 
-_MAN_tbl := $(patsubst %, %.tbl, $(_NONSO_MAN) $(_NONSO_MDOC))
+ext := .tbl
 
 
-$(_MAN_tbl): %.tbl: % $(MK) | $$(@D)/
+_MAN_tbl := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+
+
+$(_MAN_tbl): %$(ext): % $(MK) | $$(@D)/
        $(info  $(INFO_)PRECONV         $@)
        $(PRECONV) $(PRECONVFLAGS_) $< >$@
 
@@ -23,4 +26,7 @@ $(_MAN_tbl): %.tbl: % $(MK) | $$(@D)/
 build-pre-preconv: $(_MAN_tbl);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/pre/tbl.mk b/share/mk/build/pre/tbl.mk
index 77b9e2d072a69120033ed727e1d6758bc536f240..6033453c9bb8a9a5938b1ba61e4a26db7c3e4805 100644 (file)
--- a/share/mk/build/pre/tbl.mk
+++ b/share/mk/build/pre/tbl.mk
@@ -10,10 +10,13 @@ include $(MAKEFILEDIR)/build/pre/preconv.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/tbl.mk
 
 
-_MAN_eqn := $(patsubst %.tbl, %.eqn, $(_MAN_tbl))
+ext := .eqn
 
 
-$(_MAN_eqn): %.eqn: %.tbl $(MK) | $$(@D)/
+_MAN_eqn := $(patsubst %.tbl, %$(ext), $(_MAN_tbl))
+
+
+$(_MAN_eqn): %$(ext): %.tbl $(MK) | $$(@D)/
        $(info  $(INFO_)TBL             $@)
        $(TBL) <$< >$@
 
@@ -22,4 +25,7 @@ $(_MAN_eqn): %.eqn: %.tbl $(MK) | $$(@D)/
 build-pre-tbl: $(_MAN_eqn);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/ps/eqn.mk b/share/mk/build/ps/eqn.mk
index eec009cc859a1fbd685e248a1f6d69cf422ec53b..e9c91f15cb2cd36ba44392deacf6030c38a24f14 100644 (file)
--- a/share/mk/build/ps/eqn.mk
+++ b/share/mk/build/ps/eqn.mk
@@ -11,10 +11,13 @@ include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/eqn.mk
 
 
-_PSMAN_troff := $(patsubst %.eqn, %.ps.troff, $(_MAN_eqn))
+ext := .ps.troff
 
 
-$(_PSMAN_troff): %.ps.troff: %.eqn $(MK) | $$(@D)/
+_PSMAN_troff := $(patsubst %.eqn, %$(ext), $(_MAN_eqn))
+
+
+$(_PSMAN_troff): %$(ext): %.eqn $(MK) | $$(@D)/
        $(info  $(INFO_)EQN             $@)
        ! ($(EQN) -Tps $(EQNFLAGS_) <$< 2>&1 >$@) \
        | $(GREP) ^ >&2
@@ -24,4 +27,7 @@ $(_PSMAN_troff): %.ps.troff: %.eqn $(MK) | $$(@D)/
 build-ps-eqn: $(_PSMAN_troff);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/ps/grops.mk b/share/mk/build/ps/grops.mk
index eff8b13c7fef79bd9d93369a5865a8f9f54e7892..b4d359a781ca55d0765f8d3f78916642bebe4fbc 100644 (file)
--- a/share/mk/build/ps/grops.mk
+++ b/share/mk/build/ps/grops.mk
@@ -10,10 +10,13 @@ include $(MAKEFILEDIR)/build/ps/troff.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/grops.mk
 
 
-_PSMAN := $(patsubst %.ps.set, %.ps, $(_PSMAN_set))
+ext := .ps
 
 
-$(_PSMAN): %.ps: %.ps.set $(MK) | $$(@D)/
+_PSMAN := $(patsubst %.ps.set, %$(ext), $(_PSMAN_set))
+
+
+$(_PSMAN): %$(ext): %.ps.set $(MK) | $$(@D)/
        $(info  $(INFO_)GROPS           $@)
        $(GROPS) $(GROPSFLAGS_) <$< >$@
 
@@ -22,4 +25,7 @@ $(_PSMAN): %.ps: %.ps.set $(MK) | $$(@D)/
 build-ps-grops: $(_PSMAN);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/build/ps/troff.mk b/share/mk/build/ps/troff.mk
index 80f10163d97f70b142e7d0ba57e383e03f7177a2..960ae7a52477ebf0ee9d67c40a5cb7dcb390a26e 100644 (file)
--- a/share/mk/build/ps/troff.mk
+++ b/share/mk/build/ps/troff.mk
@@ -26,7 +26,7 @@ endif
 _PSMAN_set  := $(tgts)
 
 
-$(_PSMAN_set): %.ps.set: %.ps.troff $(MK) | $$(@D)/
+$(_PSMAN_set): %$(ext): %.ps.troff $(MK) | $$(@D)/
        $(info  $(INFO_)TROFF           $@)
        ! ($(TROFF) -mandoc -Tps $(TROFFFLAGS_) <$< 2>&1 >$@) \
        | $(GREP) ^ >&2

diff --git a/share/mk/check/catman/col.mk b/share/mk/check/catman/col.mk
index 786f456c92dffa3a3c5ec51d8c01cbdb5102d21f..fb4adba10a89d0b3a7b100f4560b76f0b5e33c72 100644 (file)
--- a/share/mk/check/catman/col.mk
+++ b/share/mk/check/catman/col.mk
@@ -10,10 +10,13 @@ include $(MAKEFILEDIR)/build/catman/grotty.mk
 include $(MAKEFILEDIR)/configure/build-depends/bsdextrautils/col.mk
 
 
-_CHECK_catman_grep := $(patsubst %.cat, %.cat.grep, $(_CATMAN))
+ext := .cat.grep
 
 
-$(_CHECK_catman_grep): %.grep: % $(MK) | $$(@D)/
+_CHECK_catman_grep := $(patsubst %.cat, %$(ext), $(_CATMAN))
+
+
+$(_CHECK_catman_grep): %$(ext): %.cat $(MK) | $$(@D)/
        $(info  $(INFO_)COL             $@)
        $(COL) $(COLFLAGS_) <$< >$@
 
@@ -22,4 +25,7 @@ $(_CHECK_catman_grep): %.grep: % $(MK) | $$(@D)/
 check-catman-col: $(_CHECK_catman_grep);
 
 
+undefine ext
+
+
 endif  # include guard

diff --git a/share/mk/lint/c/checkpatch.mk b/share/mk/lint/c/checkpatch.mk
index 05f815c03b7b180ce602a7e439375ab53705c624..5197290d57c4cc878976a1b8cd6ca123a375ef0c 100644 (file)
--- a/share/mk/lint/c/checkpatch.mk
+++ b/share/mk/lint/c/checkpatch.mk
@@ -24,7 +24,7 @@ endif
 tgts := $(tgts_EX)
 
 
-$(tgts_EX): %.lint-c.checkpatch.touch: %
+$(tgts_EX): %$(ext): %
 $(tgts): $(CHECKPATCH_CONF) $(MK) | $$(@D)/
 
 

diff --git a/share/mk/lint/c/clang-tidy.mk b/share/mk/lint/c/clang-tidy.mk
index 2d4d126393eb3cfd3b217dbbd120d7753c04b1f6..1f5dc5d2aa5a6a2a30b878ca6da8952785e3bee7 100644 (file)
--- a/share/mk/lint/c/clang-tidy.mk
+++ b/share/mk/lint/c/clang-tidy.mk
@@ -27,7 +27,7 @@ endif
 tgts := $(tgts_EX)
 
 
-$(tgts_EX): %.lint-c.clang-tidy.touch: %
+$(tgts_EX): %$(ext): %
 $(tgts): $(CLANG_TIDY_CONF) $(MK) | $$(@D)/
 
 

diff --git a/share/mk/lint/c/cppcheck.mk b/share/mk/lint/c/cppcheck.mk
index 11270ba0947aa7c29d0e64dce9b21e7988a07d92..1e54ef3baa876520b9bde20f05beb99d6c425eeb 100644 (file)
--- a/share/mk/lint/c/cppcheck.mk
+++ b/share/mk/lint/c/cppcheck.mk
@@ -24,7 +24,7 @@ endif
 tgts := $(tgts_EX)
 
 
-$(tgts_EX): %.lint-c.cppcheck.touch: %
+$(tgts_EX): %$(ext): %
 $(tgts): $(CPPCHECK_SUPPRESS) $(MK) | $$(@D)/
 
 

diff --git a/share/mk/lint/c/cpplint.mk b/share/mk/lint/c/cpplint.mk
index 43408c1ec124a1dece674f73ce51162dfda28b74..e897fac0358b8b42a55a3e69656aca11de1a386d 100644 (file)
--- a/share/mk/lint/c/cpplint.mk
+++ b/share/mk/lint/c/cpplint.mk
@@ -11,11 +11,12 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
 include $(MAKEFILEDIR)/configure/build-depends/cpplint/cpplint.mk
 
 
-tgts_EX := $(patsubst %, %.lint-c.cpplint.touch, $(_EX_TU_src))
+ext := .lint-c.cpplint.touch
+tgts_EX := $(patsubst %, %$(ext), $(_EX_TU_src))
 tgts    := $(tgts_EX)
 
 
-$(tgts_EX): %.lint-c.cpplint.touch: %
+$(tgts_EX): %$(ext): %
 $(tgts): $(CPPLINT_CONF) $(MK) | $$(@D)/
 
 
@@ -29,6 +30,7 @@ $(tgts):
 lint-c-cpplint: $(tgts);
 
 
+undefine ext
 undefine tgts_EX
 undefine tgts
 

diff --git a/share/mk/lint/c/iwyu.mk b/share/mk/lint/c/iwyu.mk
index 0f34100970827ba716727571d468102c3cd10053..ae44a7c073f8f7d88fb3417793ddef3a9b9a9609 100644 (file)
--- a/share/mk/lint/c/iwyu.mk
+++ b/share/mk/lint/c/iwyu.mk
@@ -30,7 +30,7 @@ endif
 tgts := $(tgts_EX)
 
 
-$(tgts_EX): %.lint-c.iwyu.touch: %
+$(tgts_EX): %$(ext): %
 $(tgts): $(MK) | $$(@D)/
 
 

diff --git a/share/mk/lint/man/blank.mk b/share/mk/lint/man/blank.mk
index e89046d2740f874c01c542cf9974c96fc89f523b..5b3a07e695d94abda5cfc8e8667a51ccb8174de9 100644 (file)
--- a/share/mk/lint/man/blank.mk
+++ b/share/mk/lint/man/blank.mk
@@ -23,7 +23,7 @@ tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tg
 endif
 
 
-$(tgts): %.lint-man.blank.touch: % $(MK) | $$(@D)/
+$(tgts): %$(ext): % $(MK) | $$(@D)/
        $(info  $(INFO_)GREP            $@)
        $(CAT) <$< \
        | if $(GREP) '^$$' >/dev/null; then \

diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index 7716616c52287b6cea3abd3f85bb0b1d0555dcee..78c13980cfb4ee651107d2723a8ff15a4b2f8fa9 100644 (file)
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -28,7 +28,7 @@ endif
 mandoc_man_ignore_grep := $(MAKEFILEDIR)/lint/man/mandoc.ignore.grep
 
 
-$(tgts): %.lint-man.mandoc.touch: % $(mandoc_man_ignore_grep) $(MK) | $$(@D)/
+$(tgts): %$(ext): % $(mandoc_man_ignore_grep) $(MK) | $$(@D)/
        $(info  $(INFO_)MANDOC          $@)
        ! ($(MANDOC) $(MANDOCFLAGS_) $< 2>&1 \
           | $(GREP) -v -f '$(mandoc_man_ignore_grep)' \

diff --git a/share/mk/lint/man/quote.mk b/share/mk/lint/man/quote.mk
index 95cec038ab8508f9f0c5d65f21e56a3d7a3c042a..6f7f5914aecc6eae6cd9d7f26c1eecfed3204ecb 100644 (file)
--- a/share/mk/lint/man/quote.mk
+++ b/share/mk/lint/man/quote.mk
@@ -26,7 +26,7 @@ endif
 quote_Pgrep := $(MAKEFILEDIR)/lint/man/quote.Pgrep
 
 
-$(tgts): %.lint-man.quote.touch: % $(quote_Pgrep) $(MK) | $$(@D)/
+$(tgts): %$(ext): % $(quote_Pgrep) $(MK) | $$(@D)/
        $(info  $(INFO_)GREP            $@)
        $(CAT) <$< \
        | if $(GREP) -Pf $(quote_Pgrep) >/dev/null; then \

diff --git a/share/mk/lint/man/so.mk b/share/mk/lint/man/so.mk
index 07ae8963c13904d70310ccbb961e5dee933c90b5..45db22953e0000f2ff26fce5c31e2b5cfe42f6ef 100644 (file)
--- a/share/mk/lint/man/so.mk
+++ b/share/mk/lint/man/so.mk
@@ -24,7 +24,7 @@ tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tg
 endif
 
 
-$(tgts): %.lint-man.so.touch: % $(MK) | $$(@D)/
+$(tgts): %$(ext): % $(MK) | $$(@D)/
        $(info  $(INFO_)FIND            $@)
        $(GREP) '^\.so ' <$< \
        | $(CUT) -f2 -d' ' \

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

diff --git a/share/mk/lint/man/ws.mk b/share/mk/lint/man/ws.mk
index 070059f18c0dc5df9160e3dd5972a0f8714a823c..61f2eb7dccba7ce5450049abfb04a8c160f6b7bc 100644 (file)
--- a/share/mk/lint/man/ws.mk
+++ b/share/mk/lint/man/ws.mk
@@ -26,7 +26,7 @@ endif
 ws_egrep := $(MAKEFILEDIR)/lint/man/ws.egrep
 
 
-$(tgts): %.lint-man.ws.touch: % $(ws_egrep) $(MK) | $$(@D)/
+$(tgts): %$(ext): % $(ws_egrep) $(MK) | $$(@D)/
        $(info  $(INFO_)GREP            $@)
        $(CAT) <$< \
        | if $(GREP) -Ef $(ws_egrep) >/dev/null; then \

diff --git a/share/mk/lint/sh/shellcheck.mk b/share/mk/lint/sh/shellcheck.mk
index ad0e89459a73ac81a5fe01de72cfc51120b7b092..fec6361c186fa16bedcbb3de0f917360091daa5a 100644 (file)
--- a/share/mk/lint/sh/shellcheck.mk
+++ b/share/mk/lint/sh/shellcheck.mk
@@ -11,10 +11,11 @@ include $(MAKEFILEDIR)/configure/build-depends/shellcheck/shellcheck.mk
 include $(MAKEFILEDIR)/src/sh.mk
 
 
-tgts := $(patsubst $(SRCBINDIR)/%, $(builddir)/%.lint-sh.shellcheck.touch, $(BIN_sh))
+ext := .lint-sh.shellcheck.touch
+tgts := $(patsubst $(SRCBINDIR)/%, $(builddir)/%$(ext), $(BIN_sh))
 
 
-$(tgts): $(builddir)/%.lint-sh.shellcheck.touch: $(SRCBINDIR)/% $(SHELLCHECK_CONF) $(MK) | $$(@D)/
+$(tgts): $(builddir)/%$(ext): $(SRCBINDIR)/% $(SHELLCHECK_CONF) $(MK) | $$(@D)/
        $(info  $(INFO_)SHELLCHECK      $@)
        $(SHELLCHECK) $(SHELLCHECKFLAGS_) $<
        $(TOUCH) $@
@@ -24,6 +25,7 @@ $(tgts): $(builddir)/%.lint-sh.shellcheck.touch: $(SRCBINDIR)/% $(SHELLCHECK_CON
 lint-sh-shellcheck: $(tgts);
 
 
+undefine ext
 undefine tgts