HCoop / bpt / emacs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add 2009 to copyright years.
[bpt/emacs.git] / src / makefile.w32-in
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 28fddaa..5618643 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,24 +1,22 @@
-#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-#
-#  This file is part of GNU Emacs.
-#
-#  GNU Emacs is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 3, or (at your option)
-#  any later version.
-#
-#  GNU Emacs is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with GNU Emacs; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#  Boston, MA 02110-1301, USA.
-#
+# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+#   2008, 2009  Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 ALL = emacs
 
@@ -31,7 +29,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
 #
-LOCAL_FLAGS     = -Demacs=1 -DWINDOWSNT -DDOS_NT -DHAVE_CONFIG_H -I../nt/inc -D_UCHAR_T -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
+LOCAL_FLAGS     = -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
 
 EMACS           = $(BLD)/emacs.exe
 TEMACS          = $(BLD)/temacs.exe
@@ -57,32 +55,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)                 \
@@ -90,53 +88,52 @@ 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)/terminal.$(O)
-
+       $(BLD)/fringe.$(O)              \
+       $(BLD)/image.$(O)               \
+       $(BLD)/terminal.$(O)            \
+        $(BLD)/menu.$(O)
 
 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)           \
-          $(BLD)/w32bdf.$(O)
+          $(BLD)/w32reg.$(O)
 
 FONTOBJ = $(BLD)/w32font.$(O) $(BLD)/w32uniscribe.$(O)
 
@@ -282,28 +279,19 @@ 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)/w32bdf.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)/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 \
@@ -312,13 +300,17 @@ $(BLD)/alloc.$(O) : \
        $(SRC)/process.h \
        $(SRC)/puresize.h \
        $(SRC)/syssignal.h \
-       $(SRC)/w32bdf.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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/syssignal.h \
@@ -327,10 +319,14 @@ $(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)/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 \
@@ -340,7 +336,7 @@ $(BLD)/buffer.$(O) : \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/region-cache.h \
-       $(SRC)/w32bdf.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
@@ -348,49 +344,56 @@ $(BLD)/bytecode.$(O) : \
        $(SRC)/bytecode.c \
        $(CONFIG_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)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
-       $(SRC)/w32bdf.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)/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)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/keymap.h \
@@ -400,7 +403,7 @@ $(BLD)/casetab.$(O) : \
        $(SRC)/casetab.c \
        $(CONFIG_H) \
        $(SRC)/buffer.h \
-       $(SRC)/charset.h
+       $(SRC)/character.h
 
 $(BLD)/category.$(O) : \
        $(SRC)/category.c \
@@ -425,45 +428,49 @@ $(BLD)/character.$(O) : \
        $(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)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
-       $(SRC)/composite.h \
        $(SRC)/disptab.h
 
 $(BLD)/chartab.$(O) : \
        $(SRC)/chartab.c \
        $(CONFIG_H) \
-       $(SRC)/charset.h \
-       $(SRC)/character.h
+       $(SRC)/ccl.h \
+       $(SRC)/character.h \
+       $(SRC)/charset.h
 
 $(BLD)/cm.$(O) : \
        $(SRC)/cm.c \
        $(CONFIG_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)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
-       $(SRC)/w32bdf.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
@@ -477,10 +484,8 @@ $(BLD)/coding.$(O) : \
        $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
-       $(SRC)/intervals.h \
        $(SRC)/frame.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
@@ -488,31 +493,43 @@ $(BLD)/composite.$(O) : \
        $(SRC)/composite.c \
        $(CONFIG_H) \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/font.h \
+       $(SRC)/frame.h \
        $(SRC)/intervals.h \
-       $(SRC)/w32bdf.h \
-       $(SRC)/w32gui.h
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
 $(BLD)/data.$(O) : \
        $(SRC)/data.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
+       $(SRC)/dispextern.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)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/coding.h \
@@ -524,14 +541,14 @@ $(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)/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 \
@@ -546,7 +563,6 @@ $(BLD)/dispnew.$(O) : \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
@@ -554,48 +570,55 @@ $(BLD)/dispnew.$(O) : \
 $(BLD)/doc.$(O) : \
        $(SRC)/doc.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.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)/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)/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)/intervals.h \
        $(SRC)/systime.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(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)/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 \
@@ -604,7 +627,7 @@ $(BLD)/emacs.$(O) : \
        $(SRC)/systime.h \
        $(SRC)/systty.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
+       $(SRC)/w32.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/window.h
@@ -612,32 +635,33 @@ $(BLD)/emacs.$(O) : \
 $(BLD)/eval.$(O) : \
        $(SRC)/eval.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h
 
 $(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)/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)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
@@ -645,12 +669,11 @@ $(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)/buffer.h \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/systime.h
 
@@ -672,12 +695,12 @@ $(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)/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 \
@@ -688,56 +711,68 @@ $(BLD)/fns.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/md5.h \
        $(SRC)/systime.h \
-       $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.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)/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)/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)/w32bdf.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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/dispextern.h \
+       $(SRC)/font.h \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
@@ -745,45 +780,51 @@ $(BLD)/frame.$(O) : \
 $(BLD)/fringe.$(O) : \
        $(SRC)/fringe.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/systime.h \
-       $(SRC)/w32bdf.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)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/ccl.h \
+       $(SRC)/character.h \
+       $(SRC)/coding.h \
        $(SRC)/dispextern.h \
        $(SRC)/epaths.h \
+       $(SRC)/font.h \
        $(SRC)/frame.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.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)/buffer.h \
        $(SRC)/category.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
@@ -792,52 +833,54 @@ $(BLD)/indent.$(O) : \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
        $(SRC)/region-cache.h \
+       $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/insdel.$(O) : \
        $(SRC)/insdel.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.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 \
        $(SRC)/region-cache.h \
        $(SRC)/systime.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/intervals.$(O) : \
        $(SRC)/intervals.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.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)/w32bdf.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)/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 \
@@ -851,11 +894,9 @@ $(BLD)/keyboard.$(O) : \
        $(SRC)/syntax.h \
        $(SRC)/syssignal.h \
        $(SRC)/systime.h \
-       $(SRC)/systty.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
@@ -863,22 +904,25 @@ $(BLD)/keyboard.$(O) : \
 $(BLD)/keymap.$(O) : \
        $(SRC)/keymap.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.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)/w32bdf.h \
-       $(SRC)/w32gui.h
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
 
 $(BLD)/lastfile.$(O) : \
        $(SRC)/lastfile.c \
@@ -887,32 +931,37 @@ $(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)/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)/w32bdf.h \
        $(SRC)/w32gui.h
 
 $(BLD)/macros.$(O) : \
        $(SRC)/macros.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/dispextern.h \
        $(SRC)/keyboard.h \
        $(SRC)/macros.h \
-       $(SRC)/w32bdf.h \
+       $(SRC)/systime.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
@@ -920,19 +969,37 @@ $(BLD)/marker.$(O) : \
        $(SRC)/marker.c \
        $(CONFIG_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) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/coding.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
+
 $(BLD)/minibuf.$(O) : \
        $(SRC)/minibuf.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/buffer.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -941,18 +1008,27 @@ $(BLD)/minibuf.$(O) : \
        $(SRC)/keyboard.h \
        $(SRC)/keymap.h \
        $(SRC)/syntax.h \
+       $(SRC)/systime.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(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)/coding.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) : \
@@ -963,13 +1039,15 @@ $(BLD)/w32heap.$(O) : \
 $(BLD)/w32inevt.$(O) : \
        $(SRC)/w32inevt.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
+       $(SRC)/coding.h \
+       $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/w32term.h
@@ -979,13 +1057,17 @@ $(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)/character.h \
+       $(SRC)/coding.h \
+       $(SRC)/dispextern.h \
        $(SRC)/process.h \
        $(SRC)/syssignal.h \
        $(SRC)/systime.h \
        $(SRC)/syswait.h \
        $(SRC)/w32.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32heap.h \
        $(SRC)/w32term.h
@@ -993,46 +1075,57 @@ $(BLD)/w32proc.$(O) : \
 $(BLD)/w32console.$(O) : \
        $(SRC)/w32console.c \
        $(CONFIG_H) \
-       $(SRC)/ccl.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/coding.h \
        $(SRC)/dispextern.h \
        $(SRC)/disptab.h \
        $(SRC)/frame.h \
+       $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32inevt.h
 
 $(BLD)/print.$(O) : \
        $(SRC)/print.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
+       $(EMACS_ROOT)/nt/inc/sys/time.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)/w32bdf.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/grp.h \
+       $(EMACS_ROOT)/nt/inc/netdb.h \
+       $(EMACS_ROOT)/nt/inc/pwd.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)/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 \
@@ -1047,15 +1140,19 @@ $(BLD)/process.$(O) : \
        $(SRC)/syswait.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32bdf.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)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/getpagesize.h \
+       $(SRC)/systime.h
 
 $(BLD)/regex.$(O) : \
        $(SRC)/regex.c \
@@ -1063,7 +1160,6 @@ $(BLD)/regex.$(O) : \
        $(SRC)/buffer.h \
        $(SRC)/category.h \
        $(SRC)/character.h \
-       $(SRC)/charset.h \
        $(SRC)/regex.h \
        $(SRC)/syntax.h
 
