* automake.texi (Tags): Document new variables.

	* lib/am/tags.am (ETAGS): New macro.
	(ETAGSFLAGS): Likewise.
	(TAGS): Use them.

diff --git a/ChangeLog b/ChangeLog
index ebaebe91d56008cdbfc0956ff3e92e44eaf829e7..13058f3a86c9a091c3204d3428d1f1baa8285399 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-06  Tom Tromey  <tromey@redhat.com>
+
+       * automake.texi (Tags): Document new variables.
+       * lib/am/tags.am (ETAGS): New macro.
+       (ETAGSFLAGS): Likewise.
+       (TAGS): Use them.
+
 2002-01-04  Tom Tromey  <tromey@redhat.com>
 
        * configure.in (ACLOCAL): Set perllibdir.  From Nicolas Joly.

diff --git a/automake.texi b/automake.texi
index 4049831fcee37d0a2eeda0329b676824ed68d323..430ff7799c35286a7b844986655a57f345fa4e6c 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -4021,8 +4021,12 @@ subdirectories.
 The @code{tags} target will also be generated if the variable
 @code{ETAGS_ARGS} is defined.  This variable is intended for use in
 directories which contain taggable source that @code{etags} does not
-understand.
+understand.  The user can use the @code{ETAGSFLAGS} to pass additional
+flags to @code{etags}; @code{AM_ETAGSFLAGS} is also available for use in
+@file{Makefile.am}.
 @vindex ETAGS_ARGS
+@vindex ETAGSFLAGS
+@vindex AM_ETAGSFLAGS
 
 Here is how Automake generates tags for its source, and for nodes in its
 Texinfo file:

diff --git a/lib/am/tags.am b/lib/am/tags.am
index 5323dfdcce7bb1a312d0e35a6b8a8b202ecf3ea7..f961a185c11a114f183c2903d3810f275855e7b8 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -41,6 +41,9 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 ## TAGS.  ##
 ## ------ ##
 
+ETAGS = etags
+ETAGSFLAGS =
+
 TAGS: %DIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        tags=; \
@@ -63,7 +66,8 @@ TAGS: %DIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
               END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-         || etags $(ETAGS_ARGS) $$tags $$unique
+         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique
 
 
 ## --------------- ##

diff --git a/stamp-vti b/stamp-vti
index 3de66d653d4b0337e4d53e720ef2744953281aaa..8e4dcdf2676c3f38a24cd5a79cb4541908e029ac 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 2 January 2002
+@set UPDATED 6 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c

diff --git a/version.texi b/version.texi
index 3de66d653d4b0337e4d53e720ef2744953281aaa..8e4dcdf2676c3f38a24cd5a79cb4541908e029ac 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 2 January 2002
+@set UPDATED 6 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c