* lisp.h (struct Lisp_Symbol): Replace field "name" with a lisp

[bpt/emacs.git] / src / makefile.nt

diff --git a/src/makefile.nt b/src/makefile.nt
index 420eb4d..e3d0584 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -4,24 +4,24 @@
 #   Geoff Voelker (voelker@cs.washington.edu)   11-20-93
 #
 #  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,
 #  Boston, MA 02111-1307, USA.
 #
 
-# 
+#
 # Sets up the system dependent macros.
 #
 !include ..\nt\makefile.def
@@ -36,6 +36,11 @@ LOCAL_FLAGS     = -Demacs=1 -DWINDOWSNT -DDOS_NT -DHAVE_CONFIG_H -I..\nt\inc
 !ifdef NTGUI
 LOCAL_FLAGS     = $(LOCAL_FLAGS) -DHAVE_NTGUI=1
 !endif
+!ifdef USE_CRT_DLL
+LOCAL_FLAGS     = $(LOCAL_FLAGS) -DUSE_CRT_DLL=1 -MD
+libc            = msvcrt.lib
+LINK_FLAGS      = -nodefaultlib
+!endif
 
 # From MSVC 5.0 onwards, it seem base relocation information is not included,
 # at least in release builds.  We need to ensure the reloc info is included
@@ -68,9 +73,9 @@ TLASTLIB      = $(BLD)\lastfile.lib
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -base settings.
 !if "$(BUILD_TYPE)" == "spd"
-LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd
+LINK_FLAGS      = $(LINK_FLAGS) $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd
 !else
-LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:none -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd $(EXTRA_LINK)
+LINK_FLAGS      = $(LINK_FLAGS) $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:none -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd $(EXTRA_LINK)
 !endif
 
 #
@@ -111,8 +116,8 @@ OBJ1 =  $(BLD)\abbrev.obj       \
        $(BLD)\lread.obj        \
        $(BLD)\macros.obj       \
        $(BLD)\marker.obj       \
-       $(BLD)\minibuf.obj      \
-       $(BLD)\mocklisp.obj
+        $(BLD)\md5.obj          \
+       $(BLD)\minibuf.obj
 
 OBJ2 =  $(BLD)\w32.obj           \
        $(BLD)\w32heap.obj       \
@@ -181,7 +186,7 @@ LIBS =  $(TLIB0)    \
 #
 # Build the executable and dump it.
 #
-all:            $(BLD) $(EMACS) 
+all:            $(BLD) $(EMACS)
 
 #
 # Headers we would preprocess if we could.
@@ -196,7 +201,7 @@ epaths.h:   ..\nt\paths.h
 # Make sure we have the DOC file in the right place.
 #
 DOC            = $(OBJDIR)\etc\DOC-X
-$(DOC):;       cd ..\lib-src 
+$(DOC):;       cd ..\lib-src
                - $(DEL) DOC-X
                $(MAKE) $(MFLAGS) -f makefile.nt all
                cd ..\src
@@ -206,9 +211,7 @@ $(DOC):;    cd ..\lib-src
 #
 emacs:          $(EMACS)
 $(EMACS):       $(DOC) $(TEMACS)
-               cd $(BLD)
                $(MAKEDIR)\$(BLD)\temacs.exe -batch -l loadup dump
-               cd ..\..
 
 #
 # The undumped executable
@@ -231,13 +234,11 @@ bootstrap-temacs: bootstrap-clean
                $(MAKE) $(MFLAGS) -f makefile.nt temacs CFLAGS="$(CFLAGS) -DPURESIZE=5000000"
 
 #
-# 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
-               cd $(BLD)
                $(MAKEDIR)\$(BLD)\temacs.exe -batch -l loadup bootstrap
-               cd ..\..
                - mkdir ..\bin
                $(CP) $(EMACS) ..\bin
 
@@ -262,7 +263,7 @@ $(TRES):    ..\nt\emacs.rc
 !endif
 
 #
-# 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)
@@ -293,7 +294,7 @@ install:        all
 
 #
 # Maintenance
-# 
+#
 clean:;         - $(DEL) *~ s\*~
                - $(DEL) *.pdb config.h epaths.h
                - $(DEL) *.orig *.rej *.crlf
@@ -331,6 +332,7 @@ $(BLD)\alloc.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h \
        $(SRC)\puresize.h \
@@ -370,6 +372,7 @@ $(BLD)\buffer.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h \
        $(SRC)\frame.h \
@@ -396,8 +399,7 @@ $(BLD)\callint.obj : \
        $(SRC)\buffer.h \
        $(SRC)\commands.h \
        $(SRC)\keyboard.h \
-       $(SRC)\window.h \
-       $(SRC)\mocklisp.h
+       $(SRC)\window.h
 
 $(BLD)\callproc.obj : \
        $(SRC)\callproc.c \
