Support TAGS targets in the w32 build.

 nt/makefile.w32-in (frc, TAGS, TAGS-gmake, TAGS-nmake): New targets.
 emacs-src.tags: New file.
 src/makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags)
 (TAGS-gmake, TAGS-nmake, TAGS-LISP-gmake, TAGS-LISP-nmake)
 (nt-TAGS-gmake, nt-TAGS-nmake): New targets.
 lisp/makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake)
 (TAGS-LISP-nmake, TAGS-gmake, TAGS-LISP-gmake, TAGS-SH)
 (TAGS-LISP-SH, TAGS-CMD, TAGS-LISP-CMD): New targets.
 lib-src/makefile.w32-in (tags, TAGS): New targets.

2 files changed, 51 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 05d7d4336ae..1d337527eff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags)
+        (TAGS-gmake, TAGS-nmake, TAGS-LISP-gmake, TAGS-LISP-nmake)
+        (nt-TAGS-gmake, nt-TAGS-nmake): New targets.
+
 2010-09-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * xml.c (parse_string): Use const.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 752a3c211b3..daa6ed52198 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -293,6 +293,51 @@ cleanall:	clean
         - $(DEL_TREE) oo
         - $(DEL_TREE) oo-spd
 
+## Arrange to make a tags table TAGS-LISP for ../lisp,
+## plus TAGS for the C files, which includes ../lisp/TAGS by reference.
+##
+## This works only with GNU Make.
+
+TAGS: $(OBJ0) $(OBJ1) $(WIN32OBJ)
+        $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
+
+TAGS-LISP: $(OBJ0) $(OBJ1) $(WIN32OBJ)
+        $(MAKE) $(MFLAGS) TAGS-LISP-$(MAKETYPE)
+
+TAGS-gmake:
+        ../lib-src/$(BLD)/etags.exe --include=TAGS-LISP --include=../nt/TAGS \
+          --regex=@../nt/emacs-src.tags \
+          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0))
+        ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
+          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
+        ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
+          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(WIN32OBJ)) $(CURDIR)/*.h
+
+TAGS-nmake:
+        echo This target is not supported with NMake
+        exit -1
+
+frc:
+TAGS-LISP-gmake: frc
+        $(MAKE) $(MFLAGS) -C ../lisp TAGS-LISP DEST=../src
+
+TAGS-LISP-nmake:
+        echo This target is not supported with NMake
+        exit -1
+
+../nt/TAGS: frc
+        $(MAKE) $(MFLAGS) nt-TAGS-$(MAKETYPE)
+
+nt-TAGS-gmake:
+        $(MAKE) $(MFLAGS) -C ../nt TAGS
+
+nt-TAGS-nmake:
+        echo This target is not supported with NMake
+        exit -1
+
+tags: TAGS TAGS-LISP ../nt/TAGS
+.PHONY: tags
+
 ### DEPENDENCIES ###
 
 EMACS_ROOT = ..