gbranden pushed a commit to branch master
in repository groff.
commit 0dee55b3def00071fd44b1da6d7d35d4a05651f5
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Mar 23 18:46:31 2022 +1100
doc/doc.am: Refactor by relocating some rules.
* doc/doc.am: Refactor. Relocate "doc/grnexampl.ps" target to group it
with other me(7) documents. Put addition of "doc/examples.stamp" to
`MOSTLYCLEANFILES` adjacent to its target rule. Relocate same rule so
that it precedes the target depending on it (make(1) might not benefit
from this, but human readers can).
Thanks to Ingo Schwarze for the discussion.
---
ChangeLog | 9 +++++++++
doc/doc.am | 25 ++++++++++++-------------
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 08f95c2a..413bf012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2022-04-01 G. Branden Robinson <[email protected]>
+ * doc/doc.am: Refactor. Relocate "doc/grnexampl.ps" target to
+ group it with other me(7) documents. Put addition of
+ "doc/examples.stamp" to `MOSTLYCLEANFILES` adjacent to its
+ target rule. Relocate same rule so that it precedes the target
+ depending on it (make(1) might not benefit from this, but human
+ readers can).
+
+2022-03-29 G. Branden Robinson <[email protected]>
+
* doc/doc.am: Refactor.
(DOC_GROFF_ONLY): Drop preprocessor options from groff command.
This macro is now, simply, a way to run the in-tree groff: no
diff --git a/doc/doc.am b/doc/doc.am
index d31fe1e1..73c671f6 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -145,8 +145,6 @@ imagedir = img
htmldocimagedir = $(htmldocdir)/img
exampleimagedir = $(exampledir)/img
-MOSTLYCLEANFILES += doc/examples.stamp
-
EXTRA_DIST += \
doc/txi-en.tex
@@ -247,6 +245,11 @@ doc/groff-man-pages.utf8.txt: $(GROFF_MAN_PAGES_ALL) eqn
pic tbl
$(tmac_srcdir)/sv.tmac $(GROFF_MAN_PAGES2) \
$(tmac_srcdir)/en.tmac $(GROFF_MAN_PAGES3) > $@
+doc/grnexmpl.ps: $(doc_srcdir)/grnexmpl.me $(doc_srcdir)/grnexmpl.g \
+ grn eqn
+ $(GROFF_V)$(MKDIR_P) `dirname $@` \
+ && $(DOC_GROFF_ONLY) -Tps -ge -me $(doc_srcdir)/grnexmpl.me >$@
+
$(PROCESSEDDOCFILES_PS): \
$(dist_devpsfont_DATA) $(nodist_devpsfont_DATA)
@@ -320,6 +323,13 @@ $(PROCESSEDEXAMPLEFILES) $(PROCESSEDDOCFILES): \
$(prefixexecbin_PROGRAMS) \
$(dist_tmac_DATA) $(nodist_tmac_DATA)
+MOSTLYCLEANFILES += doc/examples.stamp
+doc/examples.stamp: doc/groff.css
+ $(AM_V_at)$(MKDIR_P) $(doc_builddir)
+ $(AM_V_at)test -f $(doc_builddir)/groff.css || \
+ cp $(doc_srcdir)/groff.css $(doc_builddir)
+ $(AM_V_at)echo timestamp > $@
+
doc/pic.html: tmac/www.tmac
doc/pic.html: $(bin_PROGRAMS) $(prefixexecbin_PROGRAMS)
doc/pic.html: doc/examples.stamp
@@ -334,12 +344,6 @@ doc/pic.html: $(doc_srcdir)/pic.ms
| $(DOC_GROFF_ONLY) -pet -P-Ipic -P-D$(imagedir) -P-jpic \
-Thtml -ms > pic.html
-doc/examples.stamp: doc/groff.css
- $(AM_V_at)$(MKDIR_P) $(doc_builddir)
- $(AM_V_at)test -f $(doc_builddir)/groff.css || \
- cp $(doc_srcdir)/groff.css $(doc_builddir)
- $(AM_V_at)echo timestamp > $@
-
doc/webpage.html: tmac/www.tmac
doc/webpage.html: $(bin_PROGRAMS) $(prefixexecbin_PROGRAMS)
doc/webpage.html: doc/examples.stamp
@@ -358,11 +362,6 @@ doc/webpage.html: \
-P-jwebpage -P-nrb -P-Iwebpage -P-D$(imagedir) -Thtml -ms \
> webpage.html
-doc/grnexmpl.ps: $(doc_srcdir)/grnexmpl.me $(doc_srcdir)/grnexmpl.g \
- grn eqn
- $(GROFF_V)$(MKDIR_P) `dirname $@` \
- && $(DOC_GROFF_ONLY) -Tps -ge -me $(doc_srcdir)/grnexmpl.me >$@
-
# Note that we remove groff.css only if out-of-source build tree
mostlyclean-local: mostlyclean_doc
mostlyclean_doc:
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
