* Makefile.am (TAGS_FILES): New macro.

	(ETAGS_ARGS): Moved files into TAGS_FILES.
	(TAGS_DEPENDENCIES): Likewise.
	(ETAGS_ARGS): Removed.
	(TAGS_DEPENDENCIES): Removed duplicate definition.
	* tags.am (ID): Handle VPATH correctly.  Use TAGS_FILES.  Report
	from Ganesan Rajagopal.
	(TAGS): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1dd95defb7a47f847abe3c04401cbe76fcdb2c64..b7d34065219eaeba447e6d7e593064a3127c8840 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-06-20  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.am (TAGS_FILES): New macro.
+       (ETAGS_ARGS): Moved files into TAGS_FILES.
+       (TAGS_DEPENDENCIES): Likewise.
+       (ETAGS_ARGS): Removed.
+       (TAGS_DEPENDENCIES): Removed duplicate definition.
+
+       * tags.am (ID): Handle VPATH correctly.  Use TAGS_FILES.  Report
+       from Ganesan Rajagopal.
+       (TAGS): Likewise.
+
 1999-06-18  Thomas Tanner  <tanner@ffii.org>
 
        * automake.in (handle_ltlibraries): Check for -module in LDFLAGS,

diff --git a/Makefile.am b/Makefile.am
index 0a7a901e2eec370abba6bdc584c1242c00bf35fb..3a4e9b2ef9b95170a082b51194877ff2da138f48 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,10 +35,12 @@ install-data-hook:
          chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
        done
 
+TAGS_FILES = automake.in aclocal.in $(amfiles)
+
 # The following requires a fixed version of the Emacs 19.30 etags.
-ETAGS_ARGS = automake.in aclocal.in --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
-TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi
+ETAGS_ARGS = --lang=none \
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
+TAGS_DEPENDENCIES = automake.texi
 
 ## `test -x' is not portable.  So we use Perl instead.  If Perl
 ## doesn't exist, then this test is meaningless anyway.
@@ -131,8 +133,3 @@ path-check: distdir
          status=$$?; \
          rm -rf $(distdir); \
          exit $$status
-
-## Just get the .am files into TAGS.  We don't really care too much if
-## any interesting tags show up.
-ETAGS_ARGS = $(amfiles)
-TAGS_DEPENDENCIES = $(ETAGS_ARGS)

diff --git a/Makefile.in b/Makefile.in
index efc182bce9a052a803f4d41fc84ec1d945208df9..c559e9ea046e27d5d2351d39506b86b13f0939b9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,8 +92,13 @@ dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall compile
 
 
-ETAGS_ARGS = $(amfiles)
-TAGS_DEPENDENCIES = $(ETAGS_ARGS)
+TAGS_FILES = automake.in aclocal.in $(amfiles)
+
+# The following requires a fixed version of the Emacs 19.30 etags.
+ETAGS_ARGS = --lang=none \
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
+
+TAGS_DEPENDENCIES = automake.texi
 
 EXTRA_DIST = ChangeLog.1996 ChangeLog.1998
 subdir = .
@@ -401,15 +406,17 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       here=`pwd` && cd $(srcdir) \
-         && mkid -f$$here/ID $$unique $(LISP)
+       mkid -f$$here/ID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -417,12 +424,14 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
            test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
    fi; \
        done; \
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+         || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
 mostlyclean-tags:
 

diff --git a/THANKS b/THANKS
index 217e089e5d2106f74159d6945622c8e4e0105b65..b09f825336bf48d5d1d0edc51ab7b774b2c62909 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,7 @@ Erez Zadok            ezk@cs.columbia.edu
 Erick Branderhorst     branderh@iaehv.nl
 François Pinard                pinard@iro.umontreal.ca
 Fred Fish              fnf@ninemoons.com
+Ganesan Rajagopal      rganesan@novell.com
 Garrett D'Amore                garrett@qualcomm.com
 Garth Corral           garthc@inktomi.com
 Gary V Vaughan         gvaughan@oranda.demon.co.uk

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 0a7a901e2eec370abba6bdc584c1242c00bf35fb..3a4e9b2ef9b95170a082b51194877ff2da138f48 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -35,10 +35,12 @@ install-data-hook:
          chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
        done
 
+TAGS_FILES = automake.in aclocal.in $(amfiles)
+
 # The following requires a fixed version of the Emacs 19.30 etags.
-ETAGS_ARGS = automake.in aclocal.in --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
-TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi
+ETAGS_ARGS = --lang=none \
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
+TAGS_DEPENDENCIES = automake.texi
 
 ## `test -x' is not portable.  So we use Perl instead.  If Perl
 ## doesn't exist, then this test is meaningless anyway.
@@ -131,8 +133,3 @@ path-check: distdir
          status=$$?; \
          rm -rf $(distdir); \
          exit $$status
-
-## Just get the .am files into TAGS.  We don't really care too much if
-## any interesting tags show up.
-ETAGS_ARGS = $(amfiles)
-TAGS_DEPENDENCIES = $(ETAGS_ARGS)

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 38041e7408a39a9b522ad7a9c23d3747f87d9bdd..9f7f1f2adf59f8b6d0935b167a15822ec3d94b8b 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995-1998, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,16 +17,19 @@
 ## 02111-1307, USA.
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 ## Make sure the list of sources is unique.
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+## Handle VPATH correctly.
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       here=`pwd` && cd $(srcdir) \
-         && mkid -f$$here/ID $$unique $(LISP)
+       mkid -f$$here/ID $$unique $(LISP)
 
-TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
 SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -36,10 +39,13 @@ SUBDIRS         test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
 SUBDIRS   fi; \
 SUBDIRS        done; \
 ## Make sure the list of sources is unique.
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+## Handle VPATH correctly.
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
        test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP) -o $$here/TAGS)
+         || etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP)

diff --git a/tags.am b/tags.am
index 38041e7408a39a9b522ad7a9c23d3747f87d9bdd..9f7f1f2adf59f8b6d0935b167a15822ec3d94b8b 100644 (file)
--- a/tags.am
+++ b/tags.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995-1998, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -17,16 +17,19 @@
 ## 02111-1307, USA.
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 ## Make sure the list of sources is unique.
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+## Handle VPATH correctly.
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
-       here=`pwd` && cd $(srcdir) \
-         && mkid -f$$here/ID $$unique $(LISP)
+       mkid -f$$here/ID $$unique $(LISP)
 
-TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: @DIRS@ $(HEADERS) $(SOURCES) @CONFIG@ $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
        tags=; \
        here=`pwd`; \
 SUBDIRS        list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -36,10 +39,13 @@ SUBDIRS         test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
 SUBDIRS   fi; \
 SUBDIRS        done; \
 ## Make sure the list of sources is unique.
-       list='$(SOURCES) $(HEADERS)'; \
-       unique=`for i in $$list; do echo $$i; done | \
+       list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+## Handle VPATH correctly.
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
          awk '    { files[$$0] = 1; } \
               END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
        test -z "$(ETAGS_ARGS)@CONFIG@$$unique$(LISP)$$tags" \
-         || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP) -o $$here/TAGS)
+         || etags $(ETAGS_ARGS) $$tags @CONFIG@ $$unique $(LISP)