Merge branch 'maint'

diff --cc ChangeLog
index db7ed8b61a1c29d5017ce164b2a6b9a5cb45d6d2,9e45e73b1bdb6f6d33697a4da9304a79f88b0473..b54cf75bc087701c1fbedc01177f982360feafa3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,74 -1,22 +1,93 @@@
+ 2009-10-06  Bruno Haible  <bruno@clisp.org>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Fix 'compile' script to not call mv when target equals source.
+       * lib/compile: Don't attempt to move the generated file to its
+       target destination when it is already at the target destination.
+       Avoids an mv failure with subdir-objects.
+       * tests/ccnoco3.test: New test.
+       * tests/Makefile.am: Adjust.
+ 
+ 2009-10-01  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
+ 
+       Fix recommended way to run automake's test scripts with Zsh.
+       * tests/README (Supported shells): Changed the recommended way
+       to run automake's test scripts with Zsh.  Now we tell to use
+       the Zsh's command line option `-o no_function_argzero', not
+       `--no-function-argzero', since the latter does not work with
+       versions 3.x of Zsh.
+ 
 +2009-09-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fixups and tests for cscope functionality.
 +      It seems cscope is not able to take into account relative
 +      file names of included cscope.files files, but it is able to
 +      canonicalize file names containing '../' sequences.
 +      This patch makes the cscope references relative again, and
 +      fixes some corner cases.
 +      * NEWS: Reword a bit.
 +      * THANKS: Update.
 +      * automake.in (handle_tags): Use $(am__cd).  Provide default
 +      empty rule for the `cscope' target, for empty sources.
 +      * lib/am/tags.am (cscopelist): Construct relative path to files
 +      in $(srcdir) if $(srcdir) is relative.
 +      [TOPDIR_P] (cscope): Do not depend on cscope-clean.  Only invoke
 +      $(CSCOPE) if cscope.files is nonemtpy.
 +      (clean-cscope): Rename from ...
 +      (cscopeclean): ... this.
 +      (cscope.files): Depend on clean-cscope.
 +      (distclean-tags) [!TOPDIR_P]: No need to remove cscope files
 +      here.
 +      * tests/cscope.test, tests/cscope2.test, tests/cscope3.test: New
 +      tests.
 +      * tests/Makefile.am: Adjust.
 +
 +2009-09-25  Debarshi Ray  <rishi@gnu.org>
 +
 +      New target to generate cscope database.
 +      * automake.in (handle_tags): Handle cscope.
 +      * doc/automake.texi (Tags): Document cscope.
 +      * lib/am/tags.am (CSCOPE): New macro.
 +      [TOPDIR_P] (AM_RECURSIVE_TARGETS): Add cscope.
 +      (cscope): New target.
 +      (cscopeclean): Likewise.
 +      (cscope.files): Likewise.
 +      (cscopelist): Likewise.
 +      (distclean-tags): Remove `cscope.out', `cscope.in.out',
 +      `cscope.po.out' and `cscope.files'.
 +      * NEWS: Update.
 +      Based upon earlier patch from Jesse Barnes.
 +
 +2009-09-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      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  <endgame.dos@gmail.com>
 +
 +      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  <trojkan@gmail.com>  (tiny change)
  
        Fix link to "Recursive Make Considered Harmful" paper.

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge