From 5d6b37084b0ef76c495f338b38c00d1b31656b8f Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 31 Dec 2014 07:47:41 -0800
Subject: Less 'make' chatter at top level

* 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, copied from src/Makefile.in.
($(srcdir)/src/config.in, ${srcdir}/info/dir):
Be less chatty when not verbose.
($(srcdir)/src/stamp-h.in): Simplify with '$@'.
---
 ChangeLog   | 10 ++++++++++
 Makefile.in | 23 ++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6557ef9552f..ad3630c4a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Less 'make' chatter at top level
+	* 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, copied from src/Makefile.in.
+	($(srcdir)/src/config.in, ${srcdir}/info/dir):
+	Be less chatty when not verbose.
+	($(srcdir)/src/stamp-h.in): Simplify with '$@'.
+
 2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	system-name's returned value can vary
diff --git a/Makefile.in b/Makefile.in
index ccb70a436e8..038430b4ff4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,6 +94,19 @@ configuration=@configuration@
 ### The nt/ subdirectory gets built only for MinGW
 NTDIR=@NTDIR@
 
+# '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 =
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / Mac OS X.
@@ -441,11 +454,11 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
 	@ # because stamp-h.in has changed (since building stamp-h.in
 	@ # refreshes config.in as well), but if config.in is missing
 	@ # then we really need to do something more.
-	[ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} )
+	$(if $(wildcard $@),,cd $(srcdir) && $(AUTOHEADER))
 $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
 	cd ${srcdir} && ${AUTOHEADER}
-	rm -f $(srcdir)/src/stamp-h.in
-	echo timestamp > $(srcdir)/src/stamp-h.in
+	rm -f $@
+	echo timestamp > $@
 
 # ==================== Installation ====================
 
@@ -964,8 +977,8 @@ info_dir_deps = \
 ## but then we would need to depend on info-real, which would
 ## slow down parallelization.
 ${srcdir}/info/dir: ${info_dir_deps}
-	${MKDIR_P} ${srcdir}/info
-	tempfile=info-dir.$$$$; \
+	$(AM_V_at)${MKDIR_P} ${srcdir}/info
+	$(AM_V_GEN)tempfile=info-dir.$$$$; \
 	rm -f $${tempfile}; \
 	(cd ${srcdir}/doc && \
 	 AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \
-- 
cgit v1.2.1