[groff] 06/14: [sboxes,tmac]: Build more quietly.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 4b7506655e197b709c4c21b63f032630a30763ba
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Oct 20 08:54:09 2021 +1100

    [sboxes,tmac]: Build more quietly.
    
    * contrib/sboxes/sboxes.am ($(sboxes_builddir)/msboxes.ms,
      $(sboxes_builddir)/msboxes.pdf):
    * tmac/tmac.am (tmac/groff_man.7.man, tmac/groff_man_style.7.man): Be
      quieter by default; use $(AM_V_at) and $(AM_V_GEN) more consistently
      with the rest of the build.
    
      (tmac/www.tmac): Create build tree directory and perform sed
      processing quietly.
    
      ($(M4CHECK)): Use $(EGREP) instead of "grep -E", since our build uses
      AC_PROG_EGREP.  Perform this grep quietly.
    
    squash [sboxes,tmac]: Build more quietly.
---
 ChangeLog                |  6 ++++++
 contrib/sboxes/ChangeLog |  7 +++++++
 contrib/sboxes/sboxes.am | 12 ++++++------
 tmac/tmac.am             | 14 +++++++++-----
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b96962..d817cbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-10-20  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/tmac.am (tmac/groff_man.7.man,
+       tmac/groff_man_style.7.man): Be quieter by default; use
+       $(AM_V_GEN) more consistently with the rest of the build.
+
 2021-10-19  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/roff/troff/input.cpp (do_error): Format diagnostic
diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 18f5b44..85d40df 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -1,3 +1,10 @@
+2021-10-20  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * sboxes.am ($(sboxes_builddir)/msboxes.ms,
+       $(sboxes_builddir)/msboxes.pdf): Be quieter by default; use
+       $(AM_V_at) and $(AM_V_GEN) more consistently with the rest of
+       the build.
+
 2021-10-17  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * sboxes.tmac: Rename macros to get out of user name space.  Our
diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am
index 091865c..d39b58e 100644
--- a/contrib/sboxes/sboxes.am
+++ b/contrib/sboxes/sboxes.am
@@ -54,17 +54,17 @@ $(SBOXES_PROCESSEDEXAMPLEFILES): $(SBOXES_NORMAL_FILES) \
 
 # The ordering of the sed -e expressions is important.
 $(sboxes_builddir)/msboxes.ms: $(SBOXES_EXAMPLEFILES) $(sboxesnotquine)
-       mkdir -p $(sboxes_builddir)
-       $(SED) -n -e '1,/REPLACEME/p' \
+       $(AM_V_at)mkdir -p $(sboxes_builddir)
+       $(AM_V_at)$(SED) -n -e '1,/REPLACEME/p' \
            $(SBOXES_EXAMPLEFILES) > $@.tmp
-       $(SED) -f $(sboxesnotquine) \
+       $(AM_V_at)$(SED) -f $(sboxesnotquine) \
            $(SBOXES_EXAMPLEFILES) >> $@.tmp
-       $(SED) -n -e '/REPLACEME/,$$p' \
+       $(AM_V_at)$(SED) -n -e '/REPLACEME/,$$p' \
            $(SBOXES_EXAMPLEFILES) >> $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)mv $@.tmp $@
 
 $(sboxes_builddir)/msboxes.pdf: $(sboxes_builddir)/msboxes.ms
-       $(top_builddir)/test-groff $(SBOXES_FLAGS) \
+       $(AM_V_GEN)$(top_builddir)/test-groff $(SBOXES_FLAGS) \
          $(sboxes_builddir)/msboxes.ms > $@
 
 uninstall_groffdirs: uninstall_sboxes
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 4f3135b..d8191f3 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -196,8 +196,9 @@ tmac_XFAIL_TESTS = \
 XFAIL_TESTS += $(tmac_XFAIL_TESTS)
 
 tmac/www.tmac: tmac/www.tmac.in
-       $(MKDIR_P) $(top_builddir)/tmac
-       sed -e "s;[@]PNMTOPS_NOSETPAGE[@];$(pnmtops_nosetpage);g" \
+       $(AM_V_at)$(MKDIR_P) $(top_builddir)/tmac
+       $(AM_V_GEN)sed -e \
+         "s;[@]PNMTOPS_NOSETPAGE[@];$(pnmtops_nosetpage);g" \
          $(tmac_srcdir)/www.tmac.in > $(top_builddir)/tmac/www.tmac
 
 
@@ -206,14 +207,17 @@ M4WORDS = 
define|divert|include|index|shift|undefine|undivert
 M4CHECK = tmac/check-groff_man-stamp
 
 $(M4CHECK): tmac/groff_man.7.man.in
-       ! grep -E '(^|[[:space:]])($(M4WORDS))($$|[[:space:]])' \
+       $(AM_V_at)! $(EGREP) \
+         '(^|[[:space:]])($(M4WORDS))($$|[[:space:]])' \
          $(tmac_srcdir)/groff_man.7.man.in > $@
 
 tmac/groff_man.7.man: tmac/groff_man.7.man.in $(M4CHECK)
-       m4 -D_groff_man_not_style $(tmac_srcdir)/groff_man.7.man.in > $@
+       $(AM_V_GEN)m4 -D_groff_man_not_style \
+         $(tmac_srcdir)/groff_man.7.man.in > $@
 
 tmac/groff_man_style.7.man: tmac/groff_man.7.man.in $(M4CHECK)
-       m4 -D_groff_man_style $(tmac_srcdir)/groff_man.7.man.in > $@
+       $(AM_V_GEN)m4 -D_groff_man_style \
+         $(tmac_srcdir)/groff_man.7.man.in > $@
 
 # The installation of groff compatibility wrappers for vendor-provided
 # non-GNU macro sets is controlled by 'compatibility_wrappers' (see the