(toplevel) [HAVE_STRING_H]: Include string.h.
[bpt/emacs.git] / lib-src / makefile.nt
index 4fad687..33406f6 100644 (file)
@@ -15,8 +15,9 @@
 #  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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+#  along with GNU Emacs; see the file COPYING.  If not, write to the
+#  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+#  Boston, MA 02111-1307, USA.
 #
 
 # 
 #
 !include ..\nt\makefile.def
 
-LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 -DNO_ARCHIVES=1 -I..\src
-OBJDIR         = obj
-BLD            = $(OBJDIR)\$(ARCH)
+LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
+       -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I..\nt\inc -I..\src
 
-LINK_FLAGS     = $(ARCH_LDFLAGS) -debug:PARTIAL -machine:$(ARCH) -subsystem:console -entry:mainCRTStartup
+LINK_FLAGS     = $(ARCH_LDFLAGS) -debug:PARTIAL -machine:$(ARCH) -subsystem:console -entry:mainCRTStartup setargv.obj
 
 ALL            = $(BLD)\make-docfile.exe \
                $(BLD)\hexl.exe         \
-               $(BLD)\wakeup.exe       \
                $(BLD)\ctags.exe        \
-               $(BLD)\etags.exe
+               $(BLD)\etags.exe        \
+               $(BLD)\ebrowse.exe      \
+               $(BLD)\movemail.exe     \
+               $(BLD)\fakemail.exe     \
+
 
-               
 # don't know what (if) to do with these yet...
 #
 #              $(BLD)\sorted-doc.exe   \
 #              $(BLD)\env.exe          \
 #              $(BLD)\server.exe       \
 #              $(BLD)\emacstool.exe    \
-#              $(BLD)\fakemail.exe     \
 #              $(BLD)\leditcfns.exe    \
-#              $(BLD)\movemail.exe     \
 #              $(BLD)\emacsclient.exe  \
 #              $(BLD)\cvtmail.exe      \
 #              $(BLD)\digest-doc.exe   \
 #              $(BLD)\test-distrib.exe \
 
 
-LIBS         = $(SYS_LIB_DIR)\setargv.obj      \
-               $(SYS_LIB_DIR)\kernel32.lib     \
-               $(SYS_LIB_DIR)\libc.lib
+LIBS         = $(BASE_LIBS)
+
+$(BLD)\make-docfile.exe:       $(BLD)\make-docfile.obj $(BLD)\ntlib.obj
+               $(LINK) -out:$@ $(LINK_FLAGS) $(BLD)\make-docfile.obj $(BLD)\ntlib.obj $(LIBS)
+$(BLD)\hexl.exe:               $(BLD)\hexl.obj
+$(BLD)\fakemail.exe:           $(BLD)\fakemail.obj $(BLD)\ntlib.obj
+               $(LINK) -out:$@ $(LINK_FLAGS) -debug:full $(BLD)\fakemail.obj $(BLD)\ntlib.obj $(LIBS)
 
-#              $(SYS_LIB_DIR)\advapi32.lib     \
+make-docfile:  $(BLD) $(BLD)\make-docfile.exe
+etags:         $(BLD) $(BLD)\etags.exe
+ebrowse:       $(BLD) $(BLD)\ebrowse.exe
+hexl:          $(BLD) $(BLD)\hexl.exe
+movemail:      $(BLD) $(BLD)\movemail.exe
+fakemail:      $(BLD) $(BLD)\fakemail.exe
 
-$(BLD)\make-docfile.exe:       $(LIBS) $(BLD)\make-docfile.obj
-$(BLD)\hexl.exe:               $(LIBS) $(BLD)\hexl.obj
-$(BLD)\ctags.exe:              $(BLD)\etags.exe
-       copy $(BLD)\etags.exe $(BLD)\ctags.exe
-$(BLD)\wakeup.exe:             $(LIBS) $(BLD)\wakeup.obj $(BLD)\ntlib.obj
-               $(LINK) -out:$@ $(LINK_FLAGS) $(BLD)\wakeup.obj $(BLD)\ntlib.obj $(LIBS)
+GETOPTOBJS = $(BLD)\getopt.obj $(BLD)\getopt1.obj
+GETOPTDEPS = $(GETOPTOBJS) getopt.h
+MOVEMAILOBJS =  $(BLD)\movemail.obj \
+               $(BLD)\pop.obj \
+               $(BLD)\ntlib.obj \
+               $(GETOPTOBJS)
 
-make-docfile:  $(BLD)\make-docfile.exe
-wakeup:                $(BLD)\wakeup.exe
-etags:         $(BLD)\etags.exe
-hexl:          $(BLD)\hexl.exe
+$(BLD)\movemail.exe:   $(MOVEMAILOBJS) getopt.h
+# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
+               $(LINK) -out:$@ $(LINK_FLAGS) -debug:FULL $(MOVEMAILOBJS) wsock32.lib $(LIBS)
 
 ETAGSOBJ      = $(BLD)\etags.obj \
+               $(BLD)\getopt.obj \
+               $(BLD)\getopt1.obj \
+               $(BLD)\ntlib.obj \
+               $(BLD)\regex.obj
+
+
+$(BLD)\etags.exe:      $(ETAGSOBJ)
+               $(LINK) -out:$@ $(LINK_FLAGS) $(ETAGSOBJ) $(LIBS)
+
+
+$(BLD)\regex.obj: ../src/regex.c ../src/regex.h ../src/config.h
+               $(CC)  $(CFLAGS) -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \
+               ../src/regex.c -Fo$@
+
+ETAGS_CFLAGS  = -DETAGS_REGEXPS -DHAVE_GETCWD
+$(BLD)\etags.obj: etags.c
+               $(CC) $(CFLAGS) $(ETAGS_CFLAGS) -Fo$@ etags.c
+
+CTAGSOBJ      = $(BLD)\ctags.obj \
+               $(BLD)\getopt.obj \
+               $(BLD)\getopt1.obj \
+               $(BLD)\ntlib.obj \
+               $(BLD)\regex.obj
+
+$(BLD)\ctags.exe:           ctags.c $(CTAGSOBJ)
+               $(LINK) -out:$@ $(LINK_FLAGS) $(CTAGSOBJ) $(LIBS)
+
+ctags.c:       etags.c
+               - $(DEL) ctags.c
+               copy etags.c ctags.c
+
+CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS)
+$(BLD)\ctags.obj: ctags.c
+               $(CC) $(CFLAGS) $(CTAGS_CFLAGS) -Fo$@ ctags.c
+
+EBROWSE_OBJ   = $(BLD)\ebrowse.obj \
                $(BLD)\getopt.obj \
                $(BLD)\getopt1.obj \
                $(BLD)\ntlib.obj
 
-$(BLD)\etags.exe:              $(LIBS) $(ETAGSOBJ)
-       link32 -out:$@ -debug:PARTIAL -machine:$(ARCH) -align:0x1000 -subsystem:console -entry:mainCRTStartup $(ETAGSOBJ) $(LIBS)
+$(BLD)\ebrowse.exe:    $(EBROWSE_OBJ)
+               $(LINK) -out:$@ $(LINK_FLAGS) $(EBROWSE_OBJ) $(LIBS)
 
+$(BLD)\ebrowse.obj: ebrowse.c ..\src\config.h
+               $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -Fo$@ ebrowse.c
 #
 # don't know what to do with these yet...
 #
-# $(BLD)\sorted-doc.exe:               $(LIBS) $(BLD)\sorted-doc.obj
-# $(BLD)\yow.exe:              $(LIBS) $(BLD)\yow.obj
-# $(BLD)\emacstool.exe:        $(LIBS) $(BLD)\emacstool.obj
-# $(BLD)\env.exe:              $(LIBS) $(BLD)\env.obj
-# $(BLD)\fakemail.exe:                 $(LIBS) $(BLD)\fakemail.obj
-# $(BLD)\leditcfns.exe:        $(LIBS) $(BLD)\leditcfns.obj
-# $(BLD)\server.exe:           $(LIBS) $(BLD)\server.obj
-# $(BLD)\wakeup.exe:           $(LIBS) $(BLD)\wakeup.obj
-# $(BLD)\movemail.exe:                 $(LIBS) $(BLD)\movemail.obj
-# $(BLD)\cvtmail.exe:          $(LIBS) $(BLD)\cvtmail.obj
-# $(BLD)\digest-doc.exe:       $(LIBS) $(BLD)\digest-doc.obj
-# $(BLD)\emacsclient.exe:      $(LIBS) $(BLD)\emacsclient.obj
-# $(BLD)\qsort.exe:            $(LIBS) $(BLD)\qsort.obj
-# $(BLD)\test-distrib.exe:     $(LIBS) $(BLD)\test-distrib.obj
+# $(BLD)\sorted-doc.exe:       $(BLD)\sorted-doc.obj
+# $(BLD)\yow.exe:              $(BLD)\yow.obj
+# $(BLD)\emacstool.exe:        $(BLD)\emacstool.obj
+# $(BLD)\leditcfns.exe:        $(BLD)\leditcfns.obj
+# $(BLD)\server.exe:           $(BLD)\server.obj
+# $(BLD)\cvtmail.exe:          $(BLD)\cvtmail.obj
+# $(BLD)\digest-doc.exe:       $(BLD)\digest-doc.obj
+# $(BLD)\emacsclient.exe:      $(BLD)\emacsclient.obj
+# $(BLD)\test-distrib.exe:     $(BLD)\test-distrib.obj
 
 #
-# From ..\makefile.nt, with .obj changed to .o
+# From ..\src\makefile.nt.
 #
-obj = abbrev.o alloc.o alloca.o buffer.o bytecode.o callint.o callproc.o casefiddle.o cm.o cmds.o data.o dired.o dispnew.o doc.o  doprnt.o editfns.o eval.o fileio.o filelock.o filemode.o fns.o  indent.o insdel.o keyboard.o keymap.o lastfile.o lread.o macros.o marker.o minibuf.o xfaces.o mocklisp.o nt.o ntheap.o ntinevt.o ntproc.o ntterm.o print.o process.o regex.o scroll.o search.o syntax.o sysdep.o term.o termcap.o tparam.o undo.o unexnt.o window.o xdisp.o casetab.o floatfns.o frame.o gmalloc.o intervals.o ralloc.o textprop.o vm-limit.o
-
-lispdir = ..\lisp
+obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefiddle.c cm.c cmds.c charset.c coding.c category.c ccl.c data.c dired.c dispnew.c doc.c  doprnt.c editfns.c emacs.c eval.c fileio.c filelock.c filemode.c fns.c fontset.c indent.c insdel.c keyboard.c keymap.c lastfile.c lread.c macros.c marker.c minibuf.c xfaces.c mocklisp.c print.c process.c regex.c scroll.c search.c syntax.c sysdep.c term.c termcap.c tparam.c undo.c unexw32.c window.c xdisp.c casetab.c floatfns.c frame.c gmalloc.c intervals.c ralloc.c textprop.c vm-limit.c region-cache.c strftime.c w32.c w32console.c w32faces.c w32fns.c w32heap.c w32inevt.c w32proc.c w32reg.c w32menu.c w32select.c w32term.c w32xfns.c 
 
 #
 # These are the lisp files that are loaded up in loadup.el
 #
+lispsource = ../lisp/
+
+FACE_SUPPORT = $(lispsource)facemenu.elc
+MOUSE_SUPPORT = $(lispsource)select.elc $(lispsource)scroll-bar.elc
+FLOAT_SUPPORT = $(lispsource)float-sup.elc
+WINNT_SUPPORT = $(lispsource)ls-lisp.elc $(lispsource)w32-fns.elc $(lispsource)dos-w32.elc
+
 lisp= \
