Less 'make' chatter for doc and lisp

[doc/emacs/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/emacs.info, emacs.html):
Use them.
[doc/lispintro/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/eintr.info, emacs-lisp-intro.html):
Use them.
[doc/lispref/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/elisp.info, elisp.html):
Use them.
[doc/misc/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info)
(${buildinfodir}/efaq%.info, efaq%.html):
Use them.
[lisp/ChangeLog]
Less 'make' chatter in lisp directory
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in.
(custom-deps, finder-data, autoloads, update-subdirs): Use them.

2 files changed, 25 insertions, 6 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 95e6a1c08b4..285d5b32a88 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Less 'make' chatter for Emacs doc
+	* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
+	(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
+	(ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info)
+	(${buildinfodir}/efaq%.info, efaq%.html):
+	Use them.
+
 2014-12-18  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
 	* gnus.texi (Gnus Registry Setup): Explain pruning changes. Mention
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 40a072a7978..aff1f13df0c 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -96,7 +96,15 @@ TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
-ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
+# '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 =
+
+ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
 gfdl = ${srcdir}/doclicense.texi
@@ -133,7 +141,8 @@ ${buildinfodir}:
 EXTRA_OPTS =
 
 ${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} | ${buildinfodir}
-	$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) -o $@ $<
+	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) \
+	  -o $@ $<
 
 ## The short aliases, eg efaq = $(buildinfodir)/efaq.info.
 define info_template
@@ -153,7 +162,8 @@ $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_templ
 	$(ENVADD) $(TEXI2PDF) $<
 
 %.html: ${srcdir}/%.texi ${gfdl}
-	$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) -o $@ $<
+	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) \
+	  -o $@ $<
 
 %.ps: %.dvi
 	$(DVIPS) -o $@ $<
@@ -175,12 +185,12 @@ $(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir}
 
 ## Please can we just rename cc-mode.texi to ccmode.texi...
 ${buildinfodir}/ccmode.info: ${srcdir}/cc-mode.texi ${gfdl} | ${buildinfodir}
-	$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
+	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 ## efaq, efaq_w32 do not depend on gfdl.
 ## Maybe we can use .SECONDEXPANSION for this.
 ${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi | ${buildinfodir}
-	$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
+	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
 efaq%.dvi: ${srcdir}/efaq%.texi
 	$(ENVADD) $(TEXI2DVI) $<
@@ -189,7 +199,7 @@ efaq%.pdf: ${srcdir}/efaq%.texi
 	$(ENVADD) $(TEXI2PDF) $<
 
 efaq%.html: ${srcdir}/efaq%.texi
-	$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
+	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
 
 ${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding