HCoop / bpt / emacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Consolidate redundant definitions in s/bsd-common.h.
[bpt/emacs.git] / src / makefile.w32-in
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index a8df466..156eddd 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,6 +1,6 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-#   2008  Free Software Foundation, Inc.
+#   2008, 2009, 2010  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -31,6 +31,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp
 #
 LOCAL_FLAGS     = -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
 
+SRC             = .
 EMACS           = $(BLD)/emacs.exe
 TEMACS          = $(BLD)/temacs.exe
 TEMACS_TMP      = $(BLD)/temacs.bin
@@ -55,32 +56,32 @@ FULL_LINK_FLAGS = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 OBJ0 =  $(BLD)/emacs.$(O)
 
 OBJ1 =  $(BLD)/alloc.$(O)              \
-       $(BLD)/atimer.$(O)                      \
-       $(BLD)/buffer.$(O)                      \
+       $(BLD)/atimer.$(O)              \
+       $(BLD)/buffer.$(O)              \
        $(BLD)/bytecode.$(O)            \
        $(BLD)/callint.$(O)             \
        $(BLD)/callproc.$(O)            \
        $(BLD)/casefiddle.$(O)          \
        $(BLD)/cm.$(O)                  \
-       $(BLD)/cmds.$(O)                        \
-       $(BLD)/data.$(O)                        \
-       $(BLD)/dired.$(O)                       \
+       $(BLD)/cmds.$(O)                \
+       $(BLD)/data.$(O)                \
+       $(BLD)/dired.$(O)               \
        $(BLD)/dispnew.$(O)             \
        $(BLD)/doc.$(O)                 \
-       $(BLD)/doprnt.$(O)                      \
+       $(BLD)/doprnt.$(O)              \
        $(BLD)/editfns.$(O)             \
-       $(BLD)/eval.$(O)                        \
-       $(BLD)/fileio.$(O)                      \
+       $(BLD)/eval.$(O)                \
+       $(BLD)/fileio.$(O)              \
        $(BLD)/filelock.$(O)            \
        $(BLD)/filemode.$(O)            \
        $(BLD)/fns.$(O)                 \
-       $(BLD)/indent.$(O)                      \
-       $(BLD)/insdel.$(O)                      \
+       $(BLD)/indent.$(O)              \
+       $(BLD)/insdel.$(O)              \
        $(BLD)/keyboard.$(O)            \
-       $(BLD)/keymap.$(O)                      \
-       $(BLD)/lread.$(O)                       \
-       $(BLD)/macros.$(O)                      \
-       $(BLD)/marker.$(O)                      \
+       $(BLD)/keymap.$(O)              \
+       $(BLD)/lread.$(O)               \
+       $(BLD)/macros.$(O)              \
+       $(BLD)/marker.$(O)              \
        $(BLD)/md5.$(O)                 \
        $(BLD)/minibuf.$(O)             \
        $(BLD)/w32.$(O)                 \
@@ -88,42 +89,42 @@ OBJ1 =  $(BLD)/alloc.$(O)           \
        $(BLD)/w32inevt.$(O)            \
        $(BLD)/w32proc.$(O)             \
        $(BLD)/w32console.$(O)          \
-       $(BLD)/print.$(O)                       \
+       $(BLD)/print.$(O)               \
        $(BLD)/process.$(O)             \
-       $(BLD)/regex.$(O)                       \
-       $(BLD)/scroll.$(O)                      \
-       $(BLD)/search.$(O)                      \
-       $(BLD)/sound.$(O)                       \
-       $(BLD)/syntax.$(O)                      \
-       $(BLD)/sysdep.$(O)                      \
-       $(BLD)/term.$(O)                        \
+       $(BLD)/regex.$(O)               \
+       $(BLD)/scroll.$(O)              \
+       $(BLD)/search.$(O)              \
+       $(BLD)/sound.$(O)               \
+       $(BLD)/syntax.$(O)              \
+       $(BLD)/sysdep.$(O)              \
+       $(BLD)/term.$(O)                \
        $(BLD)/termcap.$(O)             \
-       $(BLD)/tparam.$(O)                      \
-       $(BLD)/undo.$(O)                        \
+       $(BLD)/tparam.$(O)              \
+       $(BLD)/undo.$(O)                \
        $(BLD)/unexw32.$(O)             \
-       $(BLD)/window.$(O)                      \
-       $(BLD)/xdisp.$(O)                       \
+       $(BLD)/window.$(O)              \
+       $(BLD)/xdisp.$(O)               \
        $(BLD)/casetab.$(O)             \
        $(BLD)/floatfns.$(O)            \
-       $(BLD)/frame.$(O)                       \
+       $(BLD)/frame.$(O)               \
        $(BLD)/gmalloc.$(O)             \
        $(BLD)/intervals.$(O)           \
        $(BLD)/composite.$(O)           \
-       $(BLD)/ralloc.$(O)                      \
+       $(BLD)/ralloc.$(O)              \
        $(BLD)/textprop.$(O)            \
        $(BLD)/vm-limit.$(O)            \
-       $(BLD)/region-cache.$(O)                \
+       $(BLD)/region-cache.$(O)        \
        $(BLD)/strftime.$(O)            \
        $(BLD)/charset.$(O)             \
        $(BLD)/character.$(O)           \
        $(BLD)/chartab.$(O)             \
-       $(BLD)/coding.$(O)                      \
+       $(BLD)/coding.$(O)              \
        $(BLD)/category.$(O)            \
        $(BLD)/ccl.$(O)                 \
-       $(BLD)/font.$(O)                        \
+       $(BLD)/font.$(O)                \
        $(BLD)/fontset.$(O)             \
-       $(BLD)/fringe.$(O)                      \
-       $(BLD)/image.$(O)                       \
+       $(BLD)/fringe.$(O)              \
+       $(BLD)/image.$(O)               \
        $(BLD)/terminal.$(O)            \
         $(BLD)/menu.$(O)
 
@@ -131,7 +132,7 @@ WIN32OBJ = $(BLD)/w32term.$(O)              \
           $(BLD)/w32xfns.$(O)          \
           $(BLD)/w32fns.$(O)           \
           $(BLD)/xfaces.$(O)           \
-          $(BLD)/w32select.$(O)                \
+          $(BLD)/w32select.$(O)        \
           $(BLD)/w32menu.$(O)          \
           $(BLD)/w32reg.$(O)
 
@@ -178,10 +179,29 @@ $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \
                  ../nt/$(BLD)/addsection.exe
        $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
        "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
-       echo $(OBJ0) > $(BLD)/buildobj.lst
-       echo $(OBJ1) >> $(BLD)/buildobj.lst
-       echo $(WIN32OBJ) >> $(BLD)/buildobj.lst
-       echo $(FONTOBJ) >> $(BLD)/buildobj.lst
+
+# These omit firstfile.${O}, but there's no documentation in there
+# anyways.
+buildobj.h: $(SRC)/makefile.w32-in
+       $(MAKE) $(MFLAGS) make-buildobj-$(SHELLTYPE)
+
+# Cannot have blanks between the backslash and the redirection
+# characters, because CMD's `echo' will put them in buildobj.h.
+make-buildobj-CMD:
+       echo #define BUILDOBJ ^"\> buildobj.h
+       echo $(OBJ0)            \>> buildobj.h
+       echo $(OBJ1)            \>> buildobj.h
+       echo $(WIN32OBJ)        \>> buildobj.h
+       echo $(FONTOBJ)         \>> buildobj.h
+       echo ^">> buildobj.h
+
+make-buildobj-SH:
+       echo '#define BUILDOBJ $(DQUOTE)\'  > buildobj.h
+       echo $(OBJ0)                   '\' >> buildobj.h
+       echo $(OBJ1)                   '\' >> buildobj.h
+       echo $(WIN32OBJ)               '\' >> buildobj.h
+       echo $(FONTOBJ)                '\' >> buildobj.h
+       echo '$(DQUOTE)'                   >> buildobj.h
 
 bootstrap: bootstrap-emacs
 
@@ -260,6 +280,7 @@ clean:
        - $(DEL) $(COMPILER_TEMP_FILES)
        - $(DEL_TREE) $(OBJDIR)
        - $(DEL) stamp_BLD
+       - $(DEL) buildobj.h
 
 distclean:     cleanall
        - $(DEL) config.h epaths.h Makefile
@@ -276,30 +297,22 @@ cleanall: clean
 ### DEPENDENCIES ###
 
 EMACS_ROOT = ..
-SRC       = .
 CONFIG_H   = $(EMACS_ROOT)/src/s/ms-w32.h \
             $(EMACS_ROOT)/src/m/intel386.h \
-            $(EMACS_ROOT)/src/config.h
-
-$(BLD)/abbrev.$(O) : \
-       $(SRC)/abbrev.c \
-       $(CONFIG_H) \
-       $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/commands.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/syntax.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/window.h
+            $(EMACS_ROOT)/src/config.h \
+            $(EMACS_ROOT)/nt/inc/sys/stat.h
 
 $(BLD)/alloc.$(O) : \
        $(SRC)/alloc.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
@@ -308,12 +321,18 @@ $(BLD)/alloc.$(O) : \
        $(SRC)/process.h \
        $(SRC)/puresize.h \
        $(SRC)/syssignal.h \
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/atimer.$(O) : \
        $(SRC)/atimer.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/syssignal.h \
@@ -322,10 +341,15 @@ $(BLD)/atimer.$(O) : \
 $(BLD)/buffer.$(O) : \
        $(SRC)/buffer.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/param.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/charset.h \
+       $(SRC)/character.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -335,55 +359,69 @@ $(BLD)/buffer.$(O) : \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/region-cache.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/bytecode.$(O) : \
        $(SRC)/bytecode.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
-       $(SRC)/charset.h \
+       $(SRC)/character.h \
+       $(SRC)/dispextern.h \
        $(SRC)/syntax.h \
+       $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/callint.$(O) : \
        $(SRC)/callint.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/callproc.$(O) : \
        $(SRC)/callproc.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/epaths.h \
+       $(SRC)/frame.h \
        $(SRC)/process.h \
        $(SRC)/syssignal.h \
+       $(SRC)/systime.h \
        $(SRC)/systty.h \
-       $(SRC)/frame.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32.h
+       $(SRC)/w32.h \
+       $(SRC)/w32gui.h
 
 $(BLD)/casefiddle.$(O) : \
        $(SRC)/casefiddle.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/keymap.h \
@@ -392,12 +430,14 @@ $(BLD)/casefiddle.$(O) : \
 $(BLD)/casetab.$(O) : \
        $(SRC)/casetab.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
-       $(SRC)/charset.h
+       $(SRC)/character.h
 
 $(BLD)/category.$(O) : \
        $(SRC)/category.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/category.h \
        $(SRC)/character.h \
@@ -407,26 +447,29 @@ $(BLD)/category.$(O) : \
 $(BLD)/ccl.$(O) : \
        $(SRC)/ccl.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
-       $(SRC)/coding.h
+       $(SRC)/coding.h \
+       $(SRC)/composite.h
 
 $(BLD)/character.$(O) : \
        $(SRC)/character.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
-       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/disptab.h
 
 $(BLD)/charset.$(O) : \
        $(SRC)/charset.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
@@ -436,32 +479,45 @@ $(BLD)/charset.$(O) : \
 $(BLD)/chartab.$(O) : \
        $(SRC)/chartab.c \
        $(CONFIG_H) \
-       $(SRC)/charset.h \
-       $(SRC)/character.h
+       $(SRC)/lisp.h \
+       $(SRC)/ccl.h \
+       $(SRC)/character.h \
+       $(SRC)/charset.h
 
 $(BLD)/cm.$(O) : \
        $(SRC)/cm.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/cm.h \
-       $(SRC)/termhooks.h
+       $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
+       $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32gui.h
 
 $(BLD)/cmds.$(O) : \
        $(SRC)/cmds.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/coding.$(O) : \
        $(SRC)/coding.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/ccl.h \
        $(SRC)/character.h \
@@ -469,7 +525,6 @@ $(BLD)/coding.$(O) : \
        $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
        $(SRC)/frame.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
@@ -478,35 +533,57 @@ $(BLD)/coding.$(O) : \
 $(BLD)/composite.$(O) : \
        $(SRC)/composite.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/font.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
-       $(SRC)/w32gui.h
+       $(SRC)/termhooks.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
 $(BLD)/data.$(O) : \
        $(SRC)/data.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/font.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/puresize.h \
        $(SRC)/syssignal.h \
-       $(SRC)/termhooks.h
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32gui.h
 
 $(BLD)/dired.$(O) : \
        $(SRC)/dired.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/grp.h \
+       $(EMACS_ROOT)/nt/inc/pwd.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/dir.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/ndir.h \
        $(SRC)/regex.h \
        $(SRC)/systime.h
@@ -514,14 +591,15 @@ $(BLD)/dired.$(O) : \
 $(BLD)/dispnew.$(O) : \
        $(SRC)/dispnew.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/cm.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -543,27 +621,37 @@ $(BLD)/dispnew.$(O) : \
 $(BLD)/doc.$(O) : \
        $(SRC)/doc.c \
        $(CONFIG_H) \
+       buildobj.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/keyboard.h \
-       $(SRC)/keymap.h
+       $(SRC)/keymap.h \
+       $(SRC)/systime.h
 
 $(BLD)/doprnt.$(O) : \
        $(SRC)/doprnt.c \
        $(CONFIG_H) \
-       $(SRC)/character.h \
-       $(SRC)/charset.c
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(SRC)/lisp.h \
+       $(SRC)/character.h
 
 $(BLD)/editfns.$(O) : \
        $(SRC)/editfns.c \
        $(CONFIG_H) \
        $(EMACS_ROOT)/nt/inc/pwd.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -576,14 +664,18 @@ $(BLD)/editfns.$(O) : \
 $(BLD)/emacs.$(O) : \
        $(SRC)/emacs.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
@@ -592,6 +684,7 @@ $(BLD)/emacs.$(O) : \
        $(SRC)/systime.h \
        $(SRC)/systty.h \
        $(SRC)/termhooks.h \
+       $(SRC)/w32.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/window.h
@@ -599,9 +692,13 @@ $(BLD)/emacs.$(O) : \
 $(BLD)/eval.$(O) : \
        $(SRC)/eval.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
@@ -611,16 +708,18 @@ $(BLD)/fileio.$(O) : \
        $(SRC)/fileio.c \
        $(CONFIG_H) \
        $(EMACS_ROOT)/nt/inc/pwd.h \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
        $(SRC)/systime.h \
        $(SRC)/w32gui.h \
@@ -630,13 +729,14 @@ $(BLD)/filelock.$(O) : \
        $(SRC)/filelock.c \
        $(CONFIG_H) \
        $(EMACS_ROOT)/nt/inc/pwd.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/src/epaths.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/systime.h
 
 $(BLD)/filemode.$(O) : \
@@ -650,6 +750,7 @@ $(BLD)/firstfile.$(O) : \
 $(BLD)/floatfns.$(O) : \
        $(SRC)/floatfns.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/syssignal.h
 
 $(BLD)/fns.$(O) : \
@@ -657,12 +758,13 @@ $(BLD)/fns.$(O) : \
        $(CONFIG_H) \
        $(EMACS_ROOT)/nt/inc/langinfo.h \
        $(EMACS_ROOT)/nt/inc/nl_types.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
@@ -673,47 +775,66 @@ $(BLD)/fns.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/md5.h \
        $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/font.$(O) : \
        $(SRC)/font.c \
        $(CONFIG_H) \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
-       $(SRC)/window.h \
+       $(SRC)/lisp.h \
+       $(SRC)/buffer.h \
        $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
-       $(SRC)/font.h
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/font.h \
+       $(SRC)/fontset.h \
+       $(SRC)/frame.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
 $(BLD)/fontset.$(O) : \
        $(SRC)/fontset.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/font.h \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
+       $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
        $(SRC)/window.h
 
 $(BLD)/frame.$(O) : \
        $(SRC)/frame.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/font.h \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
@@ -727,43 +848,55 @@ $(BLD)/frame.$(O) : \
 $(BLD)/fringe.$(O) : \
        $(SRC)/fringe.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/gmalloc.$(O) : \
        $(SRC)/gmalloc.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(SRC)/getpagesize.h
 
-$(BLD)/image.$(O): \
+$(BLD)/image.$(O) : \
        $(SRC)/image.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/ccl.h \
+       $(SRC)/character.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/epaths.h \
+       $(SRC)/font.h \
        $(SRC)/frame.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
-       $(SRC)/w32heap.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
 
 $(BLD)/indent.$(O) : \
        $(SRC)/indent.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/category.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
@@ -772,6 +905,7 @@ $(BLD)/indent.$(O) : \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/region-cache.h \
+       $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termopts.h \
        $(SRC)/w32gui.h \
@@ -780,11 +914,12 @@ $(BLD)/indent.$(O) : \
 $(BLD)/insdel.$(O) : \
        $(SRC)/insdel.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
@@ -796,25 +931,31 @@ $(BLD)/insdel.$(O) : \
 $(BLD)/intervals.$(O) : \
        $(SRC)/intervals.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/puresize.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h
 
 $(BLD)/keyboard.$(O) : \
        $(SRC)/keyboard.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -828,7 +969,6 @@ $(BLD)/keyboard.$(O) : \
        $(SRC)/syntax.h \
        $(SRC)/syssignal.h \
        $(SRC)/systime.h \
-       $(SRC)/systty.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
@@ -839,21 +979,26 @@ $(BLD)/keyboard.$(O) : \
 $(BLD)/keymap.$(O) : \
        $(SRC)/keymap.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/puresize.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32gui.h
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
 $(BLD)/lastfile.$(O) : \
        $(SRC)/lastfile.c \
@@ -862,62 +1007,83 @@ $(BLD)/lastfile.$(O) : \
 $(BLD)/lread.$(O) : \
        $(SRC)/lread.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
-       $(EMACS_ROOT)/src/epaths.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/epaths.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h
 
 $(BLD)/macros.$(O) : \
        $(SRC)/macros.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
        $(SRC)/macros.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/marker.$(O) : \
        $(SRC)/marker.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h
+       $(SRC)/character.h
 
 $(BLD)/md5.$(O) : \
        $(SRC)/md5.c \
+       $(CONFIG_H) \
        $(SRC)/md5.h
 
 $(BLD)/menu.$(O) : \
-        $(SRC)/menu.c \
-        $(CONFIG_H) \
-        $(SRC)/keyboard.h \
-        $(SRC)/keymap.h \
-        $(SRC)/frame.h \
-        $(SRC)/termhooks.h \
-        $(SRC)/blockinput.h \
-        $(SRC)/dispextern.h \
-        $(SRC)/w32gui.h \
-        $(SRC)/w32term.h
+       $(SRC)/menu.c \
+       $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
+       $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
+       $(SRC)/menu.h \
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
 
 $(BLD)/minibuf.$(O) : \
        $(SRC)/minibuf.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -926,6 +1092,7 @@ $(BLD)/minibuf.$(O) : \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
+       $(SRC)/systime.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
@@ -933,22 +1100,39 @@ $(BLD)/minibuf.$(O) : \
 $(BLD)/w32.$(O) : \
        $(SRC)/w32.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/grp.h \
        $(EMACS_ROOT)/nt/inc/pwd.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/socket.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/ndir.h \
+       $(SRC)/process.h \
        $(SRC)/systime.h \
        $(SRC)/w32.h \
+       $(SRC)/w32gui.h \
        $(SRC)/w32heap.h
 
 $(BLD)/w32heap.$(O) : \
        $(SRC)/w32heap.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/w32heap.h
 
 $(BLD)/w32inevt.$(O) : \
        $(SRC)/w32inevt.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
@@ -962,7 +1146,14 @@ $(BLD)/w32proc.$(O) : \
        $(CONFIG_H) \
        $(EMACS_ROOT)/nt/inc/langinfo.h \
        $(EMACS_ROOT)/nt/inc/nl_types.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/character.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/process.h \
        $(SRC)/syssignal.h \
        $(SRC)/systime.h \
@@ -975,13 +1166,14 @@ $(BLD)/w32proc.$(O) : \
 $(BLD)/w32console.$(O) : \
        $(SRC)/w32console.c \
        $(CONFIG_H) \
-       $(SRC)/ccl.h \
+       $(SRC)/lisp.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
        $(SRC)/frame.h \
+       $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32inevt.h
@@ -989,30 +1181,44 @@ $(BLD)/w32console.$(O) : \
 $(BLD)/print.$(O) : \
        $(SRC)/print.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/font.h \
        $(SRC)/frame.h \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/process.h \
+       $(SRC)/systime.h \
        $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/process.$(O) : \
        $(SRC)/process.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
+       $(EMACS_ROOT)/nt/inc/netdb.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/arpa/inet.h \
+       $(EMACS_ROOT)/nt/inc/netinet/in.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/socket.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
@@ -1027,37 +1233,49 @@ $(BLD)/process.$(O) : \
        $(SRC)/syswait.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
+       $(SRC)/w32.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/ralloc.$(O) : \
        $(SRC)/ralloc.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
-       $(SRC)/getpagesize.h
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/getpagesize.h \
+       $(SRC)/systime.h
 
 $(BLD)/regex.$(O) : \
        $(SRC)/regex.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/category.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/regex.h \
        $(SRC)/syntax.h
 
 $(BLD)/region-cache.$(O) : \
        $(SRC)/region-cache.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/region-cache.h
 
 $(BLD)/scroll.$(O) : \
        $(SRC)/scroll.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
@@ -1066,6 +1284,8 @@ $(BLD)/scroll.$(O) : \
 $(BLD)/search.$(O) : \
        $(SRC)/search.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1085,45 +1305,57 @@ $(BLD)/search.$(O) : \
 $(BLD)/sound.$(O) : \
        $(SRC)/sound.c \
        $(CONFIG_H) \
-       $(SRC)/dispextern.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
-       $(SRC)/syssignal.h
+       $(SRC)/dispextern.h \
+       $(SRC)/syssignal.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32gui.h
 
 $(BLD)/strftime.$(O) : \
        $(SRC)/strftime.c \
-       $(CONFIG_H)
+       $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h
 
 $(BLD)/syntax.$(O) : \
        $(SRC)/syntax.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/category.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
        $(SRC)/keymap.h \
+       $(SRC)/regex.h \
        $(SRC)/syntax.h \
        $(SRC)/w32gui.h
 
 $(BLD)/sysdep.$(O) : \
        $(SRC)/sysdep.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
+       $(EMACS_ROOT)/nt/inc/grp.h \
+       $(EMACS_ROOT)/nt/inc/netdb.h \
+       $(EMACS_ROOT)/nt/inc/pwd.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
        $(EMACS_ROOT)/nt/inc/sys/ioctl.h \
-       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/socket.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/cm.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
-       $(SRC)/ndir.h \
        $(SRC)/process.h \
-       $(SRC)/sysselect.h \
        $(SRC)/syssignal.h \
        $(SRC)/systime.h \
        $(SRC)/systty.h \
@@ -1131,22 +1363,34 @@ $(BLD)/sysdep.$(O) : \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
+       $(SRC)/w32.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/term.$(O) : \
        $(SRC)/term.c \
        $(CONFIG_H) \
-       $(SRC)/ccl.h \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/cm.h \
        $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
        $(SRC)/frame.h \
+       $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
+       $(SRC)/syssignal.h \
+       $(SRC)/systime.h \
+       $(SRC)/systty.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
@@ -1156,21 +1400,30 @@ $(BLD)/term.$(O) : \
 $(BLD)/termcap.$(O) : \
        $(SRC)/termcap.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/file.h
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(SRC)/lisp.h
 
 $(BLD)/terminal.$(O) : \
        $(SRC)/terminal.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/termhooks.h
