X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/aa2ee344e3f206a0964d35212c194178358bd2a5..296808a500931376ad44f071d801564ed1372d47:/src/makefile.w32-in

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index e3898e8e5e..e8583da42b 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,18 +1,18 @@
 #  Makefile for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 1992-2000 Free Software Foundation, Inc.
+#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
-#  
+#
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2, or (at your option)
 #  any later version.
-#  
+#
 #  GNU Emacs is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-#  
+#
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to the
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -79,6 +79,7 @@ OBJ1 =  $(BLD)/abbrev.$(O)			\
 	$(BLD)/lread.$(O)			\
 	$(BLD)/macros.$(O)			\
 	$(BLD)/marker.$(O)			\
+        $(BLD)/md5.$(O)                         \
 	$(BLD)/minibuf.$(O)			\
 	$(BLD)/mocklisp.$(O)			\
 	$(BLD)/w32.$(O)				\
@@ -148,7 +149,7 @@ all:            $(ALL)
 #
 emacs:          $(BLD) $(EMACS)
 $(EMACS):       $(DOC) $(TEMACS)
-	"./$(BLD)/temacs.exe" -batch -l loadup dump
+	"$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump
 
 #
 # The undumped executable
@@ -171,11 +172,11 @@ bootstrap-temacs: bootstrap-clean
 	$(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
 
 #
-# Dump an Emacs executable named bootstrap-emacs containing the 
+# Dump an Emacs executable named bootstrap-emacs containing the
 # files from loadup.el in source form.
 #
 bootstrap-emacs: bootstrap-temacs
-	"./$(BLD)/temacs.exe" -batch -l loadup bootstrap
+	"$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup bootstrap
 	- mkdir "../bin"
 	$(CP) $(EMACS) ../bin
 
@@ -197,7 +198,7 @@ $(TRES): ../nt/emacs.rc
 	$(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS)
 
 #
-# Build the library.  Split up the build into two phases...otherwise we 
+# Build the library.  Split up the build into two phases...otherwise we
 # run out of command line space.
 #
 $(TLIB0):       $(OBJ0)
@@ -228,10 +229,10 @@ install:        $(ALL)
 
 #
 # Maintenance
-# 
+#
 clean:
 	- $(DEL) *~ "s/*~" "m/*~"
-	- $(DEL) *.pdb
+	- $(DEL) $(COMPILER_TEMP_FILES)
 	- $(DEL_TREE) $(OBJDIR)
 
 distclean:	clean
@@ -405,7 +406,6 @@ $(BLD)/dired.$(O) : \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
-	$(SRC)/vmsdir.h \
 	$(SRC)/ndir.h \
 	$(SRC)/buffer.h \
 	$(SRC)/commands.h \
@@ -435,7 +435,6 @@ $(BLD)/dispnew.$(O) : \
 	$(SRC)/w32term.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/xterm.h \
-	$(SRC)/vmstime.h \
 	$(SRC)/systime.h
 
 $(BLD)/doc.$(O) : \
@@ -471,7 +470,6 @@ $(BLD)/editfns.$(O) : \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/uaf.h \
-	$(SRC)/vms-pwd.h \
 	$(EMACS_ROOT)/nt/inc/pwd.h \
 	$(SRC)/dispextern.h \
 	$(SRC)/w32gui.h \
@@ -479,7 +477,6 @@ $(BLD)/editfns.$(O) : \
 	$(SRC)/composite.h \
 	$(SRC)/buffer.h \
 	$(SRC)/window.h \
-	$(SRC)/vmstime.h \
 	$(SRC)/systime.h
 
 $(BLD)/emacs.$(O) : \
@@ -513,11 +510,9 @@ $(BLD)/fileio.$(O) : \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/uaf.h \
-	$(SRC)/vms-pwd.h \
 	$(EMACS_ROOT)/nt/inc/pwd.h \
 	$(SRC)/msdos.h \
 	$(EMACS_ROOT)/nt/inc/sys/param.h \
-	$(SRC)/vmsdir.h \
 	$(SRC)/dispextern.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/intervals.h \
@@ -525,7 +520,6 @@ $(BLD)/fileio.$(O) : \
 	$(SRC)/buffer.h \
 	$(SRC)/window.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
-	$(SRC)/vmstime.h \
 	$(SRC)/systime.h
 
 $(BLD)/filelock.$(O) : \
@@ -534,12 +528,10 @@ $(BLD)/filelock.$(O) : \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/uaf.h \
-	$(SRC)/vms-pwd.h \
 	$(EMACS_ROOT)/nt/inc/pwd.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(EMACS_ROOT)/src/epaths.h \
 	$(SRC)/buffer.h \
-	$(SRC)/vmsdir.h \
 	$(SRC)/ndir.h
 
 $(BLD)/filemode.$(O) : \
@@ -575,7 +567,8 @@ $(BLD)/fns.$(O) : \
 	$(SRC)/dispextern.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/intervals.h \
-	$(SRC)/composite.h
+	$(SRC)/composite.h \
+        $(SRC)/md5.h
 
 $(BLD)/frame.$(O) : \
 	$(SRC)/frame.c \
@@ -686,7 +679,6 @@ $(BLD)/keyboard.$(O) : \
 	$(SRC)/w32term.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/xterm.h \
-	$(SRC)/vmstime.h \
 	$(SRC)/systime.h \
 	$(SRC)/atimer.h
 
@@ -737,6 +729,10 @@ $(BLD)/marker.$(O) : \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/buffer.h
 
+$(BLD)/md5.$(O) : \
+        $(SRC)/md5.c \
+        $(SRC)/md5.h
+
 $(BLD)/minibuf.$(O) : \
 	$(SRC)/minibuf.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
@@ -792,7 +788,6 @@ $(BLD)/w32proc.$(O) : \
 	$(SRC)/config.h \
 	$(SRC)/w32.h \
 	$(SRC)/w32heap.h \
-	$(SRC)/vmstime.h \
 	$(SRC)/systime.h
 
 $(BLD)/w32console.$(O) : \
@@ -838,9 +833,7 @@ $(BLD)/process.$(O) : \
 	$(SRC)/commands.h \
 	$(SRC)/frame.h \
 	$(SRC)/syssignal.h \
-	$(SRC)/vmsproc.h \
 	$(SRC)/syswait.h \
-	$(SRC)/vmstime.h \
 	$(SRC)/systime.h \
 	$(SRC)/termopts.h \
 	$(SRC)/composite.h \
@@ -906,15 +899,6 @@ $(BLD)/strftime.$(O) : \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h
 
-$(BLD)/sunfns.$(O) : \
-	$(SRC)/sunfns.c \
-	$(EMACS_ROOT)/src/s/ms-w32.h \
-	$(EMACS_ROOT)/src/m/intel386.h \
-	$(EMACS_ROOT)/src/config.h \
-	$(SRC)/window.h \
-	$(SRC)/buffer.h \
-	$(SRC)/termhooks.h
-
 $(BLD)/syntax.$(O) : \
 	$(SRC)/syntax.c \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
@@ -938,7 +922,6 @@ $(BLD)/sysdep.$(O) : \
 	$(EMACS_ROOT)/nt/inc/sys/ioctl.h \
 	$(EMACS_ROOT)/nt/inc/sys/file.h \
 	$(SRC)/systty.h \
-	$(SRC)/vmsproc.h \
 	$(SRC)/syswait.h \
 	$(SRC)/frame.h \
 	$(SRC)/window.h \
@@ -948,13 +931,10 @@ $(BLD)/sysdep.$(O) : \
 	$(SRC)/dispextern.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/process.h \
-	$(SRC)/vmsdir.h \
 	$(SRC)/ndir.h \
 	$(SRC)/syssignal.h \
-	$(SRC)/vmstime.h \
 	$(SRC)/systime.h \
 	$(SRC)/uaf.h \
-	$(SRC)/vms-pwd.h \
 	$(EMACS_ROOT)/src/acldef.h \
 	$(EMACS_ROOT)/src/chpdef.h
 
@@ -1020,7 +1000,7 @@ $(BLD)/vm-limit.$(O) : \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
-	$(SRC)/mem-limits.h	
+	$(SRC)/mem-limits.h
 
 $(BLD)/widget.$(O) : \
 	$(SRC)/widget.c \
@@ -1090,7 +1070,6 @@ $(BLD)/w32fns.$(O): \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/w32fns.c \
-	$(SRC)/x-list-font.c \
 	$(SRC)/w32term.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/frame.h \