From: Tom Tromey <tromey@redhat.com>
Date: Sun, 6 Jan 2002 20:23:30 +0000 (+0000)
Subject: 	* automake.texi (Tags): Document new variables.
X-Git-Tag: Release-1-5d~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=157b85267ae69f5f494332818e9fc406ff9e2236;p=thirdparty%2Fautomake.git

	* 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 ebaebe91d..13058f3a8 100644
--- 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 4049831fc..430ff7799 100644
--- 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 5323dfdcc..f961a185c 100644
--- 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 3de66d653..8e4dcdf26 100644
--- 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 3de66d653..8e4dcdf26 100644
--- 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