@@ -472,7 +474,6 @@ $(BLD)\dired.obj : \
        $(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 \
@@ -500,8 +501,8 @@ $(BLD)\dispnew.obj : \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
        $(SRC)\systty.h \
        $(SRC)\w32term.h \
+       $(SRC)\w32gui.h \
        $(SRC)\xterm.h \
-       $(SRC)\vmstime.h \
        $(SRC)\systime.h
 
 $(BLD)\doc.obj : \
@@ -537,14 +538,13 @@ $(BLD)\editfns.obj : \
        $(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 \
        $(SRC)\intervals.h \
        $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
-       $(SRC)\vmstime.h \
        $(SRC)\systime.h
 
 $(BLD)\emacs.obj : \
@@ -554,6 +554,7 @@ $(BLD)\emacs.obj : \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\commands.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h \
        $(EMACS_ROOT)\nt\inc\sys\ioctl.h \
@@ -577,18 +578,16 @@ $(BLD)\fileio.obj : \
        $(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 \
        $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
-       $(SRC)\vmstime.h \
        $(SRC)\systime.h
 
 $(BLD)\filelock.obj : \
@@ -597,12 +596,10 @@ $(BLD)\filelock.obj : \
        $(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.obj : \
@@ -636,8 +633,10 @@ $(BLD)\fns.obj : \
        $(SRC)\buffer.h \
        $(SRC)\keyboard.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
-       $(SRC)\composite.h
+       $(SRC)\composite.h \
+        $(SRC)\md5.h
 
 $(BLD)\frame.obj : \
        $(SRC)\frame.c \
@@ -691,6 +690,7 @@ $(BLD)\indent.obj : \
        $(SRC)\termopts.h \
        $(SRC)\disptab.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\region-cache.h \
        $(SRC)\composite.h
@@ -701,6 +701,7 @@ $(BLD)\insdel.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h \
        $(SRC)\buffer.h \
@@ -713,6 +714,7 @@ $(BLD)\intervals.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h \
        $(SRC)\keyboard.h \
@@ -744,8 +746,8 @@ $(BLD)\keyboard.obj : \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
        $(SRC)\systty.h \
        $(SRC)\w32term.h \
+       $(SRC)\w32gui.h \
        $(SRC)\xterm.h \
-       $(SRC)\vmstime.h \
        $(SRC)\systime.h \
        $(SRC)\atimer.h
 
@@ -796,6 +798,10 @@ $(BLD)\marker.obj : \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\buffer.h
 
+$(BLD)\md5.obj : \
+        $(SRC)\md5.c \
+        $(SRC)\md5.h
+
 $(BLD)\minibuf.obj : \
        $(SRC)\minibuf.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
@@ -804,17 +810,11 @@ $(BLD)\minibuf.obj : \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\frame.h \
        $(SRC)\window.h \
        $(SRC)\syntax.h
 
-$(BLD)\mocklisp.obj : \
-       $(SRC)\mocklisp.c \
-       $(EMACS_ROOT)\src\s\ms-w32.h \
-       $(EMACS_ROOT)\src\m\intel386.h \
-       $(EMACS_ROOT)\src\config.h \
-       $(SRC)\buffer.h
-
 $(BLD)\w32.obj : \
        $(SRC)\w32.c \
        $(SRC)\w32.h \
@@ -840,7 +840,8 @@ $(BLD)\w32inevt.obj : \
        $(SRC)\blockinput.h \
        $(SRC)\termhooks.h \
        $(SRC)\w32heap.h \
-       $(SRC)\w32term.h
+       $(SRC)\w32term.h \
+       $(SRC)\w32gui.h
 
 $(BLD)\w32proc.obj : \
        $(SRC)\w32proc.c \
@@ -849,7 +850,6 @@ $(BLD)\w32proc.obj : \
        $(SRC)\config.h \
        $(SRC)\w32.h \
        $(SRC)\w32heap.h \
-       $(SRC)\vmstime.h \
        $(SRC)\systime.h
 
 $(BLD)\w32console.obj : \
@@ -876,6 +876,7 @@ $(BLD)\print.obj : \
        $(SRC)\process.h \
        $(SRC)\termchar.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h
 
@@ -894,9 +895,7 @@ $(BLD)\process.obj : \
        $(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 \
@@ -940,6 +939,7 @@ $(BLD)\scroll.obj : \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\termchar.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\frame.h
 
 $(BLD)\search.obj : \
@@ -961,15 +961,6 @@ $(BLD)\strftime.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h
 
-$(BLD)\sunfns.obj : \
-       $(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.obj : \
        $(SRC)\syntax.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
@@ -993,7 +984,6 @@ $(BLD)\sysdep.obj : \
        $(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 \
@@ -1001,14 +991,12 @@ $(BLD)\sysdep.obj : \
        $(SRC)\termchar.h \
        $(SRC)\termopts.h \
        $(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
 
@@ -1022,6 +1010,7 @@ $(BLD)\term.obj : \
        $(SRC)\cm.h \
        $(SRC)\frame.h \
        $(SRC)\disptab.h \
+       $(SRC)/dispextern.h \
        $(SRC)\termhooks.h \
        $(SRC)\keyboard.h
 
@@ -1041,6 +1030,7 @@ $(BLD)\textprop.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h \
        $(SRC)\buffer.h \
@@ -1072,7 +1062,7 @@ $(BLD)\vm-limit.obj : \
        $(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.obj : \
        $(SRC)\widget.c \
@@ -1082,6 +1072,7 @@ $(BLD)\widget.obj : \
        $(SRC)\xterm.h \
        $(SRC)\frame.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\widget.h \
        $(SRC)\widgetprv.h
 
@@ -1115,6 +1106,7 @@ $(BLD)\xdisp.obj : \
        $(SRC)\disptab.h \
        $(SRC)\termhooks.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
        $(SRC)\composite.h
 
@@ -1140,7 +1132,6 @@ $(BLD)\w32fns.obj: \
        $(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 \
@@ -1232,6 +1223,7 @@ $(BLD)\w32bdf.obj: \
        $(SRC)\blockinput.h \
        $(SRC)\w32gui.h \
        $(SRC)\w32term.h \
+       $(SRC)\w32gui.h \
        $(SRC)\w32bdf.h \
        $(SRC)\w32.h \
        $(SRC)\frame.h \