From 17542c3cd03c70b462eb134b565ed4698a9bff54 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 15 Jan 2012 20:46:43 +0100 Subject: [PATCH] build: silence automake build system * configure.ac (AM_SILENT_RULES): Invoke with "yes" as a parameter, to activate silent rules by default. * NEWS: Update. * Makefile.am (sc_perl_syntax): Silence its recipe unconditionally, similarly to what is done for other syntax checks. (release-stats): Be silent by default *but not unconditionally*, thanks to the use of $(AM_V_GEN). (path-check, git-diff): Be silent by default, thanks to the use of $(AM_V_GEN). * m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Likewise. * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Likewise. * tests/Makefile.am ($(srcdir)/parallel-tests.am): Likewise. ($(parallel_tests)): Likewise. --- Makefile.am | 14 ++++++++------ NEWS | 3 +++ configure.ac | 6 ++++-- doc/Makefile.am | 6 ++++-- m4/Makefile.am | 10 +++++----- tests/Makefile.am | 10 +++++----- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index ae07898a7..83bcc7cea 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 @@ -277,8 +277,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. @@ -626,6 +626,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./'`; \ @@ -636,7 +637,7 @@ git-diff: ## Check our path lengths. path-check: distdir - (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); \ @@ -767,7 +768,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 5c9a91e79..bd334fd6d 100644 --- a/NEWS +++ b/NEWS @@ -32,6 +32,9 @@ New in 1.11.0a: * 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 1ae68c581..bc04e56d8 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.11.0a], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([automake.in]) AC_CONFIG_AUX_DIR([lib]) +AM_SILENT_RULES([yes]) + AC_CANONICAL_BUILD # Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this diff --git a/doc/Makefile.am b/doc/Makefile.am index f4f76c660..655673b49 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 - 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 143df71f0..4fa1406d7 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 @@ -73,9 +73,9 @@ EXTRA_DIST = acdir/dirlist 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/Makefile.am b/tests/Makefile.am index a96218c89..72b488ff2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -35,13 +35,13 @@ txinfo5.test include $(srcdir)/parallel-tests.am $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am - (cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ + $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@ $(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am - input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \ - sed 's|^\. \./defs.*|parallel_tests=yes; &|' \ - < $(srcdir)/$$input >$@ - chmod a+rx $@ + $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'` \ + && sed 's|^\. \./defs.*|parallel_tests=yes; &|' \ + < $(srcdir)/$$input >$@ \ + && chmod a+rx $@ MAINTAINERCLEANFILES = $(parallel_tests) -- 2.11.4.GIT