merge from upstream

1 files changed, 6 insertions, 6 deletions

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 72a04ecff89..25fb499cf3b 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -371,12 +371,18 @@ cleanall:	clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:        ../nt/$(CONFIG_H)
+                        $(DEL) $@
                         echo $(CONFIG_H) has changed.  Re-run configure.bat.
                         exit -1
 
 getopt.h:               getopt_.h
                         $(CP) $(ALL_DEPS) $@
 
+### TAGS ###
+
+TAGS: $(BLD)/etags.exe *.c *.h
+        $(BLD)/etags.exe *.c *.h
+
 ### DEPENDENCIES ###
 
 EMACS_ROOT      = ..
@@ -389,12 +395,6 @@ $(BLD)/alloca.$(O) : \
         $(EMACS_ROOT)/src/config.h \
         $(EMACS_ROOT)/src/blockinput.h
 
-$(BLD)/b2m.$(O) : \
-        $(SRC)/b2m.c \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h
-
 $(BLD)/ctags.$(O) : \
         $(SRC)/ctags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \