11 files changed, 57 insertions, 21 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 161f2ba..a58b2d1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-16  Jason Merrill  <jason@redhat.com>
+
+	* Makefile.in, objc/Make-lang.in (objc.tags): Create TAGS.sub
+	files in each directory and TAGS files that include them for each
+	front end.
+
 2003-11-15  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/h8300/lib1funcs.asm (divnorm): Store the sign in bit
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d13c72e..a8f2865 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3364,18 +3364,19 @@ paranoia: paranoia.o real.o $(LIBIBERTY)
 
 # Update the tags table.
 TAGS: lang.tags
-	(cd $(srcdir);						     \
-	incs= ;							     \
-	list='$(SUBDIRS)'; for dir in $$list; do		     \
-	  if test -f $$dir/TAGS; then				     \
-	    incs="$$incs --include $$dir/TAGS";			     \
-	  fi;							     \
-	done;							     \
-	mkdir tmp-tags;						     \
-	mv -f c-parse.[ch] tmp-tags;				     \
-	etags *.y *.h *.c $$incs;				     \
-	mv tmp-tags/* .;					     \
-	rmdir tmp-tags)
+	(cd $(srcdir);					\
+	incs= ;						\
+	list='$(SUBDIRS)'; for dir in $$list; do	\
+	  if test -f $$dir/TAGS; then			\
+	    incs="$$incs --include $$dir/TAGS.sub";	\
+	  fi;						\
+	done;						\
+	mkdir tmp-tags;					\
+	mv -f c-parse.[ch] tmp-tags;			\
+	etags -o TAGS.sub *.y *.h *.c;			\
+	mv tmp-tags/* .;				\
+	rmdir tmp-tags;					\
+	etags --include TAGS.sub $$incs)
 
 # ------------------------------------------------------
 # Bootstrap-related targets (not used during 'make all')
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7f7414e..6274b06 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-16  Jason Merrill  <jason@redhat.com>
+
+	* Make-lang.in (ada.tags): Create TAGS.sub files in each directory
+	and TAGS files that include them for each front end.
+
 2003-11-14  Andreas Jaeger  <aj@suse.de>
 
 	* lang.opt: Change -Wno-long-long to -Wlong-long since the latter
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index ecc03c6..3f0dae8 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -1,4 +1,4 @@
-# Top level makefile fragment for GNU Ada (GNAT).
+# Top level -*- makefile -*- fragment for GNU Ada (GNAT).
 #   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 #   Free Software Foundation, Inc.
 
@@ -432,7 +432,9 @@ ada.start.encap:
 ada.rest.encap: 
 
 ada.tags: force
-	cd $(srcdir)/ada; etags *.c *.h *.ads *.adb
+	cd $(srcdir)/ada; etags -o TAGS.sub *.c *.h *.ads *.adb; \
+	etags --include TAGS.sub --include ../TAGS.sub
+
 ada.generated-manpages:
 
 # Generate documentation.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index eb3b0f0..5a5dc78 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-16  Jason Merrill  <jason@redhat.com>
+
+	* Make-lang.in (c++.tags): Create TAGS.sub files in each directory
+	and TAGS files that include them for each front end.
+
 2003-11-15  Bernardo Innocenti  <bernie@develer.com>
 
 	PR c++/2294
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 8017bbb..08afcff 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -114,7 +114,9 @@ c++.start.encap: g++$(exeext)
 c++.rest.encap:
 
 c++.tags: force
-	cd $(srcdir)/cp; etags *.c *.h
+	cd $(srcdir)/cp; etags -o TAGS.sub *.c *.h --language=none \
+	  --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' cp-tree.def; \
+	etags --include TAGS.sub --include ../TAGS.sub
 
 generated-manpages:: cp/g++.1
 
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 754ad1f..48e4d28 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-16  Jason Merrill  <jason@redhat.com>
+
+	* Make-lang.in (f77.tags): Create TAGS.sub files in each directory
+	and TAGS files that include them for each front end.
+
 2003-11-12  Andreas Jaeger  <aj@suse.de>
 
 	* intdoc.in (Signal Intrinsic (subroutine)): Fix texinfo warning
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 8c458df..d3b1b81 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -1,4 +1,4 @@
-# Top level makefile fragment for GNU Fortran.           -*-makefile-*-
+# Top level -*- makefile -*- fragment for GNU Fortran.
 #   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 #This file is part of GNU Fortran.
@@ -146,7 +146,8 @@ f77.start.encap: g77$(exeext)
 f77.rest.encap:
 
 f77.tags: force
-	cd $(srcdir)/f; etags *.c *.h
+	cd $(srcdir)/f; etags -o TAGS.sub *.c *.h; \
+	etags --include TAGS.sub --include ../TAGS.sub
 
 info:: $(docobjdir)/g77.info
 dvi:: $(docobjdir)/g77.dvi
@@ -311,7 +312,7 @@ f77.distclean:
 	-rm -f f/Makefile
 f77.extraclean:
 f77.maintainer-clean:
-	-rm -f f/g77.info* f/g77.*aux f/TAGS f/BUGS f/NEWS f/intdoc.texi
+	-rm -f f/g77.info* f/g77.*aux f/TAGS f/TAGS.sub f/BUGS f/NEWS f/intdoc.texi
 #
 # Stage hooks:
 # The main makefile has already created stage?/f.
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f5e074b..1426767 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-16  Jason Merrill  <jason@redhat.com>
+
+	* Make-lang.in (java.tags): Create TAGS.sub files in each directory
+	and TAGS files that include them for each front end.
+
 2003-11-15  Tom Tromey  <tromey@redhat.com>
 
 	* gjavah.c (print_stub_or_jni): Pass `env' to FatalError.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 6388a53..1ac1a1a 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -1,4 +1,4 @@
-# Top level makefile fragment for the GNU compiler for the Java(TM)
+# Top level -*- makefile -*- fragment for the GNU compiler for the Java(TM)
 # language.
 #   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
@@ -158,7 +158,10 @@ java.rest.encap:
 
 
 java.tags: force
-	cd $(srcdir)/java; etags *.y *.c *.h --language=none --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' java-tree.def
+	cd $(srcdir)/java; etags -o TAGS.sub *.y *.c *.h --language=none \
+	  --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' java-tree.def; \
+	etags --include TAGS.sub --include ../TAGS.sub
+
 
 info:: $(docobjdir)/gcj.info
 dvi:: $(docobjdir)/gcj.dvi
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index cdacd4e..f3eacad 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -104,7 +104,8 @@ objc.start.encap:
 objc.rest.encap:
 
 objc.tags: force
-	cd $(srcdir)/objc; etags *.y *.c *.h
+	cd $(srcdir)/objc; etags -o TAGS.sub *.y *.c *.h; \
+	etags --include TAGS.sub --include ../TAGS.sub
 
 #
 # Install hooks: