*** empty log message ***

[gnu-emacs] / src / makefile.nt

diff --git a/src/makefile.nt b/src/makefile.nt
index df55ce3cb3a2a0d310edafedc4bb0ceeabf562f1..b9d3e165c2796f687dc1631cf71d365cc5c49841 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -36,9 +36,24 @@ 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
@@ -58,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 -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 -pdb:none -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:none -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd $(EXTRA_LINK)
 !endif
 
 #
@@ -75,6 +90,7 @@ 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      \
@@ -127,6 +143,7 @@ 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     \
@@ -141,10 +158,11 @@ OBJ2 =  $(BLD)\w32.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 =  $(TLIB0)       \
        $(TLIB1)        \
@@ -173,10 +191,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) $** $@
 
 #
@@ -185,25 +203,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
-               copy temacs.map emacs.map
-               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):      $(TLIB0) $(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
@@ -236,13 +283,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.
@@ -255,7 +296,7 @@ install:        all
 # Maintenance
 # 
 clean:;         - $(DEL) *~ s\*~
-               - $(DEL) *.pdb config.h paths.h
+               - $(DEL) *.pdb config.h epaths.h
                - $(DEL) *.orig *.rej *.crlf
                - $(DEL) s\*.orig s\*.rej s\*.crlf
                - $(DEL_TREE) deleted
@@ -281,7 +322,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
@@ -291,9 +331,9 @@ $(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)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\puresize.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
@@ -311,15 +351,29 @@ $(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)\intervals.h \
+       $(SRC)\composite.h \
+       $(SRC)\frame.h \
        $(SRC)\window.h \
        $(SRC)\commands.h \
        $(SRC)\buffer.h \
@@ -332,7 +386,6 @@ $(BLD)\bytecode.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)\syntax.h
 
@@ -341,7 +394,6 @@ $(BLD)\callint.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)\keyboard.h \
@@ -355,7 +407,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 \
@@ -369,7 +420,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
@@ -380,7 +430,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 : \
@@ -396,17 +445,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
@@ -418,7 +475,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
@@ -428,7 +484,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 \
@@ -441,6 +496,7 @@ $(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 \
@@ -455,7 +511,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
 
@@ -470,7 +525,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 \
@@ -486,9 +540,9 @@ $(BLD)\editfns.obj : \
        $(SRC)\uaf.h \
        $(SRC)\vms-pwd.h \
        $(EMACS_ROOT)\nt\inc\pwd.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
        $(SRC)\vmstime.h \
@@ -499,10 +553,10 @@ $(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)\intervals.h \
+       $(SRC)\composite.h \
        $(EMACS_ROOT)\nt\inc\sys\ioctl.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
        $(SRC)\systty.h \
@@ -514,7 +568,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
@@ -530,9 +583,9 @@ $(BLD)\fileio.obj : \
        $(SRC)\msdos.h \
        $(EMACS_ROOT)\nt\inc\sys\param.h \
        $(SRC)\vmsdir.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
        $(SRC)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
@@ -548,8 +601,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
@@ -574,7 +626,6 @@ $(BLD)\floatfns.obj : \
        $(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 : \
@@ -582,19 +633,18 @@ $(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)\intervals.h \
+       $(SRC)\composite.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 \
@@ -634,7 +684,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 \
@@ -644,16 +693,17 @@ $(BLD)\indent.obj : \
        $(SRC)\disptab.h \
        $(SRC)\dispextern.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)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h \
        $(SRC)\blockinput.h
@@ -663,12 +713,12 @@ $(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)\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 \
@@ -677,7 +727,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 \
@@ -688,6 +737,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 \
@@ -697,14 +747,14 @@ $(BLD)\keyboard.obj : \
        $(SRC)\w32term.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 \
@@ -723,9 +773,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 \
@@ -736,7 +785,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 \
@@ -747,7 +795,6 @@ $(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)\minibuf.obj : \
@@ -755,7 +802,6 @@ $(BLD)\minibuf.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)\dispextern.h \
@@ -768,7 +814,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 : \
@@ -777,7 +822,6 @@ $(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
 
@@ -793,17 +837,17 @@ $(BLD)\w32inevt.obj : \
        $(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
 
 $(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 \
@@ -814,7 +858,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 \
@@ -828,14 +871,14 @@ $(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)\intervals.h \
+       $(SRC)\composite.h
 
 $(BLD)\process.obj : \
        $(SRC)\process.c \
@@ -854,17 +897,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 \
@@ -879,7 +922,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
@@ -889,7 +931,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
 
@@ -899,7 +940,6 @@ $(BLD)\scroll.obj : \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\termchar.h \
-       $(SRC)\lisp.h \
        $(SRC)\dispextern.h \
        $(SRC)\frame.h
 
@@ -908,13 +948,13 @@ $(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 \
@@ -927,7 +967,6 @@ $(BLD)\sunfns.obj : \
        $(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
@@ -937,17 +976,16 @@ $(BLD)\syntax.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
+       $(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 \
@@ -983,7 +1021,6 @@ $(BLD)\term.obj : \
        $(SRC)\termchar.h \
        $(SRC)\termopts.h \
        $(SRC)\cm.h \
-       $(SRC)\lisp.h \
        $(SRC)\frame.h \
        $(SRC)\disptab.h \
        $(SRC)\termhooks.h \
@@ -1004,9 +1041,9 @@ $(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)\intervals.h \
+       $(SRC)\composite.h \
        $(SRC)\buffer.h \
        $(SRC)\window.h
 
@@ -1021,7 +1058,6 @@ $(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
 
@@ -1044,7 +1080,6 @@ $(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 \
@@ -1056,7 +1091,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 \
@@ -1064,14 +1098,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 \
@@ -1082,22 +1116,25 @@ $(BLD)\xdisp.obj : \
        $(SRC)\disptab.h \
        $(SRC)\termhooks.h \
        $(SRC)\dispextern.h \
-       $(SRC)\intervals.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)\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 \
@@ -1105,16 +1142,17 @@ $(BLD)\w32fns.obj: \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32fns.c \
        $(SRC)\x-list-font.c \
-       $(SRC)\lisp.h \
        $(SRC)\w32term.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
 
@@ -1123,21 +1161,22 @@ $(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)\w32gui.h \
        $(SRC)\systty.h \
@@ -1150,16 +1189,17 @@ $(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)\w32gui.h \
        $(SRC)\dispextern.h \
@@ -1171,7 +1211,6 @@ $(BLD)\w32reg.obj: \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32reg.c \
-       $(SRC)\lisp.h \
        $(SRC)\w32term.h \
        $(SRC)\w32gui.h \
        $(SRC)\blockinput.h
@@ -1181,8 +1220,20 @@ $(BLD)\w32xfns.obj: \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32xfns.c \
-       $(SRC)\lisp.h \
+
+$(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)\w32bdf.h \
        $(SRC)\w32.h \
        $(SRC)\frame.h \
        $(SRC)\blockinput.h