Merge branch 'dr-cscope'

* dr-cscope:
  Fixups and tests for cscope functionality.
  New target to generate cscope database.

diff --cc ChangeLog
index c76e5596cbe2777df69b8ad631a9ad11d86ef5dd,e425420a42e145aa2a0f0874faa698aebcf3650c..db7ed8b61a1c29d5017ce164b2a6b9a5cb45d6d2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,33 -1,44 +1,74 @@@
+ 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 Makefile.in
Simple merge

diff --cc NEWS
index 26a8b31a3c259ec13861080e729cf0365ee5ab9e,ef608da39bf2fef448f544907f33eb10d3106139..ef46ee7863e365643595d6e6d02d17719ed855b7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,14 @@@
 -New in 1.11.0a:
 +New in 1.11a:
 +
 +* Changes to automake:
 +
 +  - automake now generates silenced rules for texinfo outputs.
  
 -Bugs fixed in 1.11.0a:
+ * New targets:
+ 
+   - New `cscope' target to build a cscope database for the source tree.
+ 
 +Bugs fixed in 1.11a:
  
  * Bugs introduced by 1.11:
  

diff --cc automake.in
Simple merge

diff --cc doc/Makefile.in
Simple merge

diff --cc lib/Automake/Makefile.in
Simple merge

diff --cc lib/Automake/tests/Makefile.in
Simple merge

diff --cc lib/Makefile.in
Simple merge

diff --cc lib/am/Makefile.in
Simple merge

diff --cc m4/Makefile.in
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge