Merge branch 'always-support-silent-rules'

* always-support-silent-rules:
  silent rules: support for them is always active now

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc NEWS
index d5d80f0,b56cd3d..8e2ee31
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -29,29 -33,12 +29,40 @@@ New in 1.13
                            of the now-removed automatic de-ANSI-fication
                            support of Automake)
  
 -  - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
 -    the next major Automake version (1.13).
 +  - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
 +
++* Silent rules support:
++
++  - Support for silent rules is now always active in Automake-generated
++    Makefiles.  So, although the verbose output is still the default,
++    the user can now always use "./configure --enable-silent-rules" or
++    "make V=0" to enable quieter output in the package he's building.
++
++  - The 'silent-rules' option has now become a no-op, preserved for
++    backward-compatibility only.  In particular, its use does not disable
++    the warnings in the 'portability-recursive' category anymore.
++
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +New in 1.12.1:
 +
 +* WARNING: Future backward-incompatibilities!
 +
 +  - Autoconf 2.65 or later will be required by the next major Automake
 +    version (1.13).  Until now, Automake has required Autoconf version
 +    2.62 or later.
 +
 +  - Starting from the next major Automake version (1.13), the rules to
 +    build pdf, ps and dvi output from Texinfo input will use the '--tidy'
 +    option by default.  Since such an option was introduced in Texinfo
 +    4.9, this means that Makefiles generated by future Automake versions
 +    will require at least that version of Texinfo.
  
 -  - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option)
 -    will be deprecated in the next minor version of Automake (1.12.1) and
 -    removed in the next major version (1.13).
 +  - Starting from the next major Automake version (1.13), the parallel
 +    testsuite harness (previously only enabled by the 'parallel-tests'
 +    option) will become the default one; the older serial testsuite
 +    harness will still be available through the use of the 'serial-tests'
 +    option.
  
    - Support for the two- and three-arguments invocation forms of the
      AM_INIT_AUTOMAKE macro will be deprecated in the next minor version

diff --cc automake.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc lib/Automake/Options.pm
Simple merge

diff --cc t/list-of-tests.mk
Simple merge