-       $(lispdir)\subr.elc \
-       $(lispdir)\byte-run.elc \
-       $(lispdir)\map-ynp.elc \
-       $(lispdir)\loaddefs.el \
-       $(lispdir)\simple.elc \
-       $(lispdir)\help.elc \
-       $(lispdir)\files.elc \
-       $(lispdir)\indent.elc \
-       $(lispdir)\window.elc \
-       $(lispdir)\frame.elc \
-       $(lispdir)\mouse.elc \
-       $(lispdir)\menu-bar.elc \
-       $(lispdir)\scroll-bar.elc \
-       $(lispdir)\select.elc \
-       $(lispdir)\paths.el \
-       $(lispdir)\startup.elc \
-       $(lispdir)\lisp.elc \
-       $(lispdir)\page.elc \
-       $(lispdir)\register.elc \
-       $(lispdir)\paragraphs.elc \
-       $(lispdir)\lisp-mode.elc \
-       $(lispdir)\text-mode.elc \
-       $(lispdir)\fill.elc \
-       $(lispdir)\c-mode.elc \
-       $(lispdir)\isearch.elc \
-       $(lispdir)\replace.elc \
-       $(lispdir)\abbrev.elc \
-       $(lispdir)\buff-menu.elc \
-       $(lispdir)\winnt.elc \
-       $(lispdir)\float-sup.elc \
-       $(lispdir)\vc-hooks.elc \
-       $(lispdir)\version.el
+       $(lispsource)abbrev.elc \
+       $(lispsource)buff-menu.elc \
+       $(lispsource)byte-run.elc \
+       $(lispsource)cus-start.el \
+       $(lispsource)custom.elc \
+       $(lispsource)faces.elc \
+       $(lispsource)files.elc \
+       $(lispsource)textmodes/fill.elc \
+       $(lispsource)format.elc \
+       $(FACE_SUPPORT) \
+       $(MOUSE_SUPPORT) \
+       $(FLOAT_SUPPORT) \
+       $(lispsource)frame.elc\
+       $(X_WINDOWS_SUPPORT) \
+       $(lispsource)help.elc \
+       $(lispsource)indent.elc \
+       $(lispsource)isearch.elc \
+       $(lispsource)emacs-lisp/lisp-mode.elc \
+       $(lispsource)emacs-lisp/lisp.elc \
+       $(lispsource)loadup.el \
+       $(lispsource)loaddefs.el \
+       $(lispsource)map-ynp.elc \
+       $(lispsource)menu-bar.elc \
+       $(lispsource)international/mule.elc \
+       $(lispsource)international/mule-conf.el \
+       $(lispsource)international/mule-cmds.elc \
+       $(lispsource)international/characters.elc \
+       $(lispsource)language/chinese.elc \
+       $(lispsource)language/cyrillic.elc \
+       $(lispsource)language/devanagari.elc \
+       $(lispsource)language/english.elc \
+       $(lispsource)language/ethiopic.elc \
+       $(lispsource)language/european.elc \
+       $(lispsource)language/greek.elc \
+       $(lispsource)language/hebrew.elc \
+       $(lispsource)language/indian.elc \
+       $(lispsource)language/japanese.elc \
+       $(lispsource)language/korean.elc \
+       $(lispsource)language/lao.elc \
+       $(lispsource)language/thai.elc \
+       $(lispsource)language/tibetan.elc \
+       $(lispsource)language/vietnamese.elc \
+       $(lispsource)language/misc-lang.elc \
+       $(lispsource)textmodes/page.elc \
+       $(lispsource)textmodes/paragraphs.elc \
+       $(lispsource)paths.el \
+       $(lispsource)register.elc \
+       $(lispsource)replace.elc \
+       $(lispsource)simple.elc \
+       $(lispsource)startup.elc \
+       $(lispsource)subr.elc \
+       $(lispsource)textmodes/text-mode.elc \
+       $(lispsource)vc-hooks.elc \
+       $(lispsource)ediff-hook.elc \
+       $(VMS_SUPPORT) \
+       $(MSDOS_SUPPORT) \
+       $(WINNT_SUPPORT) \
+       $(lispsource)window.elc \
+       $(lispsource)version.el
+
 
 DOC          = DOC 
 $(DOC):                $(BLD)\make-docfile.exe
-               - rm -f $(DOC)
+               - $(DEL) $(DOC)
                $(BLD)\make-docfile -d ..\src $(obj) > $(DOC)
                $(BLD)\make-docfile -d ..\src $(lisp) >> $(DOC)
-               $(CP) $(DOC) ..\etc
+               $(CP) $(DOC) ..\etc\DOC-X
                - mkdir ..\src\$(OBJDIR)
                - mkdir ..\src\$(OBJDIR)\etc
-               $(CP) $(DOC) ..\src\$(OBJDIR)\etc
+               $(CP) $(DOC) ..\src\$(OBJDIR)\etc\DOC-X
 
 {$(BLD)}.obj{$(BLD)}.exe:
                $(LINK) -out:$@ $(LINK_FLAGS) $*.obj $(LIBS)
 
-.c{$(BLD)}.obj:
-               $(CC) $(CFLAGS) -Fo$@ $<
-
 #
 # Build the executables
 #
@@ -170,44 +241,48 @@ install:  $(INSTALL_FILES)
                $(CP) $(BLD)\etags.exe $(INSTALL_DIR)\bin
                $(CP) $(BLD)\ctags.exe $(INSTALL_DIR)\bin
                $(CP) $(BLD)\hexl.exe $(INSTALL_DIR)\bin
-               $(CP) $(BLD)\wakeup.exe $(INSTALL_DIR)\bin\wakeup
+               $(CP) $(BLD)\movemail.exe $(INSTALL_DIR)\bin
+               $(CP) $(BLD)\fakemail.exe $(INSTALL_DIR)\bin
                - mkdir $(INSTALL_DIR)\etc
                $(CP) $(DOC) $(INSTALL_DIR)\etc
 
 #
 # Maintenance
 # 
-clean:;                - del /q *~
-               - delnode /q deleted
-               - delnode /q obj
-               - del /q DOC
+clean:;                - $(DEL) *~ *.pdb DOC*
+               - $(DEL) *.orig *.rej *.crlf ctags.c
+               - $(DEL_TREE) deleted
+               - $(DEL_TREE) obj
+               - $(DEL_TREE) obj-spd
 
 #
 # Headers we would preprocess if we could.
 #
