(TOOLTIP_SUPPORT, WINDOW_SUPPORT): New definitions.

(WINNT_SUPPORT): Add term/w32-win.elc.
(lisp1, lisp2): Sync with lisp in src/Makefile.in.

1 files changed, 43 insertions, 20 deletions

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index c76b79e3adb..190a293984c 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -167,30 +167,56 @@ obj =   sunfns.o dosfns.o msdos.o \
 #
 lispsource = ../lisp/
 
-MOUSE_SUPPORT = $(lispsource)select.elc $(lispsource)scroll-bar.elc $(lispsource)mouse.elc $(lispsource)tooltip.elc
-WINNT_SUPPORT = $(lispsource)ls-lisp.elc $(lispsource)disp-table.elc $(lispsource)w32-fns.elc $(lispsource)dos-w32.elc $(lispsource)w32-vars.elc
+MOUSE_SUPPORT = \
+        $(lispsource)select.elc \
+        $(lispsource)scroll-bar.elc \
+        $(lispsource)mouse.elc \
+        $(lispsource)tooltip.elc
+WINNT_SUPPORT = \
+        $(lispsource)ls-lisp.elc \
+        $(lispsource)disp-table.elc \
+        $(lispsource)w32-fns.elc \
+        $(lispsource)dos-w32.elc \
+        $(lispsource)w32-vars.elc \
+        $(lispsource)term/w32-win.elc
 
 # lisp files that are loaded up on other platforms
-MSDOS_SUPPORT = $(lispsource)dos-fns.elc $(lispsource)dos-vars.elc $(lispsource)international/ccl.elc $(lispsource)international/codepage.elc
-VMS_SUPPORT = $(lispsource)vmsproc.elc $(lispsource)vms-patch.elc
+MSDOS_SUPPORT = \
+        $(lispsource)dos-fns.elc \
+        $(lispsource)dos-vars.elc \
+        $(lispsource)international/ccl.elc \
+        $(lispsource)international/codepage.elc
+VMS_SUPPORT = \
+        $(lispsource)vmsproc.elc \
+        $(lispsource)vms-patch.elc
+TOOLTIP_SUPPORT = $(lispsource)tooltip.elc
+WINDOW_SUPPORT = \
+        $(lispsource)fringe.elc \
+        $(lispsource)image.elc \
+        $(lispsource)international/fontset.elc \
+        $(lispsource)dnd.elc \
+        $(lispsource)tool-bar.elc \
+        $(lispsource)mwheel.elc
 
 lisp1= \
         $(lispsource)abbrev.elc \
         $(lispsource)buff-menu.elc \
         $(lispsource)button.elc \
         $(lispsource)emacs-lisp/byte-run.elc \
+        ${lispsource}composite.elc \
         $(lispsource)cus-face.elc \
         $(lispsource)cus-start.elc \
         $(lispsource)custom.elc \
         $(lispsource)emacs-lisp/backquote.elc \
         $(lispsource)emacs-lisp/lisp-mode.elc \
         $(lispsource)emacs-lisp/lisp.elc \
-        $(lispsource)facemenu.elc \
-        $(MOUSE_SUPPORT) \
+        $(lispsource)env.elc \
         $(lispsource)faces.elc \
         $(lispsource)files.elc \
-        $(lispsource)emacs-lisp/float-sup.elc \
         $(lispsource)format.elc \
+        $(lispsource)facemenu.elc \
+        $(MOUSE_SUPPORT) \
+        $(lispsource)emacs-lisp/float-sup.elc \
         $(lispsource)frame.elc \
         $(lispsource)help.elc \
         $(lispsource)indent.elc \
@@ -200,23 +226,18 @@ lisp1= \
         $(lispsource)loaddefs.el \
         $(lispsource)bindings.elc \
         $(lispsource)emacs-lisp/map-ynp.elc \
-        $(lispsource)env.elc \
+        $(lispsource)menu-bar.elc \
         $(lispsource)international/mule.elc \
         $(lispsource)international/mule-conf.el \
         $(lispsource)international/mule-cmds.elc \
         $(lispsource)international/characters.elc \
-        $(lispsource)fringe.elc \
-        $(lispsource)image.elc \
-        $(lispsource)international/fontset.elc \
-        $(lispsource)dnd.elc \
-        $(lispsource)mwheel.elc \
-        $(lispsource)tool-bar.elc \
+        $(lispsource)international/charprop.el \
         $(lispsource)case-table.elc
 
 lisp2 = \
-        $(lispsource)language/chinese.elc \
-        $(lispsource)language/cyrillic.elc \
-        $(lispsource)language/indian.elc \
+        $(lispsource)language/chinese.el \
+        $(lispsource)language/cyrillic.el \
+        $(lispsource)language/indian.el \
         $(lispsource)language/devanagari.el \
         $(lispsource)language/kannada.el \
         $(lispsource)language/malayalam.el \
@@ -232,13 +253,13 @@ lisp2 = \
         $(lispsource)language/japanese.el \
         $(lispsource)language/korean.el \
         $(lispsource)language/lao.el \
+        $(lispsource)language/tai-viet.el \
         $(lispsource)language/thai.el \
         $(lispsource)language/tibetan.elc \
-        $(lispsource)language/vietnamese.elc \
+        $(lispsource)language/vietnamese.el \
         $(lispsource)language/misc-lang.el \
         $(lispsource)language/utf-8-lang.el \
         $(lispsource)language/georgian.el \
-        $(lispsource)menu-bar.elc \
         $(lispsource)paths.el \
         $(lispsource)register.elc \
         $(lispsource)replace.elc \
@@ -255,12 +276,14 @@ lisp2 = \
         $(lispsource)textmodes/paragraphs.elc \
         $(lispsource)textmodes/text-mode.elc \
         $(lispsource)emacs-lisp/timer.elc \
-        $(lispsource)vc-hooks.elc \
         $(lispsource)jka-cmpr-hook.elc \
+        $(lispsource)vc-hooks.elc \
         $(lispsource)ediff-hook.elc \
+        $(TOOLTIP_SUPPORT) \
         $(VMS_SUPPORT) \
         $(MSDOS_SUPPORT) \
         $(WINNT_SUPPORT) \
+        $(WINDOW_SUPPORT) \
         $(lispsource)widget.elc \
         $(lispsource)window.elc \
         $(lispsource)version.el