From: Ralf Wildenhues Date: Sun, 6 Jun 2010 10:24:43 +0000 (+0200) Subject: Merge branch 'jk-silent' X-Git-Tag: ng-0.5a~417 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e19bbfdb39202222d68e44db62e1c50ca7cd8bb;p=thirdparty%2Fautomake.git Merge branch 'jk-silent' * jk-silent: Tiny fix in silent8.test (display output of `make' command). Signed-off-by: Ralf Wildenhues --- 1e19bbfdb39202222d68e44db62e1c50ca7cd8bb diff --cc ChangeLog index 8adc8a346,ade5de50e..237da58a0 --- a/ChangeLog +++ b/ChangeLog @@@ -1,48 -1,627 +1,52 @@@ 2010-06-06 Stefano Lattarini + Tiny fix in silent8.test (display output of `make' command). + * tests/silent8.test: Make sure that the captured output of `make' + command is always displayed. + -2009-12-05 Ralf Wildenhues - - Fix requirements of silent8.test. - * tests/silent8.test: Require makeinfo --html, tex, texi2dvi -o, - dvips. - -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. - * automake.in (define_verbose_texinfo): Define several new verbose - tagvars and verbose vars. - (define_verbose_tagvar): Increase spacing to 8 to accommodate - MAKEINFO, TEXI2DVI, TEXI2PDF. - (handle_texinfo): Additional substitution for silencing dvips. - (output_texinfo_build_rules): Additional substitutions for - silencing texi2dvi and texi2pdf. - * lib/am/texibuild.am: Add silencing to makeinfo, makeinfo --html, - texi2dvi and texi2pdf rules. - * lib/am/texinfos.am: Add silencing to .dvi.ps rule. - * tests/Makefile.am: Add silent8.test. - * tests/silent8.test: New test: tests that silent texinfo rules - produce quiet messages. - * NEWS: Update. - -2009-09-18 Peter Johansson (tiny change) - - Fix link to "Recursive Make Considered Harmful" paper. - * doc/automake.texi (Alternative): Fix broken URL. - -2009-09-11 Reuben Thomas (tiny patch) - - Fix outdated reference to sh-utils in the manual. - * doc/automake.texi (Options): The reference to `sh-utils' - should be to `coreutils'. - -2009-09-06 Ralf Wildenhues - - Avoid sleeping for one second most of the time in sanity check. - * m4/sanity.m4 (AM_SANITY_CHECK): Try sanity check first without - sleeping for a second, and only if that failed, sleep and try - again, to avoid the delay in the common case of a configure - script that is older than a second, or a system with sub-second - time stamp granularity. - Report and different patch by Jim Meyering. - -2009-09-06 Stefano Lattarini (tiny change) - - tests/README: warn about zsh incompatibilities. - * tests/README (User interface, Getting details from failures): - Explicitly state that every test is a "shell script", not just - a "script", and that it's run by `/bin/sh' by default. - * tests/README (User interface, Supported shells): New subsection, - telling about expected portability of the automake test scripts, - describing a zsh incompatibility (w.r.t. $0), and a workaround to - it (with the `--no-function-argzero' option). - - testsuite: fix a minor glitch. - * tests/defs.in (exit trap): Use `$me', not `$as_me', as the - name of the current test (used in error messages). - * THANKS: Update. - -2009-07-08 Jim Meyering - - manual: fix a trivial grammar error. - * doc/automake.texi (Invoking aclocal): Fix grammar. - -2009-06-07 Ralf Wildenhues - - AM_PROG_GCJ: use AC_CHECK_TOOLS for gcj, for cross compilation. - * m4/gcj.m4 (AM_PROG_GCJ): Use AC_CHECK_TOOLS, rather than - AC_CHECK_PROGS, when searching for `gcj'. - * NEWS: Update. - Report by Jack Kelly. - -2009-05-24 Jack Kelly (tiny change) - Ralf Wildenhues - - AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT. - * tests/gcj6.test: New test. - * tests/Makefile.am: Update; mark gcj6.test as XFAIL. - * THANKS: Update. - -2009-05-24 Ralf Wildenhues - - parallel-tests: avoid GNU make 3.80 substitution bug. - * lib/am/check.am [PARALLEL_TESTS] (check-TESTS): Remove any - `.log' entries from `$(TEST_LOGS)' even if the list is nonempty, - to work around GNU make 3.80 substitution reference issue with - trailing white space in the variable. - * tests/parallel-tests10.test: New test. - * tests/parallel-tests6.test: Update comment. - * tests/Makefile.am: Update. - * NEWS: Update. - Report by Bob Friesenhahn. - -2009-05-23 Ralf Wildenhues - - testsuite: unset installation directory variables. - * tests/defs.in: Before test execution, be sure to unset all - installation directory variables, so they cannot have an effect - on a `make -e install' command within a test. - Report by Dagobert Michelsen. - - testsuite: do not change the mode of installed Libtool files. - * tests/defs.in: Do not use `chmod -R' on the test directory, as - that may change or try to change the mode of installed files: - the test directory may contain symlinks to ltmain.sh files from - a Libtool installation, and Solaris `chmod -R' touches symlink - targets. Instead, use the cleanup strategy used in distdir.am. - * NEWS: Update. - Report by Dagobert Michelsen. - - testsuite: do not fail in cleanup code. - * tests/defs.in: Turn off errexit in the cleanup trap, to avoid - a test failure due to a nonzero command. - * THANKS: Update. - Report by Dagobert Michelsen. - -2009-05-23 Peter O'Gorman - - python: do not install in system directories on Darwin 9. - On Darwin 9, get_python_lib returns a path below `/Library/Python' - regardless of the `prefix' argument it was passed, causing `make - install' to target the system directories regardless of `--prefix' - argument used. Work around this Darwin bug by ignoring the result - of get_python_lib if it points outside of the passed prefix, and - the prefix was not a system directory. - * m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the - initial portion of the pythondir returned by get_python_lib, then - ignore it unless the configured prefix is `/usr' or starts with - `/System'. Fixes instmany-python.test failure on Mac OS X 10.5.7. - * NEWS: Update. - -2009-05-23 Ralf Wildenhues - - Clarify how to enable `silent-rules' and other global options. - * doc/automake.texi (Options): When introducing options, be more - careful to note that not all of them can be specified in - AUTOMAKE_OPTIONS statements, and that some do not make sense in - subdirectories. Note more prominently that `silent-rules' can - only be specified in configure.ac. - * lib/Automake/Options.pm (_process_option_list): Improve error - message for `silent-rules', `tar-v7', `tar-ustar', `tar-pax' - options specified in Makefile.am files. - Report by Bruno Haible. - -2009-05-21 Ralf Wildenhues - - Skip specflg10.test without a C++ compiler. - * tests/specflg10.test: Require g++. - Report by Thien-Thi Nguyen. - -2009-05-19 Ralf Wildenhues - - Revert last patch, IRIX has an editor named `jot'. - * tests/instmany-mans.test: Do not try `jot'. - * tests/instmany-python.test: Likewise. - * tests/instmany.test: Likewise. - Report by Peter O'Gorman. - -2009-05-18 Ralf Wildenhues - - testsuite: also try `jot' as `seq' replacement. - * tests/instmany-mans.test: Try BSD `jot' before resorting to a - slow but portable shell loop. - * tests/instmany-python.test: Likewise. - * tests/instmany.test: Likewise. - Suggestion by Peter O'Gorman. - - Fix test failure when pkg.m4 is not found, only pkg-config. - * tests/vala5.test: Update comment, this test is not expected to - fail any more. Require valac version 0.7.0. Skip if configure - fails, could be due to unexpanded PKG_CHECK_MODULES or too old - valac. - Report by Simon Josefsson. - -2009-05-17 Ralf Wildenhues - - Automake 1.11. - * configure.ac: Bump version to 1.11. - * doc/automake.texi (Releases): Add line for 1.11. Remove line - for 1.10b. - - Fix maintainer-check failures. - * automake.in (lang_vala_finish_target): Use `$(am__cd)' instead - of plain `cd'. - * tests/vala2.test: Use `rm -f' instead of `rm'. - - Revert Automake license to GPLv2+. - Automake will move to GPLv3+ once the Exception statement has - been rewritten to use the new GPLv3 exception language. This - change does not impact the COPYING file that may be installed - by `automake --add-missing'. - * COPYING: Revert to GPLv2. All uses changed. - * NEWS: Update. - - Rewrite NEWS for 1.11. - * NEWS: Rewrite, merging 1.10b and 1.10c entries. - - Sync auxiliary files from upstream. - * lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from - upstream. - - Update release statistics, improve release-stats rule. - * Makefile.am (release-stats): Output stderr of pstops in - addition to catching it, for better debugging. - * doc/automake.texi (Releases): Add line for 1.10.2. - - Cope with parallel BSD make -jN semantics. - When BSD `make -jN' is used without `-B' which enables backwards - compatible semantics, it may reuse the same shell for several - commands within a rule; so ensure we do not leave it in a - different directory, nor `exit 0' early in a multi-command rule. - * lib/am/distdir.am (distcheck): After running `distcleancheck', - change back to original working directory. - * lib/am/remake-hdr.am (%CONFIG_HIN%): Run autoheader in a - subshell. - * lib/am/mans.am (uninstall-man%SECTION%): Do not `exit 0' early - in a rule that consists of several shell invocations. Parallel - NetBSD `make -jN' without `-B' will use only one shell for all - commands, but won't respawn one after `exit 0'. Fixes - notrans.test failure. - * tests/makej2.test: New test. - * tests/Makefile.am: Update. - - Fix typo in comment. - * lib/am/install.am: Fix typo. - -2009-05-17 Matthias Klose (tiny change) - Ralf Wildenhues - - Let AM_PATH_PYTHON honor python's idea about the site directory. - * m4/python.m4 (AM_PATH_PYTHON): When computing pythondir and - pyexecdir, pass the expanded prefix resp. exec_prefix as `prefix' - to get_python_lib, so python can determine the name of the site - directory depending on the install location. Afterwards, replace - the directory names with the unexpanded values of $PYTHON_PREFIX - resp. $PYTHON_EXEC_PREFIX again, to allow override according to - the documentation. Fixes site directory computation for Debian - and Ubuntu (`dist-packages' for a prefix of `/usr' or `/usr/local', - `site-packages' elsewhere). - * NEWS, THANKS: Update. - -2009-05-17 Ralf Wildenhues - - Vala: for now, require GNU make. - * doc/automake.texi (Vala Support): GNU make is currently - required for Vala sources. - * tests/vala2.test, tests/vala3.test, tests/vala5.test: Require - GNU make. - -2009-05-17 Jürg Billeter - - Vala: Use $(srcdir) in rebuild rules. - valac is always run in srcdir as the generated files are distributed. - So srcdir needs to be taken into account in the rebuild rules to not - wrongly trigger a rebuild in the wrong directory. - * automake.in (lang_vala_finish_target): Rebuild files in - $(srcdir). - * tests/vala2.test: Test rebuild rules from VPATH build. - - Vala: Add and test rebuild rules for generated header and vapi files. - valac will generate additional files when using, for example, -H in - VALAFLAGS. We need to recognize these options and add appropriate - rebuild rules to fix parallel build. - * automake.in (lang_vala_finish_target): Recognize -H, -h, - --header, --internal-header, --vapi, --internal-api, --gir flags - to valac and rebuild rules for generated headers; distribute - and maintainer-clean them. - * tests/vala2.test: Test rebuild rules. - -2009-05-17 Jürg Billeter - Ralf Wildenhues - - Vala: Fix build when using per-target VALAFLAGS. - This does not yet implement full per-target support for VALAFLAGS, - however, this change at least fixes building when there is only one - target per source file, which is the most common situation. - * automake.in: Remove `VALAFLAGS' from `flags' in language struct. - (lang_vala_finish_target): Handle `*_VALAFLAGS rewriting' manually - here; check `VALAFLAGS' user variables. - * tests/Makefile.am (XFAIL_TESTS): Remove vala5.test. - * doc/automake.texi (Vala Support): Document per-target flag - limitations. - -2009-05-11 Ralf Wildenhues - - For PR automake/540: - Document some formatting restrictions for Makefile.am files. - * doc/automake.texi (General Operation, Usage of Conditionals): - Variable assignments should not be indented by TABs, rule commands - should. Conditional keyword statements should not be indented. - * THANKS: Update. - Report by Luo Yi. - -2009-05-03 Ralf Wildenhues - - Fix copyright years in *.am files. - * lib/am/check.am, lib/am/check2.am, lib/am/distdir.am, - lib/am/program.am, lib/am/tags.am: Fix copyright years. - - distdir: avoid duplicate `find' traversal with subpackages. - * lib/am/distdir.am (distdir) [%?SUBDIRS%]: When recursing, set - `am__skip_mode_fix'. - [%?TOPDIR_P%]: When `$(am__skip_mode_fix)' is set, avoid tree - walk. - * tests/subpkg4.test: New test, to ensure that we still walk the - whole tree while fixing permissions. We don't ensure it is - walked once only. - * tests/Makefile.am: Update. - - Disable test cleanup trap with OSF1/Tru64 sh. - * configure.ac: Test whether /bin/sh has working 'set -e' - in conjunction with an exit trap. Set $am_cv_sh_errexit_works - accordingly, substitute sh_errexit_works, and warn about - leftover test directories with broken shells like Tru64 /bin/sh. - * tests/defs.in: Do not install any traps with broken shells. - -2009-05-02 Bruno Haible - Ralf Wildenhues - - Recommend *-local hooks without commands, for extensibility. - * doc/automake.texi (Clean): Show how to write the clean-local - extension with separate phony target. - * tests/Makefile.am (clean-local-check): Practice what we preach - by marking this phony. For consistency, rename from ... - (check-clean-local): ... this. - -2009-04-28 Eric Blake - - scripts: normalize all timestamps to UTC - * lib/compile (scriptversion): Update emacs hook. - * lib/depcomp (scriptversion): Likewise. - * lib/elisp-comp (scriptversion): Likewise. - * lib/gnupload (scriptversion): Likewise. - * lib/install-sh (scriptversion): Likewise. - * lib/mdate-sh (scriptversion): Likewise. - * lib/missing (scriptversion): Likewise. - * lib/mkinstalldirs (scriptversion): Likewise. - * lib/py-compile (scriptversion): Likewise. - * lib/ylwrap (scriptversion): Likewise. - -2009-04-27 Ralf Wildenhues - - silent-rules: fix alignment of less verbose output. - * automake.in (define_verbose_var): Define `$silent_var' as - VAR_ASIS, not VAR_PRETTY, to avoid squashing of multiple - adjacent spaces. - * tests/silent.test: Amend test. - Report by Jan Engelhardt. - -2009-04-25 Ralf Wildenhues - - manual: fix trivial grammar errors. - * doc/automake.texi (Subpackages, Vala Support, Java) - (Checking the Distribution, Timeline): Fix `a' vs. `an' errors - and duplicate `the'. - Report by Eric Blake. - - Indent rule commands consistently with a TAB. - * lib/am/check.am ($(TEST_SUITE_LOG)): Consistently use TAB, not - spaces, for indentation of commands, even if indentation may not - be needed at all. - * lib/am/texinfos.am (install-info-am): Likewise. - * THANKS: Update. - Prompted by report from John Calcote. - - parallel-tests: fix recheck* targets for non-GNU make. - * lib/am/check.am (recheck recheck-html): Override AM_MAKEFLAGS - to portably transport the TEST_LOGS settings through the - recursive `make' invocations. Fixes parallel-tests9.test - failure with Solaris make. - * tests/parallel-tests9.test: Also ensure that the test - summary is correct for `recheck'. - Suggestion by Akim Demaille. - -2009-04-22 Ralf Wildenhues - - Avoid racy depmodes with universal builds. - * m4/depend.m4 (_AM_DEPENDENCIES): If universal builds are used, - avoid racy depmodes. - * lib/depcomp: Ignore `-arch' argument for makedepend depmode. - Report by Bruno Haible, analysis by Bruno Haible, Peter O'Gorman, - and Eric Blake. - -2009-04-21 Fabian Alenius (tiny change) - - Fix link to autotools tutorial. - * doc/automake.texi (Autotools Introduction): Fix broken link. - * THANKS: Update. - -2009-04-19 Ralf Wildenhues - - testsuite: minor w32 fixes. - * tests/depend5.test: Don't fail if the system or file system - cannot handle weird characters, instead just try a few. - * tests/parallel-tests3.test: Really wait until the serial test - has finished, before letting the cleanup trap do its work. - Report by Bruno Haible. - - Avoid nonportable `./FILE' instead of `FILE' in test. - * tests/libtool3.test: Do not use `$(top_builddir)/sub/libname.la' - in *_LDADD entry if `$(top_builddir)' is `.'. Fixes test failure - with parallel NetBSD make. - - Detect make `include' style also with parallel non-GNU make. - Parallel NetBSD make outputs `--- $target ---' messages, - parallel HP-UX make outputs `Making target"$target"'. Just - ignore all additional output for the include test. - * m4/make.m4 (AM_MAKE_INCLUDE): Ignore additional output - produced by `make' to relax `include' style detection. - - manual: add FAQ `Debugging Make Rules'. - * doc/automake.texi (Debugging Make Rules): New FAQ section. - (Top, FAQ): Adjust menus, and capitalization of the description - of the `Hard-Coded Install Paths' node. - (Multiple Outputs): Add comment to restore font-lock for vim. - Suggestion by Karl Berry. - - Let XFile::lock warn and fail with parallel non-GNU make, too. - * lib/Automake/XFile.pm (lock): Also match `-j' for parallel BSD - make, and `-P' for parallel HP-UX make. - - Fix AM_PROG_VALAC version requirement detection. - * m4/vala.m4 (AM_PROG_VALAC): Remove `Vala ' from valac - --version string before comparing versions. - * tests/vala2.test: Require version 0.7.0 for the test. - Fixes failures of vala2.test and vala3.test with older valac. - - Correctly treat all assignments with bogus trailing comments. - Before this patch, automake would silently fail to diagnose and - to copy into the output those variable assignments which are - preceded by a comment, and end in backslash newline comment. - * automake.in (read_am_file): When determining whether an - escaped newline followed by a comment is an error, correctly use - the parser state, not the contents of a saved comment, which - could still be carried over from a comment before an assignment. - * NEWS: Update. - * tests/commen11.test: New test. - * tests/Makefile.am: Update. - Report by Karl Berry. - -2009-04-14 Karl Berry - - manual: improve markup: itemize list in `Extending'. - * doc/automake.texi (Extending): Use `@item's for user override - semantics. - -2009-04-13 Ralf Wildenhues - - bin_PROGRAMS = $(EXTRA_PROGRAMS) should work. - * automake.in (am_install_var): For `PROGRAMS' primary, strip - `$(EXEEXT)' here already, so the name uniquifying works even - when we look at names repeatedly, with inconsistent executable - extension; through variable references, we might have added - the extension ourselves earlier. - (handle_programs): No need to strip `$(EXEEXT)' here any more. - * tests/extra8.test: New test. - * tests/Makefile.am: Update. - * THANKS: Update. - Report by Daniel Richard G. - -2009-04-10 Jim Meyering - - Fix grammar in comments and documentation. - * doc/automake.texi (API versioning): Fix grammar. - * automake.in: Fix grammar in comment. - * lib/Automake/ChannelDefs.pm: Likewise. - * tests/ext2.test: Likewise. - -2009-04-19 Ralf Wildenhues - - More minor fixups to vala support. - * automake.in (lang_vala_finish_target): Fix typo in comment. - * doc/automake.texi (Vala Support): Fix typo. Declare vala - support as "initial". - * NEWS: Likewise, declare vala support as "initial". - -2009-04-05 Jürg Billeter - - Improve Vala support. - * automake.in: Update to Vala 0.7.0 semantics, recover from removal - of built sources, support silent-rules, drop _PKGNAME variables - * doc/automake.texi, NEWS: Update. - * lib/am/vala.am: Bump copyright years. - * m4/vala.m4: Likewise. - * tests/vala.test: Remove obsolete grep tests. - * tests/vala1.test: Likewise. - * tests/vala2.test: Test full build, distcheck, and distclean. - * tests/vala3.test: Likewise, also test with subdir-objects. - * tests/vala4.test: Bump copyright years. - * tests/vala5.test: New test for per-target flags, expected to fail. - * tests/Makefile.am: Update. - * THANKS: Update. - -2008-10-10 Ralf Wildenhues - - Minor fixups for Vala support. - * automake.in: $(VALAFLAGS) comes after $(AM_VALAFLAGS). - * doc/automake.texi (Vala Support): Add some references, - document AM_VALAFLAGS, streamline a bit. - * lib/am/vala.am: Copyright blurb. - * m4/vala.m4 (AM_PROG_VALAC): Rewrite using AS_VERSION_COMPARE. - * tests/vala.test: Fix minor nits. - * tests/vala1.test: Likewise. - * tests/vala2.test: Likewise. - * tests/vala3.test: Likewise. - * tests/vala4.test: New test, for version argument of - AM_PROG_VALAC. - * tests/Makefile.am: Update. - -2008-10-09 Mathias Hasselmann - - * automake.in: Support Vala in non-recursive builds. Make sure - foo_VALAFLAGS really use used. Inject --library switch when building - Vala libraries. - * doc/automake.texi, NEWS: Document Vala support. - * m4/vala.m4: Rename AC_PROG_VALAC to AM_PROG_VALAC. - * tests/Makefile.am: Additional Vala tests. - * tests/vala.test: Also test VALAFLAGS support. - * tests/vala1.test: Test non-recursive Vala support. - * tests/vala2.test: Test _PKGNAME variables. - * tests/vala3.test: Test compiling of C code generated by Vala. - -2008-10-09 Mathias Hasselmann - - Initial support for the vala programming language. - * automake.in: Add %known_libraries, lang_vala_rewrite, - lang_vala_finish and lang_vala_target_hook to support the Vala - programming language. Register Vala language hooks. - * lib/am/vala.am: Empty rules file to prevent creation of depend2 - based rules for Vala code. - * lib/am/Makefile.am (dist_am_DATA): Add vala.am. - * m4/vala.m4: Provide AC_PROG_VALAC for detecting the Vala compiler. - * m4/Makefile.am (dist_m4data_DATA): Add vala.m4. - * tests/vala.test: Test Vala support. - * tests/Makefile.am: Update. - -2009-04-14 Ralf Wildenhues - - testsuite: do not fail on systems without read permissions. - * tests/instfail-info.test: Do not use the `non-root' - requirement for testing whether files may be made unreadable; - instead use `test -r' and skip the test if that still works. - * tests/instfail-java.test: Likewise. - * tests/instfail-libtool.test: Likewise. - * tests/instfail.test: Likewise. - * tests/instmany-mans.test: Likewise. - * tests/instmany-python.test: Likewise. - * tests/instmany.test: Likewise. - * tests/parallel-tests9.test: Likewise. - - testsuite: parallel make fixes. - This patch fixes a couple of testsuite bugs exposed with - `MAKE=make\ -jN make check'. - * tests/libtoo10.test: Do not run `clean' in same $MAKE - invocation as `all check'. Fixes test failure with parallel - NetBSD `make -jN'. - * tests/nobase.test: Be sure to create a directory before - creating files in it. Fixes test failure with MAKE=`make -jN' - for NetBSD make. This issue is hidden with parallel GNU make - due to its parallel breadth first update order. - * tests/parallel-tests3.test: Skip if $MAKE contains `-j', - GNU make will use the environment variable $MAKE for recursion - and thus run in parallel even if `$MAKE -j1' was used on the - command line in the test. Also, after running the test proper, - wait long enough so that background jobs have finished and there - are no open files left when the cleanup code runs. - -2009-04-13 Ralf Wildenhues - - silent-rules reorganization, --enable-silent-rules switch. - This patch introduces a configure-time option to set the default - verbosity. Since configure now needs to know whether the - `silent-rules' automake option was set, the latter can only be - set within AM_INIT_AUTOMAKE, or with a new AM_SILENT_RULES macro - but not any more through AUTOMAKE_OPTIONS or the automake - command line option `--silent-rules'. - * automake.in (define_verbose_var): Define the default verbose - variable in terms of `$(AM_DEFAULT_VERBOSITY)'. - (handle_configure): Do not pass `--silent-rules' to automake. - (scan_autoconf_traces): Trace `AM_SILENT_RULES'. If seen, - enable global `silent-rules' option. - (usage): Do not document `--silent-rules'. - (parse_arguments): Do not accept `--silent-rules'. - * doc/automake.texi (Options): Overhaul. Document - AM_SILENT_RULES, --enable-silent-rules, --disable-silent-rules, - AM_DEFAULT_VERBOSITY. Show an example for user-added variables - for less verbose output. - (Invoking Automake): Remove documentation for `--silent-rules'. - (Public Macros): Document `AM_SILENT_RULES'. - * NEWS: Update. - * lib/Automake/Options.pm (_process_option_list): Accept - `silent-rules' only as option in configure.ac. - * m4/init.m4 (AM_INIT_AUTOMAKE): If the `silent-rules' option - was enabled, require `AM_SILENT_RULES'; move AM_BACKSLASH - initialization to ... - * m4/silent.m4 (AM_SILENT_RULES): ... this new file, new macro. - Deal with `--enable-silent-rules' switch; define - AM_DEFAULT_VERBOSITY. - * m4/Makefile.am (dist_m4data_DATA): Add silent.m4. - * tests/dollarvar.test: Remove tests for `--silent-rules', use - `AM_SILENT_RULES'. - * tests/flavor.test: Remove test for `--silent-rules'. - * tests/silent.test: Use `AM_SILENT_RULES' instead of - `AUTOMAKE_OPTIONS = silent-rules'; use `--enable-silent-rules'. + Make tests on user extensibility of silent-rules mode stricter. + * tests/silent6.test: Made stricter w.r.t. the grepping of the + output produced by `make'. + * tests/silent7.test: Likewise. + + Tests on silent-mode for C/Libtool made stricter. + * tests/silent.test: Made stricter w.r.t. the grepping of the + output produced by `make'. + * tests/silent2.test: Likewise. + * tests/silent4.test: Likewise. + * tests/silent9.test: Likewise. + * tests/silent3.test: Likewise, and add a final `make distclean' + command to keep it better in sync with tests/silent{4,9}.test. + + Improved test silent5.test. + * tests/silent5.test: Remove by hand all generated C files after + non-verbose builds, to ensure the following builds are clean. + Try to clean and rebuild with the same verbosity and without + removing generated sources in between, to check that this does + not trigger a different set of rules. Make grepping of make's + output stricter. Improved/added some comments. + + New tests for Automake silent-mode with Fortran. + * tests/silentf77.test: New test. + * tests/silentf90.test: Likewise. + * tests/Makefile.am (TESTS): Updated accordingly. + + New test `silentcxx.test' (Automake silent-mode with C++). + * tests/silentcxx.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + + New test `silentyacc.test' (Automake silent-mode with Yacc). + * tests/silentyacc.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + + New test `silentlex.test' (Automake silent-mode with Lex). + * tests/silentlex.test: New test. + * tests/Makefile.am (TESTS): Updated accordingly. + + Relax tests on silent-rules to cater to overly verbose makes. + * tests/silent.test: When testing silent builds, don't fail if + make's output simply contains the `mv' substring, but only if + it contains the `mv ' substring (note the trailing space). * tests/silent2.test: Likewise. * tests/silent3.test: Likewise. * tests/silent4.test: Likewise. diff --cc tests/silent8.test index 6833840d1,b008fc743..4c08da07e --- a/tests/silent8.test +++ b/tests/silent8.test @@@ -58,9 -57,10 +58,10 @@@ grep 'TEXI2PDF foo.pdf' stdout || Exit # Now make sure the labels don't appear in verbose mode. $MAKE clean || Exit 1 $MAKE V=1 dvi html info ps pdf >stdout || { cat stdout; Exit 1; } + cat stdout grep 'DVIPS foo.ps' stdout && Exit 1 grep 'MAKEINFO foo.html' stdout && Exit 1 -grep 'MAKEINFO foo.info' stdout && Exit 1 +grep 'MAKEINFO.*foo.info' stdout && Exit 1 grep 'TEXI2DVI foo.dvi' stdout && Exit 1 grep 'TEXI2PDF foo.pdf' stdout && Exit 1