*.mk, INSTALL: build-src-c: Optimize pipeline

Calling man(1) is slow.  Since we only need to format the page, calling
mandoc(1) is faster and simpler (we could also use groff(1), but
mandoc(1) is probably faster and simpler than groff(1) too).  This
brings times down ~3x in my system.

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

diff --git a/INSTALL b/INSTALL
index 402ce53e30a54e71065364ff31edcda507c83aaf..b3f7f4095e143fa4ad37cd34734152aab30ef6e6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -106,7 +106,7 @@ Description
              -  clang-tidy(1)
              -  cpplint(1)
              -  iwyu(1)
-             -  man(1)
+             -  mandoc(1)
              -  mkdir(1)
              -  pkg-config(1)
              -  tac(1)

diff --git a/Makefile b/Makefile
index d55191b4d57d2a7d40075815c730f20d779b5798..a19ae0b72fb93152b61bdacad772081ac78d7b7e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,6 @@ help-variables:
        $(info  GROTTY          {EXTRA_,}GROTTYFLAGS)
        $(info  COL             {EXTRA_,}COLFLAGS)
        $(info  )
-       $(info  MAN)
        $(info  MANDOC          {EXTRA_,}MANDOCFLAGS)
        $(info  MAN2HTML        {EXTRA_,}MAN2HTMLFLAGS)
        $(info  )

diff --git a/share/mk/build/src.mk b/share/mk/build/src.mk
index 365d6c8e6f7e15b9bfba1090bd44263975edca83..454090812a164df8139e6d861764271ddc99b584 100644 (file)
--- a/share/mk/build/src.mk
+++ b/share/mk/build/src.mk
@@ -52,7 +52,6 @@ LDLIBS         := $(DEFAULT_LDLIBS) $(EXTRA_LDLIBS)
 
 CC  := cc
 LD  := $(CC) $(CFLAGS)
-MAN := man
 
 
 _SRCPAGEDIRS   := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.d,$(NONSO_MAN))
@@ -84,7 +83,7 @@ $(_UNITS_src_src):
                -e '/^\.TH/,/^\.SH/{/^\.SH/!p}' \
                -e '/^\.SH EXAMPLES/p' \
                -e "/^\... SRC BEGIN ($(@F))$$/,/^\... SRC END$$/p" \
-       | $(MAN) -P cat -l - \
+       | $(MANDOC) -Tutf8 \
        | $(SED) '/^[^ ]/d' \
        | $(SED) 's/^       //' \
        >$@

diff --git a/share/mk/cmd.mk b/share/mk/cmd.mk
index 92b469fc3756575b0d133c1d208052bd345c0759..1653263bfd0e7d701749b570378e92cc9c22c0d7 100644 (file)
--- a/share/mk/cmd.mk
+++ b/share/mk/cmd.mk
@@ -21,6 +21,7 @@ INSTALL    := install
 LN         := ln
 LOCALE     := locale
 LZIP       := lzip
+MANDOC     := mandoc
 PKGCONF    := pkgconf
 SED        := sed
 SORT       := sort

diff --git a/share/mk/lint/man.mk b/share/mk/lint/man.mk
index 9d9d6cea8fc3a4227d302e1ff141b3f6eccfcfb4..c696e2df00f433e26cf5febeff14be51492fb4df 100644 (file)
--- a/share/mk/lint/man.mk
+++ b/share/mk/lint/man.mk
@@ -18,7 +18,6 @@ DEFAULT_MANDOCFLAGS := -man
 DEFAULT_MANDOCFLAGS += -Tlint
 EXTRA_MANDOCFLAGS   :=
 MANDOCFLAGS         := $(DEFAULT_MANDOCFLAGS) $(EXTRA_MANDOCFLAGS)
-MANDOC              := mandoc
 
 
 _LINT_man_mandoc:=$(patsubst $(MANDIR)/%,$(_MANDIR)/%.lint-man.mandoc.touch,$(NONSO_MAN))