(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars

[gnu-emacs] / src / makefile.nt

diff --git a/src/makefile.nt b/src/makefile.nt
index b3768704c463a2726ccd3f5089e3c5521f644ce7..16264d7da851e61777abc07c14e1afa20fad0923 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -1,4 +1,4 @@
-#  Makefile for GNU Emacs on Windows NT
+#  Makefile for GNU Emacs on the Microsoft W32 API.
 #  Copyright (c) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
 #   Tim Fleehart (apollo@online.com)            17-Apr-92
 #   Geoff Voelker (voelker@cs.washington.edu)   11-20-93
@@ -33,9 +33,28 @@ SUBSYSTEM=console
 # the emacs source tree.
 #
 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
+# in order to use the MSVC profiler.
+!IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)")
+EXTRA_LINK      =
+!ELSE
+EXTRA_LINK      = -profile
+!ENDIF
 
 EMACS           = $(BLD)\emacs.exe
 TEMACS          = $(BLD)\temacs.exe
+TEMACS_TMP      = $(BLD)\temacs.bin
+TLIB0           = $(BLD)\temacs0.lib
 TLIB1           = $(BLD)\temacs1.lib
 TLIB2           = $(BLD)\temacs2.lib
 !IFDEF NTGUI
@@ -43,7 +62,7 @@ TLIBW32         = $(BLD)\temacw32.lib
 !ELSE
 TLIBW32                =
 !ENDIF
-TOBJ            = $(BLD)\emacs.obj
+TOBJ            = $(BLD)\firstfile.obj
 !if $(MSVCNT11)
 TRES           = $(BLD)\emacs.res
 !else
@@ -53,15 +72,25 @@ TLASTLIB    = $(BLD)\lastfile.lib
 
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -base settings.
-LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:cv -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map
+!if "$(BUILD_TYPE)" == "spd"
+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      = $(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
 
 #
 # Split up the objects into two sets so that we don't run out of
 # command line space when we link them into a library.
 #
+# Put emacs.obj in a separate lib, since we need to have firstfile.obj
+# as the "main" object file when linking.
+#
+OBJ0 =  $(BLD)\emacs.obj
+
 OBJ1 =  $(BLD)\abbrev.obj       \
        $(BLD)\alloc.obj        \
        $(BLD)\alloca.obj       \
+       $(BLD)\atimer.obj       \
        $(BLD)\buffer.obj       \
        $(BLD)\bytecode.obj     \
        $(BLD)\callint.obj      \
@@ -87,6 +116,7 @@ OBJ1 =  $(BLD)\abbrev.obj       \
        $(BLD)\lread.obj        \
        $(BLD)\macros.obj       \
        $(BLD)\marker.obj       \
+        $(BLD)\md5.obj          \
        $(BLD)\minibuf.obj      \
        $(BLD)\mocklisp.obj
 
@@ -114,21 +144,29 @@ OBJ2 =  $(BLD)\w32.obj           \
        $(BLD)\frame.obj        \
        $(BLD)\gmalloc.obj      \
        $(BLD)\intervals.obj    \
+       $(BLD)\composite.obj    \
        $(BLD)\ralloc.obj       \
        $(BLD)\textprop.obj     \
        $(BLD)\vm-limit.obj     \
        $(BLD)\region-cache.obj \
-       $(BLD)\strftime.obj
+       $(BLD)\strftime.obj     \
+       $(BLD)\charset.obj      \
+       $(BLD)\coding.obj       \
+       $(BLD)\category.obj     \
+       $(BLD)\ccl.obj          \
+       $(BLD)\fontset.obj
 
 WIN32OBJ = $(BLD)\w32term.obj  \
           $(BLD)\w32xfns.obj   \
           $(BLD)\w32fns.obj    \
-          $(BLD)\w32faces.obj  \
+          $(BLD)\xfaces.obj    \
           $(BLD)\w32select.obj \
           $(BLD)\w32menu.obj   \
-          $(BLD)\w32reg.obj
+          $(BLD)\w32reg.obj    \
+          $(BLD)\w32bdf.obj
 
-LIBS =  $(TLIB1)       \
+LIBS =  $(TLIB0)       \
+       $(TLIB1)        \
        $(TLIB2)        \
 !IFDEF NTGUI
        $(TLIBW32)      \
@@ -142,7 +180,9 @@ LIBS =  $(TLIB1)    \
        $(BASE_LIBS)    \
        $(ADVAPI32)     \
        user32.lib      \
-       mpr.lib
+       mpr.lib         \
+       shell32.lib     \
+       setargv.obj
 
 #
 # Build the executable and dump it.
@@ -152,10 +192,10 @@ all:            $(BLD) $(EMACS)
 #
 # Headers we would preprocess if we could.
 #
-PREPARED_HEADERS = config.h paths.h
+PREPARED_HEADERS = config.h epaths.h
 config.h:      ..\nt\$(CONFIG_H)
                $(CP) $** $@
-paths.h:       ..\nt\paths.h
+epaths.h:      ..\nt\paths.h
                $(CP) $** $@
 
 #
@@ -164,24 +204,54 @@ paths.h:  ..\nt\paths.h
 DOC            = $(OBJDIR)\etc\DOC-X
 $(DOC):;       cd ..\lib-src 
                - $(DEL) DOC-X
-               $(MAKE) -f makefile.nt all
+               $(MAKE) $(MFLAGS) -f makefile.nt all
                cd ..\src
 
 #
 # The dumped executable
 #
 emacs:          $(EMACS)
-$(EMACS):       $(PREPARED_HEADERS) $(DOC) $(TEMACS)
-               cd $(BLD)
-               temacs.exe -batch -l loadup dump
-               cd ..\..
+$(EMACS):       $(DOC) $(TEMACS)
+               $(MAKEDIR)\$(BLD)\temacs.exe -batch -l loadup dump
 
 #
 # The undumped executable
+# Note the extra post-link step to insert a static preload heap section.
+# If preload runs out of memory, increase the last argument to addsection
+# (it is the preload heap size in MB).
 #
 temacs:         $(BLD) $(TEMACS)
-$(TEMACS):      $(TLIB1) $(TLIB2) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
-               $(LINK) -out:$(TEMACS) $(LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
+$(TEMACS):      $(PREPARED_HEADERS) $(TLIB0) $(TLIB1) $(TLIB2) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
+               $(LINK) -out:$(TEMACS_TMP) $(LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
+               ..\nt\$(BLD)\addsection $(TEMACS_TMP) $(TEMACS) EMHEAP 16
+
+bootstrap: bootstrap-emacs
+
+#
+# Build a temacs with a sufficiently large PURESIZE to load the
+# Lisp files from loadup.el in source form.
+#
+bootstrap-temacs: bootstrap-clean
+               $(MAKE) $(MFLAGS) -f makefile.nt temacs CFLAGS="$(CFLAGS) -DPURESIZE=5000000"
+
+#
+# Dump an Emacs executable named bootstrap-emacs containing the 
+# files from loadup.el in source form.
+#
+bootstrap-emacs: bootstrap-temacs
+               $(MAKEDIR)\$(BLD)\temacs.exe -batch -l loadup bootstrap
+               - mkdir ..\bin
+               $(CP) $(EMACS) ..\bin
+
+#
+# Force recompile of files that depend on PURESIZE
+#
+bootstrap-clean:
+               - $(DEL) $(BLD)\alloc.obj
+               - $(DEL) $(BLD)\data.obj
+               - $(DEL) $(BLD)\intervals.obj
+               - $(DEL) $(BLD)\keyboard.obj
+               - $(DEL) $(BLD)\keymap.obj
 
 #
 # The resource file.  NT 3.10 requires the use of cvtres; even though
@@ -197,6 +267,8 @@ $(TRES):    ..\nt\emacs.rc
 # Build the library.  Split up the build into two phases...otherwise we 
 # run out of command line space.
 #
+$(TLIB0):       $(OBJ0)
+               @- $(AR) -out:$@ $**
 $(TLIB1):       $(OBJ1)
                @- $(AR) -out:$@ $**
 $(TLIB2):      $(OBJ2)
@@ -212,13 +284,7 @@ $(TLIBW32):        $(WIN32OBJ)
 # the end of Emacs' data section portably across compilers and systems.
 #
 $(TLASTLIB):   $(BLD)\lastfile.obj
-               @- $(AR) -out:$@ $**
-
-#
-# Object files.
-#
-.c{$(BLD)}.obj:
-               $(CC) $(CFLAGS) -Fo$@ $<
+               @- $(AR) -out:$@ $**
 
 #
 # Assuming INSTALL_DIR is defined, build and install emacs in it.
@@ -230,9 +296,13 @@ install:        all
 #
 # Maintenance
 # 
-clean:;         - $(DEL) *~ *.pdb config.h paths.h
+clean:;         - $(DEL) *~ s\*~
+               - $(DEL) *.pdb config.h epaths.h
+               - $(DEL) *.orig *.rej *.crlf
+               - $(DEL) s\*.orig s\*.rej s\*.crlf
                - $(DEL_TREE) deleted
-               - $(DEL_TREE) $(OBJDIR)
+               - $(DEL_TREE) obj
+               - $(DEL_TREE) obj-spd
 
 #
 # These files are the ones that compile conditionally on CANNOT_DUMP...
@@ -253,7 +323,6 @@ $(BLD)\abbrev.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h
@@ -263,9 +332,10 @@ $(BLD)\alloc.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\puresize.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
@@ -283,15 +353,30 @@ $(BLD)\alloca.obj : \
        $(SRC)\config.h \
        $(SRC)\blockinput.h
 
+$(BLD)\atimer.obj : \
+       $(SRC)\atimer.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
+       $(SRC)\s\ms-w32.h \
+       $(SRC)\m\intel386.h \
+       $(SRC)\config.h \
+       $(SRC)\atimer.h \
+       $(SRC)\syssignal.h \
+       $(SRC)\systime.h \
+       $(SRC)\blockinput.h
+
 $(BLD)\buffer.obj : \
        $(SRC)\buffer.c \
        $(EMACS_ROOT)\nt\inc\sys\param.h \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
+       $(SRC)\frame.h \
        $(SRC)\window.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
@@ -301,13 +386,17 @@ $(BLD)\buffer.obj : \
 
 $(BLD)\bytecode.obj : \
        $(SRC)\bytecode.c \
-       $(SRC)\lisp.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
        $(SRC)\buffer.h \
        $(SRC)\syntax.h
 
 $(BLD)\callint.obj : \
        $(SRC)\callint.c \
-       $(SRC)\lisp.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
        $(SRC)\buffer.h \
        $(SRC)\commands.h \
        $(SRC)\keyboard.h \
@@ -321,7 +410,6 @@ $(BLD)\callproc.obj : \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\msdos.h \
        $(EMACS_ROOT)\nt\inc\sys\param.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
        $(SRC)\process.h \
@@ -335,7 +423,6 @@ $(BLD)\casefiddle.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\commands.h \
        $(SRC)\syntax.h
@@ -346,7 +433,6 @@ $(BLD)\casetab.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h
 
 $(BLD)\cm.obj : \
@@ -362,17 +448,25 @@ $(BLD)\cmds.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
        $(SRC)\syntax.h
 
+$(BLD)\composite.obj : \
+       $(SRC)\composite.c \
+       $(SRC)\buffer.h \
+       $(SRC)\charset.h \
+       $(SRC)\intervals.h \
+       $(SRC)\composite.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h
+
 $(BLD)\data.obj : \
        $(SRC)\data.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\puresize.h \
        $(SRC)\buffer.h \
        $(SRC)\syssignal.h
@@ -384,7 +478,6 @@ $(BLD)\dired.obj : \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\vmsdir.h \
        $(SRC)\ndir.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\commands.h \
        $(SRC)\regex.h
@@ -394,7 +487,6 @@ $(BLD)\dispnew.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\termchar.h \
        $(SRC)\termopts.h \
        $(SRC)\termhooks.h \
@@ -407,10 +499,12 @@ $(BLD)\dispnew.obj : \
        $(SRC)\indent.h \
        $(SRC)\dispextern.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(EMACS_ROOT)\nt\inc\sys\ioctl.h \
        $(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
@@ -421,7 +515,6 @@ $(BLD)\doc.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\keyboard.h
 
@@ -436,7 +529,6 @@ $(BLD)\dosfns.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\termchar.h \
        $(SRC)\termhooks.h \
@@ -452,9 +544,10 @@ $(BLD)\editfns.obj : \
        $(SRC)\uaf.h \
        $(SRC)\vms-pwd.h \
        $(EMACS_ROOT)\nt\inc\pwd.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
        $(SRC)\vmstime.h \
@@ -465,10 +558,11 @@ $(BLD)\emacs.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(EMACS_ROOT)\nt\inc\sys\ioctl.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
        $(SRC)\systty.h \
@@ -480,7 +574,6 @@ $(BLD)\eval.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\blockinput.h \
        $(SRC)\commands.h \
        $(SRC)\keyboard.h
@@ -496,9 +589,10 @@ $(BLD)\fileio.obj : \
        $(SRC)\msdos.h \
        $(EMACS_ROOT)\nt\inc\sys\param.h \
        $(SRC)\vmsdir.h \
-       $(SRC)\lisp.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 \
@@ -514,8 +608,7 @@ $(BLD)\filelock.obj : \
        $(SRC)\vms-pwd.h \
        $(EMACS_ROOT)\nt\inc\pwd.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
-       $(SRC)\lisp.h \
-       $(EMACS_ROOT)\src\paths.h \
+       $(EMACS_ROOT)\src\epaths.h \
        $(SRC)\buffer.h \
        $(SRC)\vmsdir.h \
        $(SRC)\ndir.h
@@ -529,12 +622,17 @@ $(BLD)\filemode.obj : \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h
 
+$(BLD)\firstfile.obj : \
+       $(SRC)\firstfile.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h
+
 $(BLD)\floatfns.obj : \
        $(SRC)\floatfns.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\syssignal.h
 
 $(BLD)\fns.obj : \
@@ -542,19 +640,20 @@ $(BLD)\fns.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
        $(SRC)\keyboard.h \
        $(SRC)\dispextern.h \
-       $(SRC)\intervals.h
+       $(SRC)\w32gui.h \
+       $(SRC)\intervals.h \
+       $(SRC)\composite.h \
+        $(SRC)\md5.h
 
 $(BLD)\frame.obj : \
        $(SRC)\frame.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\frame.h \
        $(SRC)\termhooks.h \
        $(SRC)\window.h \
@@ -594,7 +693,6 @@ $(BLD)\indent.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\indent.h \
        $(SRC)\frame.h \
@@ -603,17 +701,20 @@ $(BLD)\indent.obj : \
        $(SRC)\termopts.h \
        $(SRC)\disptab.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
-       $(SRC)\region-cache.h
+       $(SRC)\region-cache.h \
+       $(SRC)\composite.h
 
 $(BLD)\insdel.obj : \
        $(SRC)\insdel.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
        $(SRC)\blockinput.h
@@ -623,12 +724,13 @@ $(BLD)\intervals.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
+       $(SRC)\keyboard.h \
        $(SRC)\buffer.h \
        $(SRC)\puresize.h
-       $(CC) $(CFLAGS) -Fo$@ intervals.c
 
 $(BLD)\keyboard.obj : \
        $(SRC)\keyboard.c \
@@ -637,7 +739,6 @@ $(BLD)\keyboard.obj : \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\termchar.h \
        $(SRC)\termopts.h \
-       $(SRC)\lisp.h \
        $(SRC)\termhooks.h \
        $(SRC)\macros.h \
        $(SRC)\frame.h \
@@ -648,6 +749,7 @@ $(BLD)\keyboard.obj : \
        $(SRC)\keyboard.h \
        $(SRC)\dispextern.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\blockinput.h \
        $(SRC)\msdos.h \
        $(SRC)\syssignal.h \
@@ -655,16 +757,17 @@ $(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)\systime.h \
+       $(SRC)\atimer.h
 
 $(BLD)\keymap.obj : \
        $(SRC)\keymap.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
        $(SRC)\keyboard.h \
@@ -672,7 +775,10 @@ $(BLD)\keymap.obj : \
        $(SRC)\blockinput.h
 
 $(BLD)\lastfile.obj : \
-       $(SRC)\lastfile.c
+       $(SRC)\lastfile.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h
 
 $(BLD)\lread.obj : \
        $(SRC)\lread.c \
@@ -680,9 +786,8 @@ $(BLD)\lread.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
-       $(EMACS_ROOT)\src\paths.h \
+       $(EMACS_ROOT)\src\epaths.h \
        $(SRC)\commands.h \
        $(SRC)\keyboard.h \
        $(SRC)\termhooks.h \
@@ -693,7 +798,6 @@ $(BLD)\macros.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\macros.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
@@ -704,18 +808,21 @@ $(BLD)\marker.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.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 \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\frame.h \
        $(SRC)\window.h \
        $(SRC)\syntax.h
@@ -725,7 +832,6 @@ $(BLD)\mocklisp.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h
 
 $(BLD)\w32.obj : \
@@ -734,31 +840,35 @@ $(BLD)\w32.obj : \
        $(SRC)\s\ms-w32.h \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h \
-       $(SRC)\lisp.h \
        $(EMACS_ROOT)\nt\inc\pwd.h \
        $(SRC)\w32heap.h
 
 $(BLD)\w32heap.obj : \
        $(SRC)\w32heap.c \
-       $(SRC)\w32heap.h
+       $(SRC)\w32heap.h \
+       $(SRC)\s\ms-w32.h \
+       $(SRC)\m\intel386.h \
+       $(SRC)\config.h
 
 $(BLD)\w32inevt.obj : \
        $(SRC)\w32inevt.c \
        $(SRC)\s\ms-w32.h \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\frame.h \
        $(SRC)\blockinput.h \
-       $(SRC)\termhooks.h
+       $(SRC)\termhooks.h \
+       $(SRC)\w32heap.h \
+       $(SRC)\w32term.h \
+       $(SRC)\w32gui.h
 
 $(BLD)\w32proc.obj : \
        $(SRC)\w32proc.c \
        $(SRC)\s\ms-w32.h \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\w32.h \
+       $(SRC)\w32heap.h \
        $(SRC)\vmstime.h \
        $(SRC)\systime.h
 
@@ -767,7 +877,6 @@ $(BLD)\w32console.obj : \
        $(SRC)\s\ms-w32.h \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\frame.h \
        $(SRC)\disptab.h \
        $(SRC)\termhooks.h \
@@ -781,14 +890,15 @@ $(BLD)\print.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\frame.h \
        $(SRC)\window.h \
        $(SRC)\process.h \
        $(SRC)\termchar.h \
        $(SRC)\dispextern.h \
-       $(SRC)\intervals.h
+       $(SRC)\w32gui.h \
+       $(SRC)\intervals.h \
+       $(SRC)\composite.h
 
 $(BLD)\process.obj : \
        $(SRC)\process.c \
@@ -807,17 +917,17 @@ $(BLD)\process.obj : \
        $(SRC)\syssignal.h \
        $(SRC)\vmsproc.h \
        $(SRC)\syswait.h \
-       $(SRC)\lisp.h \
        $(SRC)\vmstime.h \
        $(SRC)\systime.h \
-       $(SRC)\termopts.h
+       $(SRC)\termopts.h \
+       $(SRC)\composite.h \
+       $(SRC)\atimer.h
 
 $(BLD)\ralloc.obj : \
        $(SRC)\ralloc.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\s\ms-w32.h \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h \
@@ -832,7 +942,6 @@ $(BLD)\regex.obj : \
        $(SRC)\s\ms-w32.h \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\syntax.h \
        $(SRC)\regex.h
@@ -842,7 +951,6 @@ $(BLD)\region-cache.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\region-cache.h
 
@@ -852,8 +960,8 @@ $(BLD)\scroll.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\termchar.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\frame.h
 
 $(BLD)\search.obj : \
@@ -861,47 +969,35 @@ $(BLD)\search.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\syntax.h \
        $(SRC)\buffer.h \
        $(SRC)\commands.h \
        $(SRC)\blockinput.h \
        $(SRC)\regex.h \
-       $(SRC)\region-cache.h
+       $(SRC)\region-cache.h \
+       $(SRC)\composite.h
 
 $(BLD)\strftime.obj : \
        $(SRC)\strftime.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h
-       $(CC) $(CFLAGS) -Dstrftime=emacs_strftime -Fo$@ strftime.c
-
-$(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)\lisp.h \
-       $(SRC)\window.h \
-       $(SRC)\buffer.h \
-       $(SRC)\termhooks.h
 
 $(BLD)\syntax.obj : \
        $(SRC)\syntax.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
-       $(SRC)\syntax.h
+       $(SRC)\syntax.h \
+       $(SRC)\composite.h
 
 $(BLD)\sysdep.obj : \
        $(SRC)\sysdep.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\blockinput.h \
        $(SRC)\dosfns.h \
        $(SRC)\msdos.h \
@@ -918,6 +1014,7 @@ $(BLD)\sysdep.obj : \
        $(SRC)\termchar.h \
        $(SRC)\termopts.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\process.h \
        $(SRC)\vmsdir.h \
        $(SRC)\ndir.h \
@@ -937,9 +1034,9 @@ $(BLD)\term.obj : \
        $(SRC)\termchar.h \
        $(SRC)\termopts.h \
        $(SRC)\cm.h \
-       $(SRC)\lisp.h \
        $(SRC)\frame.h \
        $(SRC)\disptab.h \
+       $(SRC)/dispextern.h \
        $(SRC)\termhooks.h \
        $(SRC)\keyboard.h
 
@@ -958,9 +1055,10 @@ $(BLD)\textprop.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h
 
@@ -975,12 +1073,14 @@ $(BLD)\undo.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\commands.h
 
 $(BLD)\unexw32.obj : \
        $(SRC)\unexw32.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32heap.h
 
 $(BLD)\vm-limit.obj : \
@@ -995,10 +1095,10 @@ $(BLD)\widget.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\xterm.h \
        $(SRC)\frame.h \
        $(SRC)\dispextern.h \
+       $(SRC)\w32gui.h \
        $(SRC)\widget.h \
        $(SRC)\widgetprv.h
 
@@ -1007,7 +1107,6 @@ $(BLD)\window.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\frame.h \
        $(SRC)\window.h \
@@ -1015,14 +1114,14 @@ $(BLD)\window.obj : \
        $(SRC)\indent.h \
        $(SRC)\termchar.h \
        $(SRC)\disptab.h \
-       $(SRC)\keyboard.h
+       $(SRC)\keyboard.h \
+       $(SRC)\composite.h
 
 $(BLD)\xdisp.obj : \
        $(SRC)\xdisp.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\lisp.h \
        $(SRC)\frame.h \
        $(SRC)\window.h \
        $(SRC)\termchar.h \
@@ -1033,38 +1132,44 @@ $(BLD)\xdisp.obj : \
        $(SRC)\disptab.h \
        $(SRC)\termhooks.h \
        $(SRC)\dispextern.h \
-       $(SRC)\intervals.h
+       $(SRC)\w32gui.h \
+       $(SRC)\intervals.h \
+       $(SRC)\composite.h
 
-$(BLD)\w32faces.obj: \
+$(BLD)\xfaces.obj: \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
-       $(SRC)\w32faces.c \
-       $(SRC)\lisp.h \
+       $(SRC)\xfaces.c \
+       $(SRC)\charset.h \
+       $(SRC)\fontset.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\buffer.h \
        $(SRC)\dispextern.h \
        $(SRC)\frame.h \
        $(SRC)\blockinput.h \
-       $(SRC)\window.h \
-       $(SRC)\intervals.h
+       $(SRC)\window.h \
+       $(SRC)\intervals.h \
+       $(SRC)\composite.h
 
 $(BLD)\w32fns.obj: \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32fns.c \
-       $(SRC)\lisp.h \
+       $(SRC)\x-list-font.c \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\frame.h \
-       $(SRC)\window.h \
+       $(SRC)\window.h \
        $(SRC)\buffer.h \
+       $(SRC)\charset.h \
+       $(SRC)\coding.h \
        $(SRC)\dispextern.h \
        $(SRC)\keyboard.h \
        $(SRC)\blockinput.h \
-       $(SRC)\paths.h \
+       $(SRC)\epaths.h \
        $(SRC)\w32heap.h \
        $(SRC)\termhooks.h
 
@@ -1073,23 +1178,24 @@ $(BLD)\w32menu.obj: \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32menu.c \
-       $(SRC)\lisp.h \
        $(SRC)\termhooks.h \
        $(SRC)\frame.h \
-       $(SRC)\window.h \
+       $(SRC)\window.h \
        $(SRC)\keyboard.h \
        $(SRC)\blockinput.h \
-       $(SRC)\buffer.h
+       $(SRC)\buffer.h \
+       $(SRC)\charset.h \
+       $(SRC)\coding.h
 
 $(BLD)\w32term.obj: \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32term.c \
-       $(SRC)\lisp.h \
        $(SRC)\blockinput.h \
+       $(SRC)\w32heap.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\systty.h \
        $(SRC)\systime.h \
        $(SRC)\frame.h \
@@ -1100,18 +1206,19 @@ $(BLD)\w32term.obj: \
        $(SRC)\gnu.h \
        $(SRC)\disptab.h \
        $(SRC)\buffer.h \
-       $(SRC)\window.h \
+       $(SRC)\window.h \
        $(SRC)\keyboard.h \
-       $(SRC)\intervals.h
+       $(SRC)\intervals.h \
+       $(SRC)\composite.h \
+       $(SRC)\atimer.h
 
 $(BLD)\w32select.obj: \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32select.c \
-       $(SRC)\lisp.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\dispextern.h \
        $(SRC)\frame.h \
        $(SRC)\blockinput.h
@@ -1121,7 +1228,30 @@ $(BLD)\w32reg.obj: \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32reg.c \
-       $(SRC)\lisp.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
+       $(SRC)\blockinput.h
+
+$(BLD)\w32xfns.obj: \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
+       $(SRC)\w32xfns.c \
+
+$(BLD)\w32bdf.obj: \
+       $(EMACS_ROOT)\src/s\ms-w32.h \
+       $(EMACS_ROOT)\src/m\intel386.h \
+       $(EMACS_ROOT)\src/config.h \
+       $(SRC)\w32bdf.c \
+       $(SRC)\charset.h \
+       $(SRC)\frame.h \
+       $(SRC)\dispextern.h \
+       $(SRC)\fontset.h \
+       $(SRC)\blockinput.h \
+       $(SRC)\w32gui.h \
+       $(SRC)\w32term.h \
+       $(SRC)\w32gui.h \
+       $(SRC)\w32bdf.h \
+       $(SRC)\w32.h \
+       $(SRC)\frame.h \
        $(SRC)\blockinput.h