(GETOPTOBJS, GETOPTDEFS, MOVEMAILOBJS): Define.

(movemail.exe): Depend upon and link with getopt files.
(obj): Include new source files.
(FACE_SUPPORT, MOUSE_SUPPORT, FLOAT_SUPPORT, WINNT_SUPPORT): Define.
(lisp): Include new and reorganized elisp files.

1 files changed, 78 insertions, 40 deletions

diff --git a/lib-src/makefile.nt b/lib-src/makefile.nt
index cf8b222bb4b..3cb64ef3ba4 100644
--- a/lib-src/makefile.nt
+++ b/lib-src/makefile.nt
@@ -55,8 +55,6 @@ 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)\movemail.exe:            $(BLD)\movemail.obj $(BLD)\pop.obj $(BLD)\ntlib.obj
-                $(LINK) -out:$@ $(LINK_FLAGS) -debug:FULL $(BLD)\movemail.obj $(BLD)\pop.obj $(BLD)\ntlib.obj $(LIBS) wsock32.lib
 $(BLD)\fakemail.exe:            $(BLD)\fakemail.obj $(BLD)\ntlib.obj
                 $(LINK) -out:$@ $(LINK_FLAGS) -debug:full $(BLD)\fakemail.obj $(BLD)\ntlib.obj $(LIBS)
 
@@ -66,6 +64,16 @@ hexl:		$(BLD) $(BLD)\hexl.exe
 movemail:       $(BLD) $(BLD)\movemail.exe
 fakemail:       $(BLD) $(BLD)\fakemail.exe
 
+GETOPTOBJS = $(BLD)\getopt.obj $(BLD)\getopt1.obj
+GETOPTDEPS = $(GETOPTOBJS) getopt.h
+MOVEMAILOBJS =  $(BLD)\movemail.obj \
+                $(BLD)\pop.obj \
+                $(BLD)\ntlib.obj \
+                $(GETOPTOBJS)
+
+$(BLD)\movemail.exe:    $(MOVEMAILOBJS) getopt.h
+                $(LINK) -out:$@ $(LINK_FLAGS) -debug:FULL $(MOVEMAILOBJS) $(LIBS) wsock32.lib
+
 ETAGSOBJ      = $(BLD)\etags.obj \
                 $(BLD)\getopt.obj \
                 $(BLD)\getopt1.obj \
@@ -120,49 +128,79 @@ $(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 data.c dired.c dispnew.c doc.c  doprnt.c editfns.c eval.c fileio.c filelock.c filemode.c fns.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 
-
-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 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)\format.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)\ls-lisp.elc \
-        $(lispdir)\winnt.elc \
-        $(lispdir)\float-sup.elc \
-        $(lispdir)\vc-hooks.elc \
-        $(lispdir)\version.el \
-        $(lispdir)\dos-nt.elc
+        $(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)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)lisp-mode.elc \
+        $(lispsource)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)page.elc \
+        $(lispsource)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)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