-..\src\config.h:       ..\nt\src\config.h
-                       cp ..\nt\src\config.h ..\src\config.h
-..\src\paths.h:                ..\nt\src\paths.h
-                       cp ..\nt\src\paths.h ..\src\paths.h
+..\src\config.h:       ..\nt\$(CONFIG_H)
+                       $(CP) $** $@
+..\src\paths.h:                ..\nt\paths.h
+                       $(CP) $** $@
 
 ### DEPENDENCIES ###
 
 EMACS_ROOT     = ..
 SRC            = .
 
-$(BLD)\alloca.obj : \
-       $(SRC)\alloca.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
-       $(EMACS_ROOT)\src\m\intel386.h \
-       $(EMACS_ROOT)\src\config.h \
-       $(EMACS_ROOT)\src\blockinput.h
-
 $(BLD)\b2m.obj : \
        $(SRC)\b2m.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h
 
+$(BLD)\ctags.obj : \
+       $(SRC)\ctags.c \
+       $(EMACS_ROOT)\nt\inc\sys\param.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\lib-src\..\src\config.h \
+       $(SRC)\ntlib.h \
+       $(SRC)\getopt.h
+
 $(BLD)\cvtmail.obj : \
        $(SRC)\cvtmail.c
 
@@ -216,13 +291,13 @@ $(BLD)\digest-doc.obj : \
 
 $(BLD)\emacsclient.obj : \
        $(SRC)\emacsclient.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h
 
 $(BLD)\emacsserver.obj : \
        $(SRC)\emacsserver.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h
@@ -234,35 +309,38 @@ $(BLD)\emacstool.obj : \
 $(BLD)\etags.obj : \
        $(SRC)\etags.c \
        $(EMACS_ROOT)\nt\inc\sys\param.h \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h \
+       $(SRC)\ntlib.h \
        $(SRC)\getopt.h
 
 $(BLD)\fakemail.obj : \
        $(SRC)\fakemail.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(SRC)\ntlib.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h \
        $(EMACS_ROOT)\nt\inc\pwd.h
 
 $(BLD)\getdate.obj : \
        $(SRC)\getdate.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(MSTOOLS_SYS)\types.h
 
 $(BLD)\getopt.obj : \
        $(SRC)\getopt.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
+       $(SRC)\ntlib.h \
        $(SRC)\getopt.h
 
 $(BLD)\getopt1.obj : \
        $(SRC)\getopt1.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h \
        $(SRC)\getopt.h
@@ -274,24 +352,37 @@ $(BLD)\leditcfns.obj : \
        $(SRC)\leditcfns.c
 
 $(BLD)\make-docfile.obj : \
-       $(SRC)\make-docfile.c
+       $(SRC)\make-docfile.c \
+       $(EMACS_ROOT)\src\config.h
 
 $(BLD)\make-path.obj : \
        $(SRC)\make-path.c
 
 $(BLD)\movemail.obj : \
        $(SRC)\movemail.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
        $(EMACS_ROOT)\src\vmsproc.h \
        $(EMACS_ROOT)\lib-src\..\src\syswait.h \
+       $(EMACS_ROOT)\nt\inc\pwd.h \
+       $(SRC)\ntlib.h
+               $(CC) $(CFLAGS) -DUSG -Fo$@ movemail.c
+
+$(BLD)\ntlib.obj : \
+       $(SRC)\ntlib.c \
+       $(SRC)\ntlib.h \
        $(EMACS_ROOT)\nt\inc\pwd.h
 
+$(BLD)\pop.obj : \
+       $(SRC)\pop.c \
+       $(SRC)\pop.h \
+       $(SRC)\ntlib.h
+
 $(BLD)\profile.obj : \
        $(SRC)\profile.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h \
        $(EMACS_ROOT)\src\vmstime.h \
@@ -311,16 +402,10 @@ $(BLD)\test-distrib.obj : \
 
 $(BLD)\timer.obj : \
        $(SRC)\timer.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\lib-src\..\src\config.h
 
-$(BLD)\wakeup.obj : \
-       $(SRC)\wakeup.c \
-       $(EMACS_ROOT)\src\s\windowsnt.h \
-       $(EMACS_ROOT)\src\m\intel386.h \
-       $(EMACS_ROOT)\src\config.h
-
 $(BLD)\yow.obj : \
        $(SRC)\yow.c \
        $(EMACS_ROOT)\lib-src\..\src\paths.h