+       $(SRC)/termhooks.h \
+       $(SRC)/w32gui.h
 
 $(BLD)/textprop.$(O) : \
        $(SRC)/textprop.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -1180,13 +1433,18 @@ $(BLD)/textprop.$(O) : \
 
 $(BLD)/tparam.$(O) : \
        $(SRC)/tparam.c \
-       $(CONFIG_H)
+       $(CONFIG_H) \
+       $(SRC)/lisp.h
 
 $(BLD)/undo.$(O) : \
        $(SRC)/undo.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/buffer.h \
-       $(SRC)/commands.h
+       $(SRC)/commands.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
 $(BLD)/unexw32.$(O) : \
        $(SRC)/unexw32.c \
@@ -1196,14 +1454,18 @@ $(BLD)/unexw32.$(O) : \
 $(BLD)/vm-limit.$(O) : \
        $(SRC)/vm-limit.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
        $(SRC)/mem-limits.h
 
 $(BLD)/window.$(O) : \
        $(SRC)/window.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -1215,6 +1477,7 @@ $(BLD)/window.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/systime.h \
        $(SRC)/termchar.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
@@ -1222,6 +1485,9 @@ $(BLD)/window.$(O) : \
 $(BLD)/xdisp.$(O) : \
        $(SRC)/xdisp.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1250,14 +1516,18 @@ $(BLD)/xdisp.$(O) : \
        $(SRC)/w32term.h \
        $(SRC)/window.h
 
-$(BLD)/xfaces.$(O): \
+$(BLD)/xfaces.$(O) : \
        $(SRC)/xfaces.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/font.h \
@@ -1272,9 +1542,11 @@ $(BLD)/xfaces.$(O): \
        $(SRC)/w32term.h \
        $(SRC)/window.h
 
-$(BLD)/w32fns.$(O): \
+$(BLD)/w32fns.$(O) : \
        $(SRC)/w32fns.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1292,33 +1564,41 @@ $(BLD)/w32fns.$(O): \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
+       $(SRC)/w32font.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
 
-$(BLD)/w32menu.$(O): \
+$(BLD)/w32menu.$(O) : \
        $(SRC)/w32menu.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
+       $(SRC)/menu.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
 
-$(BLD)/w32term.$(O): \
+$(BLD)/w32term.$(O) : \
        $(SRC)/w32term.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1335,51 +1615,57 @@ $(BLD)/w32term.$(O): \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
+       $(SRC)/process.h \
        $(SRC)/systime.h \
        $(SRC)/systty.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
+       $(SRC)/w32font.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
 
-$(BLD)/w32select.$(O): \
+$(BLD)/w32select.$(O) : \
        $(SRC)/w32select.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
-       $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/composite.h \
-       $(SRC)/dispextern.h \
-       $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/w32term.h
 
-$(BLD)/w32reg.$(O): \
+$(BLD)/w32reg.$(O) : \
        $(SRC)/w32reg.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h
 
-$(BLD)/w32xfns.$(O): \
+$(BLD)/w32xfns.$(O) : \
        $(SRC)/w32xfns.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/lisp.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
-       $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
+       $(SRC)/dispextern.h \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
@@ -1387,11 +1673,15 @@ $(BLD)/w32xfns.$(O): \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h
 
-$(BLD)/w32font.$(O): \
+$(BLD)/w32font.$(O) : \
        $(SRC)/w32font.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/font.h \
        $(SRC)/fontset.h \
@@ -1400,9 +1690,11 @@ $(BLD)/w32font.$(O): \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h
 
-$(BLD)/w32uniscribe.$(O): \
+$(BLD)/w32uniscribe.$(O) : \
        $(SRC)/w32uniscribe.c \
        $(CONFIG_H) \
+       $(SRC)/lisp.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/composite.h \
Unnamed repository; edit this file 'description' to name the repository.