[groff] 29/29: doc/doc.am: Refactor to simplify.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit c21f1a0e1a50d210d07fbdbfa501532ec6d13731
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Apr 26 19:46:38 2022 +1000

    doc/doc.am: Refactor to simplify.
    
    * doc/doc.am: Refactor to simplify.  Ingo's removal of the "--with-doc"
      "configure" option, among other changes, clears the way to remove many
      phony targets and simplify dependencies involving generation of the 5
      formats of our Texinfo manual.
    
      (build_infodoc, doc, doc_all, doc_txt, dvi, doc_dvi, pdf, doc_pdf,
      html, doc_html): Drop phony targets.
    
      (all): Depend directly on doc/groff.{info,txt,html,dvi,pdf}.
    
    * NEWS: Add item since "make doc" is no longer necessary and will do
      nothing.
---
 ChangeLog  | 12 ++++++++++++
 NEWS       |  7 +++++++
 doc/doc.am | 20 ++------------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 236dd47a..21c98a7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-04-27  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/doc.am: Refactor to simplify.  Ingo's removal of the
+       "--with-doc" "configure" option, among other changes, clears the
+       way to remove many phony targets and simplify dependencies
+       involving generation of the 5 formats of our Texinfo manual.
+       (build_infodoc, doc, doc_all, doc_txt, dvi, doc_dvi, pdf,
+       doc_pdf, html, doc_html): Drop phony targets.
+       (all): Depend directly on doc/groff.{info,txt,html,dvi,pdf}.
+       * NEWS: Add item since "make doc" is no longer necessary and
+       will do nothing.
+
 2022-04-27  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [tbl]: Regression-test Savannah #62366.
diff --git a/NEWS b/NEWS
index db987046..dab11eeb 100644
--- a/NEWS
+++ b/NEWS
@@ -440,6 +440,13 @@ o The 'configure' option --with-doc that was introduced in 
version
   contain no recommendation to support this option, and indeed, few, if
   any, GNU packages apart from groff support it.
 
+o The 'doc' Make target has been eliminated.  'all' (the default Make
+  target) assumes responsibility for generating the groff Texinfo manual
+  in all formats supported by the build host.  This change is only
+  significant when building from a Git checkout or if our Texinfo
+  manual's sources are modified; the distribution archive now provides
+  copies of the manual in Info, plain text, HTML, DVI, and PDF.
+
 o groffer has been deleted from the distribution.
 
 o grog no longer supports the "--warnings" option; the one diagnostic
diff --git a/doc/doc.am b/doc/doc.am
index 28870aad..6a9ea187 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -485,20 +485,13 @@ endif
 # Were the foregoing not true, we would simply say this:
 #info_TEXINFOS = doc/groff.texi
 #doc_groff_TEXINFOS = doc/fdl.texi
-#
-# The GNU Coding Standards require only installation of documentation in
-# Info format.  This can still be disabled by passing
-#   --with-doc=<something other than "info" or "yes">
-# to configure.
 
-all: build_infodoc
+all: doc/groff.info doc/groff.txt doc/groff.html doc/groff.dvi \
+  doc/groff.pdf
 
 # Provide the manual in source form.
 EXTRA_DIST += doc/groff.texi doc/fdl.texi
 
-# Define targets to generate GNU Info, plain text, and HTML from .texi.
-build_infodoc: doc/groff.info doc_txt doc_html
-
 EXTRA_DIST += doc/groff.info
 MAINTAINERCLEANFILES += doc/groff.info
 doc/groff.info: $(doc_srcdir)/groff.texi
@@ -582,15 +575,6 @@ else
        exit 1
 endif
 
-doc: doc_all
-doc_all: dvi pdf
-doc_txt: doc/groff.txt
-dvi: doc_dvi
-doc_dvi: doc/groff.dvi
-pdf: doc_pdf
-doc_pdf: doc/groff.pdf
-html: doc_html
-doc_html: doc/groff.html
 install-doc: install-pdf install-html
 
 distclean-local: clean_infodoc clean_otherdoc