Merge branch 'maint'

diff --cc ChangeLog
index f8c2dc3,b9ce4c9..8adc8a3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,76 +1,54 @@@
 -2010-01-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 -
 -      Fix silent-rules output for disabled dependency tracking.
 -      * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
 -      expansion code to also work in the case where %AMDEP% expands
 -      to FALSE at config.status time, using new substitution string
 -      %VERBOSE-NODEP%.
 -      * automake.in (verbose_nodep_flag): New function, appending
 -      `@am__nodep@' to the verbose-variable name.
 -      (handle_languages): If dependencies are not disabled, use it to
 -      set %VERBOSE-NODEP%.
 -      * m4/depend.m4: Substitute am__nodep as '_no', so the second
 -      verbose-variable will always expand to an empty string, if
 -      dependencies are enabled.
 -      * tests/silent5.test: Also test --disable-dependency-tracking;
 -      also test per-target flags for non-C language files.
 -      * tests/silent9.test: New test, like silent4.test but disable
 -      dependency tracking.
 -      * tests/Makefile.am: Adjust.
 -      * NEWS, THANKS: Update.
 -      Report by Dmitry V. Levin <ldv@altlinux.org>.
 -
+ 2010-06-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       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.
+       * tests/silent5.test: Likewise.
+       * tests/silent9.test: Likewise.
+ 
  2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Extend test on `nostdinc' automake option.

diff --cc tests/Makefile.am
index cff34c5,3a0a776..eefdb41
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -622,8 -609,12 +622,13 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
  silent9.test \
+ silentcxx.test \
+ silentf77.test \
+ silentf90.test \
+ silentlex.test \
+ silentyacc.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \

diff --cc tests/Makefile.in
index 3ff9012,b344e7c..fb75877
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -863,8 -847,12 +863,13 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
  silent9.test \
+ silentcxx.test \
+ silentf77.test \
+ silentf90.test \
+ silentlex.test \
+ silentyacc.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \