[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 05/05: Use $(GROFF_V) to silence documentation creation.
|
From: |
Werner LEMBERG |
|
Subject: |
[groff] 05/05: Use $(GROFF_V) to silence documentation creation. |
|
Date: |
Wed, 28 Feb 2018 07:21:34 -0500 (EST) |
wl pushed a commit to branch master
in repository groff.
commit 167ddb60b4244da8bb9acdfe7ce7777fd4fd6c8a
Author: Werner Lemberg <address@hidden>
Date: Wed Feb 28 13:12:38 2018 +0100
Use $(GROFF_V) to silence documentation creation.
---
ChangeLog | 9 +++++++++
Makefile.am | 5 +++++
contrib/hdtbl/ChangeLog | 4 ++++
contrib/hdtbl/hdtbl.am | 14 ++++++++------
contrib/mom/ChangeLog | 6 +++++-
contrib/mom/mom.am | 4 ++--
contrib/pdfmark/ChangeLog | 4 ++++
contrib/pdfmark/pdfmark.am | 6 +++---
doc/doc.am | 42 +++++++++++++++++++++---------------------
9 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c503fd3..6d94e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2018-02-28 Werner LEMBERG <address@hidden>
+ Use $(GROFF_V) to silence documentation creation.
+
+ * Makefile.am (GROFF_V): Define.
+
+ * doc/doc.am (.me.txt, .me.ps, .ms.html, .ms.txt, .ms.ps, pic.html,
+ webpage.html): Use $(GROFF_V).
+
+2018-02-28 Werner LEMBERG <address@hidden>
+
Use $(AM_V_GEN) to silence file generation.
* Makefile.am (.man), contrib/eqn2graph/eqn2graph.am (eqn2graph),
diff --git a/Makefile.am b/Makefile.am
index c98ae22..e19924e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -539,6 +539,11 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/include \
-I$(top_builddir)/lib
+# Define a custom string for rules that call groff in make's silence mode.
+GROFF_V = $(address@hidden@)
+GROFF_V_ = $(address@hidden@)
+GROFF_V_0 = @echo " GROFF " $@;
+
# The following Automake variables will be overloaded by the various
# .am files
bin_PROGRAMS =
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index a411507..5e5c77f 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-28 Werner LEMBERG <address@hidden>
+
+ * hdtbl.am (.roff.ps, .in.roff): Use $(GROFF_V) and $(AM_V_GEN).
+
2015-08-22 Bernd Warken <address@hidden>
* groff_hdtbl.7.man: Rename `groff_hdtbl.man'.
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index f942d33..574a4e9 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -105,13 +105,15 @@ EXTRA_DIST += \
SUFFIXES += .roff .in .ps
.roff.ps:
- @$(MKDIR_P) `dirname address@hidden
- $(HDTBLGROFF) -Tps -dfontpath=$(top_srcdir)/font
-dsopath=$(hdtbl_srcdir)/ \
- -mhdtbl $< >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && $(HDTBLGROFF) -Tps \
+ -dfontpath=$(top_srcdir)/font \
+ -dsopath=$(hdtbl_srcdir)/ \
+ -mhdtbl $< >$@
.in.roff:
- @$(MKDIR_P) `dirname address@hidden
- sed -e "s|address@hidden@]|$(fontdir)|" \
- -e "s|address@hidden@]|$(EGREP)|" $< >$@
+ $(AM_V_GEN)$(MKDIR_P) `dirname address@hidden \
+ && sed -e "s|address@hidden@]|$(fontdir)|" \
+ -e "s|address@hidden@]|$(EGREP)|" $< >$@
$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff pic tbl \
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 6589364..2a3459b 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,6 +1,10 @@
+2018-02-28 Werner LEMBERG <address@hidden>
+
+ * mom.am (.mom.pdf): Use $(GROFF_V).
+
2017-11-04 G. Branden Robinson <address@hidden>
- mom.am: Drop unnecessary -M flag; build tree has what it needs.
+ * mom.am: Drop unnecessary -M flag; build tree has what it needs.
2017-10-29 Bjarni Ingi Gislason <address@hidden>
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 68389dd..0f98137 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -131,8 +131,8 @@ MOSTLYCLEANFILES += \
# Rule to generated .pdf files from .mom files
SUFFIXES += .mom .pdf
.mom.pdf:
- @$(MKDIR_P) `dirname address@hidden
- LC_ALL=C $(MOMPDFMOM) $< >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && LC_ALL=C $(MOMPDFMOM) $< >$@
$(MOMPROCESSEDEXAMPLEFILES): $(MOMSTRIPFILES) $(MOMNORMALFILES) \
groff troff gropdf pdfmom penguin.ps penguin.pdf \
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index 4d2b175..182258b 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,5 +1,9 @@
2018-02-28 Werner LEMBERG <address@hidden>
+ * pdfmark.am (pdfmark.pdf): Use $(GROFF_V).
+
+2018-02-28 Werner LEMBERG <address@hidden>
+
* pdfmark.am (pdfroff): Use $(AM_V_GEN) to silence file generation.
2015-08-22 Bernd Warken <address@hidden>
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index d9589bc..75e9b62 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -66,9 +66,9 @@ PDFROFF=\
$(FFLAG) $(TFLAG) $(PDFMARK_TFLAG) $(PDFMARK_PFLAG)
contrib/pdfmark/pdfmark.pdf: contrib/pdfmark/pdfmark.ms
- @$(MKDIR_P) `dirname address@hidden
- $(PDFROFF) -mspdf --stylesheet=$(pdfmark_srcdir)/cover.ms \
- $(top_srcdir)/contrib/pdfmark/pdfmark.ms >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && $(PDFROFF) -mspdf --stylesheet=$(pdfmark_srcdir)/cover.ms \
+ $(top_srcdir)/contrib/pdfmark/pdfmark.ms >$@
# The pdf files use the local script to generate.
$(PDFDOCFILES): pdfroff groff troff gropdf
diff --git a/doc/doc.am b/doc/doc.am
index eb21159..86dbd21 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -127,22 +127,22 @@ SUFFIXES += .me .ms .ps .html .txt .texi .dvi .pdf .xhtml
# For simplicity, we always call preconv, grn, and eqn.
.me.txt:
- @$(MKDIR_P) `dirname address@hidden
- $(DOC_GROFF) -k -Tutf8 -ge -me >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && $(DOC_GROFF) -k -Tutf8 -ge -me >$@
.me.ps:
- @$(MKDIR_P) `dirname address@hidden
- $(DOC_GROFF) -k -Tps -ge -me >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && $(DOC_GROFF) -k -Tps -ge -me >$@
.ms.html:
- @$(MKDIR_P) `dirname address@hidden
- $(DOC_GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -P-V -Thtml -ms >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && $(DOC_GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \
+ -P-D$(imagedir) -P-V -Thtml -ms >$@
.ms.txt:
- @$(MKDIR_P) `dirname address@hidden
- $(DOC_GROFF) -Tascii -ms -mwww >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && $(DOC_GROFF) -Tascii -ms -mwww >$@
.ms.ps:
- @$(MKDIR_P) `dirname address@hidden
- $(DOC_GROFF) -Tps -ms -mwww >$@
+ $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
+ && $(DOC_GROFF) -Tps -ms -mwww >$@
$(PROCESSEDEXAMPLEFILES): $(bin_PROGRAMS) $(prefixexecbin_PROGRAMS) gnu.eps
$(PROCESSEDEXAMPLEFILES): $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA)
$(hdtbltmac_DATA)
@@ -154,11 +154,11 @@ doc/pic.html: $(bin_PROGRAMS) $(prefixexecbin_PROGRAMS)
doc/pic.html: doc/examples.stamp
doc/pic.html: $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA)
doc/pic.html: $(doc_srcdir)/pic.ms $(devhtmlfont_DATA)
- @$(MKDIR_P) $(doc_builddir)
- cd $(doc_builddir) && \
- $(DOC_SED) $(doc_srcdir)/pic.ms | \
- $(DOC_GROFF_ONLY) -P-p -P-Ipic -P-D$(imagedir) -P-jpic \
- -Thtml -P-V -ms > pic.html
+ $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
+ && cd $(doc_builddir) \
+ && $(DOC_SED) $(doc_srcdir)/pic.ms \
+ | $(DOC_GROFF_ONLY) -P-p -P-Ipic -P-D$(imagedir) -P-jpic \
+ -Thtml -P-V -ms > pic.html
doc/examples.stamp: doc/groff.css
@$(MKDIR_P) $(doc_builddir)
@@ -169,11 +169,11 @@ doc/webpage.html: $(bin_PROGRAMS)
$(prefixexecbin_PROGRAMS)
doc/webpage.html: doc/examples.stamp $(devhtmlfont_DATA)
doc/webpage.html: $(dist_devpsfont_DATA) $(nodist_devpsfont_DATA)
doc/webpage.html: $(doc_srcdir)/webpage.ms gnu.eps $(doc_srcdir)/groff.css
- @$(MKDIR_P) doc
- cd $(doc_builddir) && \
- $(DOC_SED) $(doc_srcdir)/webpage.ms | \
- $(DOC_GROFF_ONLY) -P-jwebpage -P-nrpb -P-Iwebpage \
- -P-D$(imagedir) -Thtml -ms > webpage.html
+ $(GROFF_V)$(MKDIR_P) doc \
+ && cd $(doc_builddir) \
+ && $(DOC_SED) $(doc_srcdir)/webpage.ms \
+ | $(DOC_GROFF_ONLY) -P-jwebpage -P-nrpb -P-Iwebpage \
+ -P-D$(imagedir) -Thtml -ms > webpage.html
doc/grnexmpl.ps: doc/grnexmpl.me doc/grnexmpl.g
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 05/05: Use $(GROFF_V) to silence documentation creation.,
Werner LEMBERG <=