Merge branch 'maint'

* maint:
  tests: move list of tests in its own Makefile fragment
  build: silence automake build system

6 files changed, 34 insertions, 24 deletions

diff --git a/Makefile.am b/Makefile.am
index 034706750..00ed606ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@
 ## Makefile for Automake.
 
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -374,8 +374,8 @@ sc_diff_aclocal_in_aclocal:
 
 ## Syntax check with default Perl (on my machine, Perl 5).
 sc_perl_syntax:
-	perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
-	perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
+	@perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w automake
+	@perllibdir="./lib$(PATH_SEPARATOR)$(srcdir)/lib" $(PERL) -c -w aclocal
 
 ## expect no instances of '${...}'.  However, $${...} is ok, since that
 ## is a shell construct, not a Makefile construct.
@@ -815,6 +815,7 @@ git-release: git-dist
 	  --to $$dest.gnu.org:automake $(DIST_ARCHIVES)
 
 git-diff:
+	$(AM_V_GEN):; \
 	thisver="v$(VERSION)"; \
 	if test -z "$$OLDVERSION"; then \
 	  prevno=`echo "$(VERSION)" - 0.01 | bc | sed 's/^\./0./'`; \
@@ -825,7 +826,7 @@ git-diff:
 
 ## Check our path lengths.
 path-check: distdir
-	($(am__cd) $(distdir) && \
+	$(AM_V_GEN)($(am__cd) $(distdir) && \
 ## FIXME there's got to be a better way!  pathchk should take the list
 ## of files on stdin, at least.
 	  find . -print | xargs pathchk -p); \
@@ -956,7 +957,8 @@ fetch:
 ## This has to be run in an up to date build tree, but there must
 ## be no temp files nor unused other files lying around!
 release-stats: ps
-	@am=`wc -l < automake` && \
+	$(AM_V_GEN): && \
+	am=`wc -l < automake` && \
 	acl=`wc -l < aclocal` && \
 	pmfiles="lib/Automake/*.pm" && \
 	if test . != '$(srcdir)'; then pmfiles="$$pmfiles $(srcdir)/lib/Automake/*.pm"; \
diff --git a/NEWS b/NEWS
index f19398869..98a1ec0fc 100644
--- a/NEWS
+++ b/NEWS
@@ -177,6 +177,9 @@ New in 1.11.2a:
 
 * Miscellaneous changes:
 
+  - Automake's own build system is more silent by default, making use of
+    the 'silent-rules' option.
+
   - The master copy of the `gnupload' script is now maintained in gnulib,
     not in automake.
 
diff --git a/configure.ac b/configure.ac
index e8a19db34..23ebc6b54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@ AC_INIT([GNU Automake], [1.11a], [bug-automake@gnu.org])
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
 
+AM_SILENT_RULES([yes])
+
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ae4016cf5..ee5c439c6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,8 @@
 
 ## Makefile for Automake.
 
-# Copyright (C) 2003, 2006, 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2008, 2009, 2012 Free Software Foundation,
+# Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -70,7 +71,8 @@ dist_doc_DATA = $(srcdir)/amhello-1.0.tar.gz
 # aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
 # configure in tests/.
 $(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) $(top_srcdir)/configure.ac
-	$(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
+	$(AM_V_GEN)abs_top_builddir=`cd '$(top_builddir)' && pwd` && \
+	PATH="$$abs_top_builddir/tests$(PATH_SEPARATOR)$$PATH" && \
 	export PATH && \
 	cd $(srcdir)/amhello && \
 	ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL && \
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 87243cbca..95cb44d15 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -3,7 +3,7 @@
 ## Makefile for Automake m4.
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
-# 2008, 2009, 2011 Free Software Foundation, Inc.
+# 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -70,9 +70,9 @@ EXTRA_DIST = acdir/.placeholder amversion.in
 # Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
 # how amversion.m4 appears in our dependencies.
 $(top_srcdir)/m4/amversion.m4: $(srcdir)/amversion.in
-	sed -e 's,[@]VERSION[@],$(VERSION),g' \
+	$(AM_V_at)sed \
+	    -e 's,[@]VERSION[@],$(VERSION),g' \
 	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
 	    -e "s,[@]configure_input[@],Generated from amversion.in; do not edit by hand.,g" \
-	    $(srcdir)/amversion.in > $@t
-	chmod a-w $@t
-	mv -f $@t $@
+	    $(srcdir)/amversion.in > $@-t
+	@$(AM_V_at)chmod a-w $@-t && mv -f $@-t $@
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index f1c66154f..cf1fae2e0 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -3,6 +3,7 @@
 ## but also to be executed directly by make when bootstrapping automake.
 
 ## Copyright (C) 2011 Free Software Foundation, Inc.
+## Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
 
 # The order here is mostly alphabetical, with the deliberate exception
 # that tests having a high runtime (especially TAP tests that run various
-# checks sequentially) are listed early; this improved performance on
+# checks sequentially) are listed early; this improves performance on
 # concurrent testsuite runs.
 handwritten_TESTS = \
 get-sysconf.test \
@@ -300,8 +301,8 @@ dejagnu6.test \
 dejagnu7.test \
 dejagnu-absolute-builddir.test \
 dejagnu-relative-srcdir.test \
-dejagnu-siteexp-append.test \
 dejagnu-siteexp-extend.test \
+dejagnu-siteexp-append.test \
 dejagnu-siteexp-useredit.test \
 deleted-am.test \
 deleted-m4.test \
@@ -591,12 +592,12 @@ maintclean.test \
 maintclean-vpath.test \
 maintmode-configure-msg.test \
 make.test \
+makefile-deps.test \
 makej.test \
 makej2.test \
 maken.test \
 maken3.test \
 makevars.test \
-makefile-deps.test \
 man.test \
 man2.test \
 man3.test \
@@ -728,8 +729,6 @@ test-driver-strip-vpath.test \
 test-driver-trs-suffix-registered.test \
 test-driver-fail.test \
 test-driver-is-distributed.test \
-test-extensions.test \
-test-extensions-cond.test \
 test-harness-vpath-rewrite.test \
 test-log.test \
 test-logs-repeated.test \
@@ -742,6 +741,8 @@ test-missing2.test \
 test-trs-basic.test \
 test-trs-recover.test \
 test-trs-recover2.test \
+test-extensions.test \
+test-extensions-cond.test \
 parse.test \
 percent.test \
 percent2.test \
@@ -799,9 +800,9 @@ primary-prefix-couples-force-valid.test \
 primary-prefix-couples-documented-valid.test \
 proginst.test \
 programs-primary-rewritten.test \
-py-compile-basedir.test \
 py-compile-basic.test \
 py-compile-basic2.test \
+py-compile-basedir.test \
 py-compile-destdir.test \
 py-compile-env.test \
 py-compile-option-terminate.test \
@@ -859,12 +860,12 @@ remake-deleted-m4-file.test \
 remake-renamed-m4-file.test \
 remake-renamed-m4-macro-and-file.test \
 remake-renamed-m4-macro.test \
-remake-renamed-am.test \
+remake-am-pr10111.test \
+remake-m4-pr10111.test \
 remake-deleted-am-2.test \
 remake-deleted-am-subdir.test \
 remake-deleted-am.test \
-remake-am-pr10111.test \
-remake-m4-pr10111.test \
+remake-renamed-am.test \
 pr8365-remake-timing.test \
 req.test \
 reqd.test \