Pushed to master.
Cheers,
Ralf
Use silent-rules for building the Automake package.
* configure.ac (AM_INIT_AUTOMAKE): Add silent-rules option.
* Makefile.am (automake, aclocal, INSTALL): Add silencing
variables to recipe.
* doc/Makefile.am (update_mans, $(srcdir)/aclocal.1)
($(srcdir)/automake.1, $(srcdir)/amhello-1.0.tar.gz): Likewise.
* lib/Automake/Makefile.am (Config.pm): Likewise.
* tests/Makefile.am ($(srcdir)/parallel-tests.am)
($(parallel_tests), defs-p): Likewise.
diff --git a/Makefile.am b/Makefile.am
index d082a3a..e8edc66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,17 +82,17 @@ do_subst = sed \
automake: automake.in
aclocal: aclocal.in
automake aclocal: Makefile
- rm -f $@ $...@.tmp
- $(do_subst) $(srcdir)/$...@.in >$...@.tmp
- chmod +x $...@.tmp
- chmod a-w $...@.tmp
- mv -f $...@.tmp $@
+ $(AM_V_GEN)rm -f $@ $...@.tmp
+ $(AM_V_at)$(do_subst) $(srcdir)/$...@.in >$...@.tmp
+ $(AM_V_at)chmod +x $...@.tmp
+ $(AM_V_at)chmod a-w $...@.tmp
+ $(AM_V_at)mv -f $...@.tmp $@
## The master location for INSTALL is lib/INSTALL.
## This is where `make fetch' will install new versions.
## Make sure we also update this copy.
INSTALL: lib/INSTALL
- cp $(srcdir)/lib/INSTALL $@
+ $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@
################################################################
##
diff --git a/configure.ac b/configure.ac
index 759952d..d54a740 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,8 @@ AC_CANONICAL_BUILD
AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"])
AC_SUBST([am_AUTOHEADER], ["${AUTOHEADER-autoheader}"])
-AM_INIT_AUTOMAKE([1.10a dist-bzip2 filename-length-max=99 color-tests
parallel-tests])
+AM_INIT_AUTOMAKE([1.10a dist-bzip2 filename-length-max=99 color-tests
+ parallel-tests silent-rules])
# The API version is the base version. We must guarantee
# compatibility for all releases with the same API version.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c794766..acdf0fa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,12 +27,12 @@ dist_man1_MANS = \
$(srcdir)/automake-$(APIVERSION).1
MAINTAINERCLEANFILES = $(dist_man1_MANS)
update_mans = \
- PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
+ $(AM_V_GEN)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
export PATH && \
$(HELP2MAN) --output=$@
$(dist_man1_MANS): $(top_srcdir)/configure.ac
$(srcdir)/aclocal.1 $(srcdir)/automake.1:
- f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \
+ $(AM_V_GEN)f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \
echo ".so man1/$$f-$(APIVERSION).1" > $@
$(srcdir)/aclocal-$(APIVERSION).1: $(srcdir)/../aclocal.in
$(update_mans) aclocal-$(APIVERSION)
@@ -70,7 +70,7 @@ 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)PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
export PATH && \
cd $(srcdir)/amhello && \
ACLOCAL=aclocal-$(APIVERSION) AUTOMAKE=automake-$(APIVERSION) \
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index 077b979..4399644 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -61,10 +61,10 @@ do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
## $(datadir) or other do_subst'ituted variables change.
## Use chmod a-w to prevent people from editing the wrong file by accident.
Config.pm: Config.in Makefile
- rm -f Config.tmp Config.pm
- $(do_subst) $(srcdir)/Config.in >Config.tmp
- chmod +x Config.tmp
- chmod a-w Config.tmp
- mv -f Config.tmp Config.pm
+ $(AM_V_GEN)rm -f Config.tmp Config.pm
+ $(AM_V_at)$(do_subst) $(srcdir)/Config.in >Config.tmp
+ $(AM_V_at)chmod +x Config.tmp
+ $(AM_V_at)chmod a-w Config.tmp
+ $(AM_V_at)mv -f Config.tmp Config.pm
EXTRA_DIST = Config.in
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3ed0cab..7f6910b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,17 +10,17 @@ 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,'`; \
+ $(AM_V_GEN)input=`echo $@ | sed 's,.*/,,; s,-p.test$$,.test,'`; \
sed 's,^\. \./defs,. ./defs-p,' < $(srcdir)/$$input > $@
- chmod a+rx $@
+ $(AM_V_at)chmod a+rx $@
MAINTAINERCLEANFILES = $(parallel_tests)
defs-p: defs Makefile.am
- sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@
+ $(AM_V_GEN)sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@
TESTS = \
aclibobj.test \
