gbranden pushed a commit to branch master
in repository groff.

commit 886782910b5a5d808b9a8a44716f5ae3f1df9f29
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Jul 2 11:53:31 2026 -0500

    doc/doc.am: Improve "clean" target.
    
    * doc/doc.man (mostlyclean_doc): Clean the "doc/gnu.{eps,png}" files and
      generated forms of our Texinfo manual from an out-of-source-tree build
      directory.  Reorganize logic.
    
      (maintainer-clean-local): Stop cleaning files auxiliary to the
      generated forms of our Texinfo manual.
---
 ChangeLog  |  9 +++++++++
 doc/doc.am | 24 +++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83f43888a..85b6ec629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2026-07-02  G. Branden Robinson <[email protected]>
+
+       * doc/doc.am: Improve "clean" target.
+       (mostlyclean_doc): Clean the "doc/gnu.{eps,png}" files and
+       generated forms of our Texinfo manual from an out-of-source-tree
+       build directory.  Reorganize logic.
+       (maintainer-clean-local): Stop cleaning files auxiliary to the
+       generated forms of our Texinfo manual.
+
 2026-07-02  G. Branden Robinson <[email protected]>
 
        * doc/groff.texi.in (Output Language Compatibility): On
diff --git a/doc/doc.am b/doc/doc.am
index fc520ba9a..6cee09a83 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -429,9 +429,25 @@ doc/webpage.html: $(doc_srcdir)/webpage.ms 
$(TMAC_PACKAGE_MS)
          $(doc_srcdir)/webpage.ms > webpage.html.tmp
        $(AM_V_at)mv [email protected] $@
 
-# We remove groff.css only from an out-of-source build tree.
+# We remove groff.css, groff.{html,html.node,info,pdf,texi,txt}, and
+# gnu.png only from an out-of-source build tree.
 mostlyclean-local: mostlyclean_doc
 mostlyclean_doc:
+       $(RM) $(GROFF_DVI) $(PROCESSEDDOCFILES_PDF)
+       $(RM) doc/groff.info-*
+       if test $(top_builddir) != $(top_srcdir); then \
+         $(RM) $(top_builddir)/doc/groff.css \
+           $(GROFF_HTML) $(GROFF_INFO) $(GROFF_PDF) $(GROFF_TXT) \
+           doc/groff.texi \
+           $(top_builddir)/$(DOC_GNU_EPS) \
+           $(top_builddir)/$(DOC_GNU_PNG); \
+         $(RM) -r $(GROFF_HTML).node; \
+       fi
+if HAVE_TEXI2DVI
+if USE_TEX
+       $(RM) -r doc/groff.dvi.t2d doc/groff.pdf.t2p
+endif # USE_TEX
+endif # HAVE_TEXI2DVI
 if USE_GROHTML
        if test -d $(doc_builddir); then \
          cd $(doc_builddir) \
@@ -465,7 +481,6 @@ if USE_GROHTML
          rmdir  $(doc_builddir)/img || :; \
        fi
 endif # USE_GROHTML
-       $(RM) $(PROCESSEDDOCFILES_PDF)
 
 install-data-hook: install_doc_htmldoc
 install_doc_htmldoc:
@@ -718,12 +733,11 @@ install-doc: install-dvi install-html install-pdf
 maintainer-clean-local:
        $(RM) $(doc_builddir)/gnu.eps
        $(RM) $(doc_builddir)/gnu.png
-       $(RM) $(doc_builddir)/groff.info*
+       $(RM) $(doc_builddir)/groff.info
+       $(RM) $(doc_builddir)/groff.html
        $(RM) $(doc_builddir)/groff.pdf
        $(RM) $(doc_builddir)/groff.dvi
        $(RM) $(doc_builddir)/groff.txt
-       $(RM) -r $(doc_builddir)/groff.html.*
-       $(RM) -r $(doc_builddir)/*.t2d $(doc_builddir)/*.t2p
        $(RM) $(doc_builddir)/groff.texi
 
 # Generated forms of the groff Texinfo manual might be in the source

_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to