aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2024-03-23 00:44:50 +0100
committerAlejandro Colomar <alx@kernel.org>2024-03-23 01:23:13 +0100
commit7909279170f872058cdc66f20a17234554ee2843 (patch)
tree65637465b2c2f9e164bfc0c4ee7b78de19765577
parentead1a92b048d28d33e3e68d26d0c4666f2f6b4e9 (diff)
downloadman-pages-7909279170f872058cdc66f20a17234554ee2843.tar.gz
share/mk/: build-*: Specify manual pages' version and date
Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r--share/mk/build/examples/_.mk6
-rw-r--r--share/mk/build/examples/src.mk2
-rw-r--r--share/mk/build/html/troff.mk6
-rw-r--r--share/mk/build/pre/preconv.mk9
-rw-r--r--share/mk/lint/man/mandoc.ignore.grep1
-rw-r--r--share/mk/lint/man/mandoc.mk8
-rw-r--r--share/mk/lint/man/tbl.mk10
-rw-r--r--share/mk/lint/mdoc/_.mk20
-rw-r--r--share/mk/lint/mdoc/mandoc.mk13
9 files changed, 27 insertions, 48 deletions
diff --git a/share/mk/build/examples/_.mk b/share/mk/build/examples/_.mk
index e9c9ff24a9..35f86d6c6e 100644
--- a/share/mk/build/examples/_.mk
+++ b/share/mk/build/examples/_.mk
@@ -6,14 +6,12 @@ ifndef MAKEFILE_BUILD_EX_DIR_INCLUDED
MAKEFILE_BUILD_EX_DIR_INCLUDED := 1
-include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/man.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/mkdir.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
-include $(MAKEFILEDIR)/configure/src.mk
-include $(MAKEFILEDIR)/src.mk
-_PAGEEXDIRS := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.d/,$(NONSO_MAN))
+_PAGEEXDIRS := $(patsubst %, %.d/, $(_NONSO_MAN))
$(_PAGEEXDIRS):
diff --git a/share/mk/build/examples/src.mk b/share/mk/build/examples/src.mk
index 47c8ac1fb5..9329963c98 100644
--- a/share/mk/build/examples/src.mk
+++ b/share/mk/build/examples/src.mk
@@ -33,7 +33,7 @@ _UNITS_ex_h := $(filter %.h,$(_UNITS_ex_src))
_UNITS_ex_c := $(filter %.c,$(_UNITS_ex_src))
-$(_UNITS_ex_src): $$(patsubst $(_MANDIR)/%.d,$(MANDIR)/%,$$(@D)) $(MK) | $$(@D)/
+$(_UNITS_ex_src): $$(patsubst %.d, %, $$(@D)) $(MK) | $$(@D)/
$(_UNITS_ex_c): $$(filter $$(@D)/%.h,$(_UNITS_ex_h))
$(_UNITS_ex_src):
$(info $(INFO_)SED $@)
diff --git a/share/mk/build/html/troff.mk b/share/mk/build/html/troff.mk
index 3da058662b..937c3c244c 100644
--- a/share/mk/build/html/troff.mk
+++ b/share/mk/build/html/troff.mk
@@ -7,6 +7,8 @@ MAKEFILE_BUILD_HTML_TROFF_INCLUDED := 1
include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
include $(MAKEFILEDIR)/configure/src.mk
@@ -25,8 +27,8 @@ _XFAIL_HTMLMAN_MAN_set := \
$(_MANDIR)/man8/zic.8.html.set
-_HTMLMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.html.set,$(NONSO_MAN))
-_HTMLMAN_MDOC_set:= $(patsubst $(MANDIR)/%,$(_MANDIR)/%.html.set,$(NONSO_MDOC))
+_HTMLMAN_MAN_set := $(patsubst %, %.html.set, $(_NONSO_MAN))
+_HTMLMAN_MDOC_set := $(patsubst %, %.html.set, $(_NONSO_MDOC))
ifeq ($(SKIP_XFAIL),yes)
diff --git a/share/mk/build/pre/preconv.mk b/share/mk/build/pre/preconv.mk
index 3c16abeb79..6e8c881199 100644
--- a/share/mk/build/pre/preconv.mk
+++ b/share/mk/build/pre/preconv.mk
@@ -6,16 +6,15 @@ ifndef MAKEFILE_BUILD_PRE_PRECONV_INCLUDED
MAKEFILE_BUILD_PRE_PRECONV_INCLUDED := 1
-include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
include $(MAKEFILEDIR)/configure/build-depends/groff-base/preconv.mk
-include $(MAKEFILEDIR)/configure/src.mk
-include $(MAKEFILEDIR)/src.mk
-_MAN_tbl := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.tbl,$(NONSO_MAN) $(NONSO_MDOC))
+_MAN_tbl := $(patsubst %, %.tbl, $(_NONSO_MAN) $(_NONSO_MDOC))
-$(_MAN_tbl): $(_MANDIR)/%.tbl: $(MANDIR)/% $(MK) | $$(@D)/
+$(_MAN_tbl): %.tbl: % $(MK) | $$(@D)/
$(info $(INFO_)PRECONV $@)
$(PRECONV) $(PRECONVFLAGS) $< >$@
diff --git a/share/mk/lint/man/mandoc.ignore.grep b/share/mk/lint/man/mandoc.ignore.grep
index a2f91bcff3..c4a023a50a 100644
--- a/share/mk/lint/man/mandoc.ignore.grep
+++ b/share/mk/lint/man/mandoc.ignore.grep
@@ -1,6 +1,5 @@
STYLE: lower case character in document title:
UNSUPP: ignoring macro in table:
-WARNING: cannot parse date, using it verbatim: TH (date)
WARNING: empty block: UR
WARNING: missing date, using "": TH
WARNING: undefined escape, printing literally: \\\\
diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index 97f60b7591..7aa992c481 100644
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -7,13 +7,12 @@ MAKEFILE_LINT_MAN_MANDOC_INCLUDED := 1
include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk
include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
include $(MAKEFILEDIR)/configure/build-depends/mandoc/mandoc.mk
-include $(MAKEFILEDIR)/configure/src.mk
include $(MAKEFILEDIR)/configure/xfail.mk
-include $(MAKEFILEDIR)/lint/man/_.mk
include $(MAKEFILEDIR)/src.mk
@@ -27,8 +26,7 @@ _XFAIL_LINT_man_mandoc := \
$(_MANDIR)/man8/zic.8.lint-man.mandoc.touch
-_LINT_man_mandoc := \
- $(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.mandoc.touch, $(NONSO_MAN))
+_LINT_man_mandoc := $(patsubst %, %.lint-man.mandoc.touch, $(_NONSO_MAN))
ifeq ($(SKIP_XFAIL),yes)
_LINT_man_mandoc := $(filter-out $(_XFAIL_LINT_man_mandoc), $(_LINT_man_mandoc))
endif
@@ -37,7 +35,7 @@ endif
mandoc_man_ignore_grep := $(MAKEFILEDIR)/lint/man/mandoc.ignore.grep
-$(_LINT_man_mandoc): $(_MANDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% $(mandoc_man_ignore_grep) $(MK) | $$(@D)/
+$(_LINT_man_mandoc): %.lint-man.mandoc.touch: % $(mandoc_man_ignore_grep) $(MK) | $$(@D)/
$(info $(INFO_)MANDOC $@)
! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \
| $(GREP) -v -f '$(mandoc_man_ignore_grep)' \
diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk
index 02310d0c63..2a502846f3 100644
--- a/share/mk/lint/man/tbl.mk
+++ b/share/mk/lint/man/tbl.mk
@@ -6,22 +6,18 @@ ifndef MAKEFILE_LINT_MAN_TBL_INCLUDED
MAKEFILE_LINT_MAN_TBL_INCLUDED := 1
-include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/man.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/head.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/tail.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
-include $(MAKEFILEDIR)/configure/src.mk
-include $(MAKEFILEDIR)/lint/man/_.mk
-include $(MAKEFILEDIR)/src.mk
-_LINT_man_tbl := \
- $(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.tbl.touch, $(NONSO_MAN))
+_LINT_man_tbl := $(patsubst %, %.lint-man.tbl.touch, $(_NONSO_MAN))
-$(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% $(MK) | $$(@D)/
+$(_LINT_man_tbl): %.lint-man.tbl.touch: % $(MK) | $$(@D)/
$(info $(INFO_)GREP $@)
if $(GREP) -q '^\.TS$$' $< && ! $(HEAD) -n1 $< | $(GREP) -q '\\" t$$'; \
then \
diff --git a/share/mk/lint/mdoc/_.mk b/share/mk/lint/mdoc/_.mk
index 0f51ee2a28..d151a8004a 100644
--- a/share/mk/lint/mdoc/_.mk
+++ b/share/mk/lint/mdoc/_.mk
@@ -6,26 +6,8 @@ ifndef MAKEFILE_LINT_MDOC_INCLUDED
MAKEFILE_LINT_MDOC_INCLUDED := 1
-include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
-include $(MAKEFILEDIR)/src.mk
-
-
-linters_mdoc := mandoc
-
-
-$(foreach l, $(linters_mdoc), \
- $(eval _LINT_mdoc_$(l) := \
- $(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-mdoc.$(l).touch, \
- $(NONSO_MDOC))))
-
-
-$(foreach l, $(linters_mdoc), \
- $(eval .PHONY: lint-mdoc-$(l)))
-$(foreach l, $(linters_mdoc), \
- $(eval lint-mdoc-$(l): $(_LINT_mdoc_$(l));))
.PHONY: lint-mdoc
-lint-mdoc: $(foreach l, $(linters_mdoc), lint-mdoc-$(l));
+lint-mdoc: lint-mdoc-mandoc;
endif # include guard
diff --git a/share/mk/lint/mdoc/mandoc.mk b/share/mk/lint/mdoc/mandoc.mk
index 655a48618a..3a9e2cc9ee 100644
--- a/share/mk/lint/mdoc/mandoc.mk
+++ b/share/mk/lint/mdoc/mandoc.mk
@@ -6,19 +6,20 @@ ifndef MAKEFILE_LINT_MDOC_MANDOC_INCLUDED
MAKEFILE_LINT_MDOC_MANDOC_INCLUDED := 1
-include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk
include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
include $(MAKEFILEDIR)/configure/build-depends/mandoc/mandoc.mk
-include $(MAKEFILEDIR)/lint/mdoc/_.mk
-include $(MAKEFILEDIR)/src.mk
+
+
+_LINT_mdoc_mandoc := $(patsubst %, %.lint-mdoc.mandoc.touch, $(_NONSO_MDOC))
mandoc_mdoc_ignore_grep := $(MAKEFILEDIR)/lint/mdoc/mandoc.ignore.grep
-$(_LINT_mdoc_mandoc): $(_MANDIR)/%.lint-mdoc.mandoc.touch: $(MANDIR)/% $(mandoc_mdoc_ignore_grep) | $$(@D)/
+$(_LINT_mdoc_mandoc): %.lint-mdoc.mandoc.touch: % $(mandoc_mdoc_ignore_grep) $(MK) | $$(@D)/
$(info $(INFO_)MANDOC $@)
! ($(MANDOC) -mdoc $(MANDOCFLAGS) $< 2>&1 \
| $(GREP) -v -f '$(mandoc_mdoc_ignore_grep)' \
@@ -28,4 +29,8 @@ $(_LINT_mdoc_mandoc): $(_MANDIR)/%.lint-mdoc.mandoc.touch: $(MANDIR)/% $(mandoc_
$(TOUCH) $@
+.PHONY: lint-mdoc-mandoc
+lint-mdoc-mandoc: $(_LINT_mdoc_mandoc);
+
+
endif # include guard