[groff] 04/06: doc/doc.am: Refactor: make man page deps explicit.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit bd9254d9394c690a93236c0bcdb14a6e5dcc94dc
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Mar 23 19:01:56 2022 +1100

    doc/doc.am: Refactor: make man page deps explicit.
    
    * doc/doc.am: Refactor.  Add explicit dependencies of compiled man page
      documents on preprocessors needed to generate them.  In their target
      rules, explicitly use groff's preprocessor options, freeing us up to
      simplify the `DOC_GROFF_ONLY` macro.
    
    Thanks to Ingo Schwarze for the code review.
---
 ChangeLog  | 7 +++++++
 doc/doc.am | 9 +++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56e5e097..013c3373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2022-04-01  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * doc/doc.am: Refactor.  Add explicit dependencies of compiled
+       man page documents on preprocessors needed to generate them.  In
+       their target rules, explicitly use groff's preprocessor options,
+       freeing us up to simplify the `DOC_GROFF_ONLY` macro.
+
+2022-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * doc/doc.am: Rationalize dependencies.  Drop dependency of
        `PROCESSEDEXAMPLEFILES` and `PROCESSEDDOCFILES` on expansion of
        `hdtbltmac_DATA`, because nothing in this directory uses the
diff --git a/doc/doc.am b/doc/doc.am
index f1cb240f..e0881f22 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -233,14 +233,15 @@ man-all: $(GROFF_MAN_PAGES_ALL)
 man-clean:
        $(RM) $(GROFF_MAN_PAGES_ALL)
 
-doc/groff-man-pages.pdf: $(GROFF_MAN_PAGES_ALL)
-       $(GROFF_V)$(DOC_GROFF_ONLY) -Tpdf -P-e -mandoc -rC1 \
+# Many pages use tbl, a few use eqn, and soelim(1) uses pic.
+doc/groff-man-pages.pdf: $(GROFF_MAN_PAGES_ALL) eqn pic tbl
+       $(GROFF_V)$(DOC_GROFF_ONLY) -pet -Tpdf -P-e -mandoc -rC1 \
          -rCHECKSTYLE=3 $(GROFF_MAN_PAGES1) \
          $(tmac_srcdir)/sv.tmac $(GROFF_MAN_PAGES2) \
          $(tmac_srcdir)/en.tmac $(GROFF_MAN_PAGES3) > $@
 
-doc/groff-man-pages.utf8.txt: $(GROFF_MAN_PAGES_ALL)
-       $(GROFF_V)$(DOC_GROFF_ONLY) -Tutf8 -mandoc \
+doc/groff-man-pages.utf8.txt: $(GROFF_MAN_PAGES_ALL) eqn pic tbl
+       $(GROFF_V)$(DOC_GROFF_ONLY) -pet -Tutf8 -mandoc \
          -rCHECKSTYLE=3 $(GROFF_MAN_PAGES1) \
          $(tmac_srcdir)/sv.tmac $(GROFF_MAN_PAGES2) \
          $(tmac_srcdir)/en.tmac $(GROFF_MAN_PAGES3) > $@