@@ -1076,18 +1172,21 @@ $(BLD)/region-cache.$(O) : \
 $(BLD)/scroll.$(O) : \
        $(SRC)/scroll.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
+       $(SRC)/coding.h \
        $(SRC)/dispextern.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/search.$(O) : \
        $(SRC)/search.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1102,19 +1201,23 @@ $(BLD)/search.$(O) : \
        $(SRC)/region-cache.h \
        $(SRC)/syntax.h \
        $(SRC)/systime.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h
 
 $(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)/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 \
@@ -1122,32 +1225,32 @@ $(BLD)/syntax.$(O) : \
        $(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)/w32bdf.h \
        $(SRC)/w32gui.h
 
 $(BLD)/sysdep.$(O) : \
        $(SRC)/sysdep.c \
        $(CONFIG_H) \
-       $(EMACS_ROOT)/nt/inc/sys/param.h \
+       $(EMACS_ROOT)/nt/inc/netdb.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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/cm.h \
+       $(SRC)/coding.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 \
@@ -1155,44 +1258,58 @@ $(BLD)/sysdep.$(O) : \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
        $(SRC)/termopts.h \
-       $(SRC)/w32bdf.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)/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 \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
 $(BLD)/termcap.$(O) : \
        $(SRC)/termcap.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/unistd.h \
        $(EMACS_ROOT)/nt/inc/sys/file.h
 
 $(BLD)/terminal.$(O) : \
        $(SRC)/terminal.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/charset.h \
        $(SRC)/coding.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 \
@@ -1201,7 +1318,6 @@ $(BLD)/textprop.$(O) : \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/intervals.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
@@ -1213,7 +1329,10 @@ $(BLD)/undo.$(O) : \
        $(SRC)/undo.c \
        $(CONFIG_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 \
@@ -1228,9 +1347,11 @@ $(BLD)/vm-limit.$(O) : \
 $(BLD)/window.$(O) : \
        $(SRC)/window.c \
        $(CONFIG_H) \
+       $(EMACS_ROOT)/nt/inc/sys/time.h \
        $(SRC)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
+       $(SRC)/coding.h \
        $(SRC)/commands.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
@@ -1242,7 +1363,7 @@ $(BLD)/window.$(O) : \
        $(SRC)/keymap.h \
        $(SRC)/systime.h \
        $(SRC)/termchar.h \
-       $(SRC)/w32bdf.h \
+       $(SRC)/termhooks.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
@@ -1250,6 +1371,8 @@ $(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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1274,19 +1397,21 @@ $(BLD)/xdisp.$(O) : \
        $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(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)/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 \
@@ -1297,14 +1422,14 @@ $(BLD)/xfaces.$(O): \
        $(SRC)/systime.h \
        $(SRC)/termchar.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1322,15 +1447,16 @@ $(BLD)/w32fns.$(O): \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1343,14 +1469,15 @@ $(BLD)/w32menu.$(O): \
        $(SRC)/keymap.h \
        $(SRC)/systime.h \
        $(SRC)/termhooks.h \
-       $(SRC)/w32bdf.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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
@@ -1367,81 +1494,64 @@ $(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)/w32bdf.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)/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)/w32bdf.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)/atimer.h \
        $(SRC)/blockinput.h \
        $(SRC)/systime.h \
-       $(SRC)/w32bdf.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)/atimer.h \
        $(SRC)/blockinput.h \
-       $(SRC)/character.h \
-       $(SRC)/charset.h \
-       $(SRC)/fontset.h \
-       $(SRC)/frame.h \
-       $(SRC)/keyboard.h \
-       $(SRC)/systime.h \
-       $(SRC)/w32bdf.h \
-       $(SRC)/w32gui.h \
-       $(SRC)/w32term.h
-
-$(BLD)/w32bdf.$(O): \
-       $(SRC)/w32bdf.c \
-       $(CONFIG_H) \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/coding.h \
        $(SRC)/dispextern.h \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
        $(SRC)/systime.h \
-       $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h
 
-$(BLD)/w32font.$(O): \
+$(BLD)/w32font.$(O) : \
        $(SRC)/w32font.c \
        $(CONFIG_H) \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
        $(SRC)/dispextern.h \
@@ -1452,11 +1562,13 @@ $(BLD)/w32font.$(O): \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h
 
-$(BLD)/w32uniscribe.$(O): \
+$(BLD)/w32uniscribe.$(O) : \
        $(SRC)/w32uniscribe.c \
        $(CONFIG_H) \
+       $(SRC)/ccl.h \
        $(SRC)/character.h \
        $(SRC)/charset.h \
+       $(SRC)/composite.h \
        $(SRC)/dispextern.h \
        $(SRC)/font.h \
        $(SRC)/fontset.h \
Unnamed repository; edit this file 'description' to name the repository.