summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2023-04-02 03:27:07 +0200
committerAlejandro Colomar <alx@kernel.org>2023-04-02 03:27:56 +0200
commit5bf82f50cf02ded2403666d6c1ee2878b8bd602e (patch)
treecc6e0b33242464eb3f566f5505465e3e0bcb50f6
parentaa344d4ba28c988c4d7f177373d565be193e2d39 (diff)
lint-man.mk: Fix previous commit
I should have removed this in the previous commit, but somehow I forgot, and my initial tests didn't reveal the bug. After trying to check a specific page as a contributor would do, I noticed the problem. Fixes: aa344d4ba28c ("*.mk, CONTRIBUTING, INSTALL: lint, build, check: Reorganize some targets") Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r--lib/lint-man.mk74
1 files changed, 3 insertions, 71 deletions
diff --git a/lib/lint-man.mk b/lib/lint-man.mk
index bae8ee27b..92fec7ef8 100644
--- a/lib/lint-man.mk
+++ b/lib/lint-man.mk
@@ -1,6 +1,6 @@
########################################################################
-# Copyright (C) 2021, 2022 Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-2.0 OR LGPL-2.0
+# Copyright (C) 2021 - 2023 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: GPL-3.0-or-later OR LGPL-3.0-or-later
########################################################################
@@ -14,13 +14,6 @@ include $(srcdir)/lib/lint.mk
include $(srcdir)/lib/src.mk
-DEFAULT_COLFLAGS := -b
-DEFAULT_COLFLAGS += -p
-DEFAULT_COLFLAGS += -x
-EXTRA_COLFLAGS :=
-COLFLAGS := $(DEFAULT_COLFLAGS) $(EXTRA_COLFLAGS)
-COL := col
-
DEFAULT_MANDOCFLAGS := -man
DEFAULT_MANDOCFLAGS += -Tlint
EXTRA_MANDOCFLAGS :=
@@ -28,47 +21,14 @@ MANDOCFLAGS := $(DEFAULT_MANDOCFLAGS) $(EXTRA_MANDOCFLAGS)
MANDOC := mandoc
-_LINT_man_groff_grep :=$(patsubst $(MANDIR)/%,$(_LINTDIR)/%.grep,$(NONSO_MAN))
-
-_LINT_man_groff :=$(patsubst $(MANDIR)/%,$(_LINTDIR)/%.lint-man.groff.touch,$(NONSO_MAN))
_LINT_man_mandoc:=$(patsubst $(MANDIR)/%,$(_LINTDIR)/%.lint-man.mandoc.touch,$(NONSO_MAN))
_LINT_man_tbl :=$(patsubst $(MANDIR)/%,$(_LINTDIR)/%.lint-man.tbl.touch,$(NONSO_MAN))
-linters_man := groff mandoc tbl
+linters_man := mandoc tbl
lint_man := $(foreach x,$(linters_man),lint-man-$(x))
-$(_LINT_man_groff_tbl): $(_LINTDIR)/%.tbl: $(MANDIR)/% | $$(@D)/
- $(info LINT (preconv) $@)
- $(PRECONV) $(PRECONVFLAGS) $< >$@
-
-$(_LINT_man_groff_eqn): %.eqn: %.tbl | $$(@D)/
- $(info LINT (tbl) $@)
- $(TBL) <$< >$@
-
-$(_LINT_man_groff_troff): %.troff: %.eqn | $$(@D)/
- $(info LINT (eqn) $@)
- $(EQN) $(EQNFLAGS) <$< 2>&1 >$@ \
- | ( ! $(GREP) ^ )
-
-$(_LINT_man_groff_grotty): %.grotty: %.troff | $$(@D)/
- $(info LINT (troff) $@)
- $(TROFF) $(TROFFFLAGS) <$< >$@
-
-$(_LINT_man_groff_col): %.col: %.grotty | $$(@D)/
- $(info LINT (grotty) $@)
- $(GROTTY) $(GROTTYFLAGS) <$< >$@
-
-$(_LINT_man_groff_grep): %.grep: %.col | $$(@D)/
- $(info LINT (col) $@)
- $(COL) $(COLFLAGS) <$< >$@
-
-$(_LINT_man_groff): %.lint-man.groff.touch: %.grep | $$(@D)/
- $(info LINT (grep) $@)
- ! $(GREP) -n '.\{$(MANWIDTH)\}.' $< /dev/null >&2
- touch $@
-
$(_LINT_man_mandoc): $(_LINTDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% | $$(@D)/
$(info LINT (mandoc) $@)
! ($(MANDOC) $(MANDOCFLAGS) $< 2>&1 \
@@ -106,34 +66,6 @@ $(_LINT_man_tbl): $(_LINTDIR)/%.lint-man.tbl.touch: $(MANDIR)/% | $$(@D)/
touch $@
-.PHONY: lint-man-groff-preconv
-lint-man-groff-preconv: $(_LINT_man_groff_tbl)
- @:
-
-.PHONY: lint-man-groff-tbl
-lint-man-groff-tbl: $(_LINT_man_groff_eqn)
- @:
-
-.PHONY: lint-man-groff-eqn
-lint-man-groff-eqn: $(_LINT_man_groff_troff)
- @:
-
-.PHONY: lint-man-groff-troff
-lint-man-groff-troff: $(_LINT_man_groff_grotty)
- @:
-
-.PHONY: lint-man-groff-grotty
-lint-man-groff-grotty: $(_LINT_man_groff_col)
- @:
-
-.PHONY: lint-man-groff-col
-lint-man-groff-col: $(_LINT_man_groff_grep)
- @:
-
-.PHONY: lint-man-groff-grep
-lint-man-groff-grep: $(_LINT_man_groff)
- @:
-
.PHONY: $(lint_man)
$(lint_man): lint-man-%: $$(_LINT_man_%)
@: