From 22c13fbd3b8e155d9a4553d7a2cf08cfec4c65e9 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 25 Sep 2009 20:22:53 +0200 Subject: [PATCH] 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. Signed-off-by: Ralf Wildenhues --- ChangeLog | 12 +++++++ Makefile.am | 12 +++---- Makefile.in | 25 +++++++++------ aclocal.m4 | 1 + configure | 22 +++++++++++++ configure.ac | 3 +- doc/Makefile.am | 6 ++-- doc/Makefile.in | 58 +++++++++++++++++++++++++--------- lib/Automake/Makefile.am | 10 +++--- lib/Automake/Makefile.in | 23 +++++++++----- lib/Automake/tests/Makefile.in | 13 ++++++-- lib/Makefile.in | 13 ++++++-- lib/am/Makefile.in | 13 ++++++-- m4/Makefile.in | 13 ++++++-- tests/Makefile.am | 8 ++--- tests/Makefile.in | 21 ++++++++---- 16 files changed, 183 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5c368990..51219b262 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-09-25 Ralf Wildenhues + + 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. + 2009-09-25 Jack Kelly Add silent rules support for texinfo outputs. diff --git a/Makefile.am b/Makefile.am index d082a3ae9..e8edc667a 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/Makefile.in b/Makefile.in index c52239021..1e88d86fc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,9 +43,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -76,6 +76,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(bindir)" SCRIPTS = $(bin_SCRIPTS) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -131,6 +137,7 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -834,14 +841,14 @@ uninstall-hook: 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 $@ INSTALL: lib/INSTALL - cp $(srcdir)/lib/INSTALL $@ + $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@ ################################################################ diff --git a/aclocal.m4 b/aclocal.m4 index 14ff86272..be6169615 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,6 +29,7 @@ m4_include([m4/mkdirp.m4]) m4_include([m4/options.m4]) m4_include([m4/runlog.m4]) m4_include([m4/sanity.m4]) +m4_include([m4/silent.m4]) m4_include([m4/strip.m4]) m4_include([m4/substnot.m4]) m4_include([m4/tar.m4]) diff --git a/configure b/configure index 5dd8a9af3..4726c3c29 100755 --- a/configure +++ b/configure @@ -569,6 +569,8 @@ PERL_THREADS PERL pkgvdatadir APIVERSION +AM_BACKSLASH +AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -639,6 +641,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules ' ac_precious_vars='build_alias host_alias @@ -1257,6 +1260,13 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') + Report bugs to . GNU Automake home page: . General help using GNU software: . @@ -2179,6 +2189,18 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=1;; +esac +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." diff --git a/configure.ac b/configure.ac index 759952dde..d54a7400f 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 c794766f4..acdf0fa2f 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/doc/Makefile.in b/doc/Makefile.in index fbac159e6..2cda682b7 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -44,16 +44,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = +AM_V_DVIPS = $(am__v_DVIPS_$(V)) +am__v_DVIPS_ = $(am__v_DVIPS_$(AM_DEFAULT_VERBOSITY)) +am__v_DVIPS_0 = @echo " DVIPS " $@; +AM_V_MAKEINFO = $(am__v_MAKEINFO_$(V)) +am__v_MAKEINFO_ = $(am__v_MAKEINFO_$(AM_DEFAULT_VERBOSITY)) +am__v_MAKEINFO_0 = @echo " MAKEINFO" $@; +AM_V_INFOHTML = $(am__v_INFOHTML_$(V)) +am__v_INFOHTML_ = $(am__v_INFOHTML_$(AM_DEFAULT_VERBOSITY)) +am__v_INFOHTML_0 = @echo " INFOHTML" $@; +AM_V_TEXI2DVI = $(am__v_TEXI2DVI_$(V)) +am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_$(AM_DEFAULT_VERBOSITY)) +am__v_TEXI2DVI_0 = @echo " TEXI2DVI" $@; +AM_V_TEXI2PDF = $(am__v_TEXI2PDF_$(V)) +am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_$(AM_DEFAULT_VERBOSITY)) +am__v_TEXI2PDF_0 = @echo " TEXI2PDF" $@; +AM_V_texinfo = $(am__v_texinfo_$(V)) +am__v_texinfo_ = $(am__v_texinfo_$(AM_DEFAULT_VERBOSITY)) +am__v_texinfo_0 = -q +AM_V_texidevnull = $(am__v_texidevnull_$(V)) +am__v_texidevnull_ = $(am__v_texidevnull_$(AM_DEFAULT_VERBOSITY)) +am__v_texidevnull_0 = > /dev/null INFO_DEPS = $(srcdir)/automake.info TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex am__TEXINFO_TEX_DIR = $(top_srcdir)/lib @@ -99,6 +126,7 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -197,7 +225,7 @@ dist_man1_MANS = \ 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=$@ @@ -263,7 +291,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): .texi.info: - restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ am__cwd=`pwd` && $(am__cd) $(srcdir) && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ @@ -285,18 +313,18 @@ $(am__aclocal_m4_deps): rm -rf $$backupdir; exit $$rc .texi.dvi: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) $< + $(TEXI2DVI) $(AM_V_texinfo) $< $(AM_V_texidevnull) .texi.pdf: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2PDF) $< + $(TEXI2PDF) $(AM_V_texinfo) $< $(AM_V_texidevnull) .texi.html: - rm -rf $(@:.html=.htp) - if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) + $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) $<; \ then \ rm -rf $@; \ @@ -331,8 +359,8 @@ mostlyclean-vti: maintainer-clean-vti: -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi .dvi.ps: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - $(DVIPS) -o $@ $< + $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(DVIPS) $(AM_V_texinfo) -o $@ $< uninstall-dvi-am: @$(NORMAL_UNINSTALL) @@ -782,7 +810,7 @@ uninstall-man: uninstall-man1 $(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) @@ -794,7 +822,7 @@ $(srcdir)/automake-$(APIVERSION).1: $(srcdir)/../automake.in # 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 077b9797a..4399644b2 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/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index d3192d9ee..30c307a00 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -42,14 +42,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -118,6 +124,7 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -631,11 +638,11 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-nodist_perllibDATA 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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index e44898b60..f08da2ae2 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -40,14 +40,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = # If stdout is a non-dumb tty, use colors. If test -t is not supported, @@ -134,6 +140,7 @@ TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 4eb619e9f..cad2a2a99 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -45,14 +45,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -121,6 +127,7 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index 0ea9842b7..8b22464b9 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -42,14 +42,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -78,6 +84,7 @@ DATA = $(dist_am_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ diff --git a/m4/Makefile.in b/m4/Makefile.in index be63131da..9d3481485 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -42,14 +42,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -78,6 +84,7 @@ DATA = $(dist_m4data_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ diff --git a/tests/Makefile.am b/tests/Makefile.am index 3ed0cabe6..7f6910be9 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 \ diff --git a/tests/Makefile.in b/tests/Makefile.in index c4914c8ef..f1da373d7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -42,14 +42,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ $(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \ $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ - $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ + $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ + $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = defs aclocal-${APIVERSION} automake-${APIVERSION} CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = # If stdout is a non-dumb tty, use colors. If test -t is not supported, @@ -138,6 +144,7 @@ TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APIVERSION = @APIVERSION@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -1325,15 +1332,15 @@ uninstall-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 $@ defs-p: defs Makefile.am - sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@ + $(AM_V_GEN)sed 's,^AM_INIT_AUTOMAKE$$,&([parallel-tests]),' < defs >$@ clean-local: clean-local-check .PHONY: clean-local-check -- 2.47.2