diff options
| author | Alejandro Colomar <alx@kernel.org> | 2023-04-23 01:59:24 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2023-04-23 01:59:33 +0200 |
| commit | c9cbd326f3e6765ddb1a4ad11fd0faa574bdf91d (patch) | |
| tree | 5aa20bbbf16aee704b6acdf83d4c8b915c9109e5 | |
| parent | 0d3c360156c741a67a9547c0e4680305a7f70fc5 (diff) | |
*.mk: Factor out device-independent groff(1) flags
Add {EXTRA_,}NROFFFLAGS (used exclusively in 'build-catman').
This refactor will allow building other formats.
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | share/mk/build/catman.mk | 36 | ||||
| -rw-r--r-- | share/mk/build/groff.mk | 43 |
3 files changed, 52 insertions, 29 deletions
@@ -177,7 +177,7 @@ help-variables: $(info PRECONV {EXTRA_,}PRECONVFLAGS) $(info TBL) $(info EQN {EXTRA_,}EQNFLAGS) - $(info TROFF {EXTRA_,}TROFFFLAGS{,_MAN,_MDOC}) + $(info TROFF {EXTRA_,}TROFFFLAGS{,_MAN,_MDOC} {EXTRA_,}NROFFFLAGS) $(info GROTTY {EXTRA_,}GROTTYFLAGS) $(info COL {EXTRA_,}COLFLAGS) $(info ) diff --git a/share/mk/build/catman.mk b/share/mk/build/catman.mk index b3a15f0e9..b79d0d895 100644 --- a/share/mk/build/catman.mk +++ b/share/mk/build/catman.mk @@ -9,13 +9,11 @@ MAKEFILE_BUILD_CATMAN_INCLUDED := 1 include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/build/groff.mk include $(MAKEFILEDIR)/cmd.mk include $(MAKEFILEDIR)/src.mk -TMACDIR := $(SYSCONFDIR)/groff/tmac - - MANWIDTH ?= 80 NROFF_LINE_LENGTH := $(shell $(EXPR) $(MANWIDTH) - 2) NROFF_OUT_DEVICE := $(shell $(LOCALE) charmap \ @@ -23,29 +21,9 @@ NROFF_OUT_DEVICE := $(shell $(LOCALE) charmap \ && $(ECHO) utf8 \ || $(ECHO) ascii) -DEFAULT_EQNFLAGS := -EXTRA_EQNFLAGS := -EQNFLAGS := $(DEFAULT_EQNFLAGS) $(EXTRA_EQNFLAGS) -EQN := eqn - -DEFAULT_TROFFFLAGS := -t -DEFAULT_TROFFFLAGS += -ww -DEFAULT_TROFFFLAGS += -rLL=$(NROFF_LINE_LENGTH)n -EXTRA_TROFFFLAGS := -TROFFFLAGS := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS) -TROFF := troff - -TROFF_CHECKSTYLE_LVL := 3 -DEFAULT_TROFFFLAGS_MAN := $(TROFFFLAGS) -DEFAULT_TROFFFLAGS_MAN := -M $(TMACDIR) -DEFAULT_TROFFFLAGS_MAN += -m checkstyle -DEFAULT_TROFFFLAGS_MAN += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) -EXTRA_TROFFFLAGS_MAN := -TROFFFLAGS_MAN := $(DEFAULT_TROFFFLAGS_MAN) $(EXTRA_TROFFFLAGS_MAN) - -DEFAULT_TROFFFLAGS_MDOC := $(TROFFFLAGS) -EXTRA_TROFFFLAGS_MDOC := -TROFFFLAGS_MDOC := $(DEFAULT_TROFFFLAGS_MDOC) $(EXTRA_TROFFFLAGS_MDOC) +DEFAULT_NROFFFLAGS := -rLL=$(NROFF_LINE_LENGTH)n +EXTRA_NROFFFLAGS := +NROFFFLAGS := $(DEFAULT_NROFFFLAGS) $(EXTRA_NROFFFLAGS) DEFAULT_GROTTYFLAGS := -c EXTRA_GROTTYFLAGS := @@ -66,12 +44,14 @@ $(_CATMAN_troff): %.cat.troff: %.eqn | $$(@D)/ $(_CATMAN_MAN_set): %.cat.set: %.cat.troff | $$(@D)/ $(info TROFF -man $@) - $(TROFF) -man -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MAN) <$< 2>&1 >$@ \ + <$< 2>&1 >$@ \ + $(TROFF) -man -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MAN) $(NROFFFLAGS) \ | ( ! $(GREP) ^ ) $(_CATMAN_MDOC_set): %.cat.set: %.cat.troff | $$(@D)/ $(info TROFF -mdoc $@) - $(TROFF) -mdoc -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MDOC) <$< 2>&1 >$@ \ + <$< 2>&1 >$@ \ + $(TROFF) -mdoc -T$(NROFF_OUT_DEVICE) $(TROFFFLAGS_MDOC) $(NROFFFLAGS) \ | ( ! $(GREP) ^ ) $(_CATMAN): %.cat: %.cat.set | $$(@D)/ diff --git a/share/mk/build/groff.mk b/share/mk/build/groff.mk new file mode 100644 index 000000000..b818323b1 --- /dev/null +++ b/share/mk/build/groff.mk @@ -0,0 +1,43 @@ +######################################################################## +# Copyright 2021-2023, Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: GPL-3.0-or-later +######################################################################## + + +ifndef MAKEFILE_BUILD_GROFF_INCLUDED +MAKEFILE_BUILD_GROFF_INCLUDED := 1 + + +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/src.mk + + +TMACDIR := $(SYSCONFDIR)/groff/tmac + + +DEFAULT_EQNFLAGS := +EXTRA_EQNFLAGS := +EQNFLAGS := $(DEFAULT_EQNFLAGS) $(EXTRA_EQNFLAGS) +EQN := eqn + +DEFAULT_TROFFFLAGS := -t +DEFAULT_TROFFFLAGS += -ww +EXTRA_TROFFFLAGS := +TROFFFLAGS := $(DEFAULT_TROFFFLAGS) $(EXTRA_TROFFFLAGS) +TROFF := troff + +TROFF_CHECKSTYLE_LVL := 3 +DEFAULT_TROFFFLAGS_MAN := $(TROFFFLAGS) +DEFAULT_TROFFFLAGS_MAN := -M $(TMACDIR) +DEFAULT_TROFFFLAGS_MAN += -m checkstyle +DEFAULT_TROFFFLAGS_MAN += -rCHECKSTYLE=$(TROFF_CHECKSTYLE_LVL) +EXTRA_TROFFFLAGS_MAN := +TROFFFLAGS_MAN := $(DEFAULT_TROFFFLAGS_MAN) $(EXTRA_TROFFFLAGS_MAN) + +DEFAULT_TROFFFLAGS_MDOC := $(TROFFFLAGS) +EXTRA_TROFFFLAGS_MDOC := +TROFFFLAGS_MDOC := $(DEFAULT_TROFFFLAGS_MDOC) $(EXTRA_TROFFFLAGS_MDOC) + + +endif # include guard |