3 files changed, 41 insertions, 14 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index d7025657e78..83386061180 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,17 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Less 'make' chatter for admin/grammars
+        * grammars/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN)
+        (am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_)
+        (am__v_at_0, am__v_at_1): New macros, from src/Makefile.in.
+        (${bovinedir}/%-by.el, ${bovinedir}/scm-by.el)
+        (${cedetdir}/semantic/%-wy.el, ${wisentdir}/%-wy.el)
+        (${wisentdir}/javat-wy.el, ${cedetdir}/srecode/srt-wy.el): Use them.
+
+        Less chatter in batch mode
+        * unidata/unidata-gen.el (unidata-gen-files):
+        Don't output messages like "Generating ..." in batch mode.
+
 2015-01-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Less 'make' chatter for unidata
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index b88521f4b47..6b54ecca237 100644
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -28,6 +28,19 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
 # Prevent any settings in the user environment causing problems.
 unexport EMACSDATA EMACSDOC EMACSPATH
 
@@ -68,30 +81,30 @@ wisent: ${WISENT}
 
 ## c-by.el, make-by.el.
 ${bovinedir}/%-by.el: ${srcdir}/%.by
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_bovine} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_bovine} -o "$@" $<
 
 ${bovinedir}/scm-by.el: ${srcdir}/scheme.by
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_bovine} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_bovine} -o "$@" $<
 
 ## grammar-wy.el
 ${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ## js-wy.el, python-wy.el
 ${wisentdir}/%-wy.el: ${srcdir}/%.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 
 .PHONY: distclean bootstrap-clean maintainer-clean extraclean
diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index ca3bae1070a..8af6fa0dd72 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -1329,7 +1329,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
           (insert (format "(define-char-code-property '%S %S\n  %S)\n"
                           prop basename docstring))
           (with-temp-buffer
-            (message "Generating %s..." file)
+            (or noninteractive (message "Generating %s..." file))
             (when (file-exists-p file)
               (insert-file-contents file)
               (goto-char (point-max))
@@ -1356,7 +1356,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
                         ";; End:\n\n"
                         (format ";; %s ends here\n" basename)))
             (write-file file)
-            (message "Generating %s...done" file))))
+            (or noninteractive (message "Generating %s...done" file)))))
       (message "Writing %s..." charprop-file)
       (insert ";; Local Variables:\n"
               ";; coding: utf-8\n"