(quail-japanese-katakana-update-translation):

[bpt/emacs.git] / lib-src / makefile.nt

diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index 3cb64ef..ab1729c 100644 (file)
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -25,7 +25,8 @@
 #
 !include ..\nt\makefile.def
 
-LOCAL_FLAGS    = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 -DNO_ARCHIVES=1 -I..\nt\inc -I..\src
+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 setargv.obj
 
@@ -72,7 +73,8 @@ MOVEMAILOBJS =  $(BLD)\movemail.obj \
                $(GETOPTOBJS)
 
 $(BLD)\movemail.exe:   $(MOVEMAILOBJS) getopt.h
-               $(LINK) -out:$@ $(LINK_FLAGS) -debug:FULL $(MOVEMAILOBJS) $(LIBS) wsock32.lib
+# 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 \
@@ -128,7 +130,7 @@ $(BLD)\ctags.obj: ctags.c
 #
 # From ..\src\makefile.nt.
 #
-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 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 
+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
@@ -148,7 +150,7 @@ lisp= \
        $(lispsource)custom.elc \
        $(lispsource)faces.elc \
        $(lispsource)files.elc \
-       $(lispsource)fill.elc \
+       $(lispsource)textmodes/fill.elc \
        $(lispsource)format.elc \
        $(FACE_SUPPORT) \
        $(MOUSE_SUPPORT) \
@@ -158,8 +160,8 @@ lisp= \
        $(lispsource)help.elc \
        $(lispsource)indent.elc \
        $(lispsource)isearch.elc \
-       $(lispsource)lisp-mode.elc \
-       $(lispsource)lisp.elc \
+       $(lispsource)emacs-lisp/lisp-mode.elc \
+       $(lispsource)emacs-lisp/lisp.elc \
        $(lispsource)loadup.el \
        $(lispsource)loaddefs.el \
        $(lispsource)map-ynp.elc \
@@ -184,15 +186,15 @@ lisp= \
        $(lispsource)language/tibetan.elc \
        $(lispsource)language/vietnamese.elc \
        $(lispsource)language/misc-lang.elc \
-       $(lispsource)page.elc \
-       $(lispsource)paragraphs.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)text-mode.elc \
+       $(lispsource)textmodes/text-mode.elc \
        $(lispsource)vc-hooks.elc \
        $(lispsource)ediff-hook.elc \
        $(VMS_SUPPORT) \
@@ -241,8 +243,10 @@ install:   $(INSTALL_FILES)
 # Maintenance
 # 
 clean:;                - $(DEL) *~ *.pdb DOC*
+               - $(DEL) *.orig *.rej *.crlf ctags.c
                - $(DEL_TREE) deleted
-               - $(DEL_TREE) $(OBJDIR)
+               - $(DEL_TREE) obj
+               - $(DEL_TREE) obj-spd
 
 #
 # Headers we would preprocess if we could.
@@ -270,6 +274,15 @@ $(BLD)\b2m.obj : \
        $(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
 
@@ -299,6 +312,7 @@ $(BLD)\etags.obj : \
        $(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 : \
@@ -321,6 +335,7 @@ $(BLD)\getopt.obj : \
        $(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 : \
@@ -351,7 +366,8 @@ $(BLD)\movemail.obj : \
        $(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
+       $(EMACS_ROOT)\nt\inc\pwd.h \
+       $(SRC)\ntlib.h
                $(CC) $(CFLAGS) -DUSG -Fo$@ movemail.c
 
 $(BLD)\ntlib.obj : \