(WINNT_SUPPORT, MOUSE_SUPPORT, lisp): Revert to using .elc files.

(lisp): Sync with list in src/Makefile.in
(VMS_SUPPORT, MSDOS_SUPPORT): Define, so DOC files can be shared.

1 files changed, 64 insertions, 54 deletions

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 7b50b973c67..db4f8e542cc 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -133,81 +133,91 @@ obj = abbrev.c alloc.c alloca.c buffer.c bytecode.c callint.c callproc.c casefid
 #
 lispsource = ../lisp/
 
-FACE_SUPPORT = $(lispsource)facemenu.el
-MOUSE_SUPPORT = $(lispsource)select.el $(lispsource)scroll-bar.el $(lispsource)mouse.el
-FLOAT_SUPPORT = $(lispsource)float-sup.el
-WINNT_SUPPORT = $(lispsource)ls-lisp.el $(lispsource)w32-fns.el $(lispsource)dos-w32.el
+MOUSE_SUPPORT = $(lispsource)select.elc $(lispsource)scroll-bar.elc $(lispsource)mouse.elc
+WINNT_SUPPORT = $(lispsource)ls-lisp.elc $(lispsource)disp-table.elc $(lispsource)w32-fns.elc $(lispsource)dos-w32.elc $(lispsource)w32-vars.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
 
 lisp= \
-        $(lispsource)abbrev.el \
-        $(lispsource)buff-menu.el \
-        $(lispsource)byte-run.el \
-        $(lispsource)cus-start.el \
-        $(lispsource)custom.el \
-        $(lispsource)disp-table.el \
-        $(lispsource)faces.el \
-        $(lispsource)files.el \
-        $(lispsource)textmodes/fill.el \
-        $(lispsource)format.el \
-        $(FACE_SUPPORT) \
+        $(lispsource)abbrev.elc \
+        $(lispsource)buff-menu.elc \
+        $(lispsource)button.elc
+        $(lispsource)byte-run.elc \
+        $(lispsource)cus-start.elc \
+        $(lispsource)custom.elc \
+        $(lispsource)backquote.elc \
+        $(lispsource)emacs-lisp/lisp-mode.elc \
+        $(lispsource)emacs-lisp/lisp.elc \
+        $(lispsource)env.elc \
+        $(lispsource)faces.elc \
+        $(lispsource)files.elc \
+        $(lispsource)format.elc \
+        $(lispsource)facemenu.elc \
         $(MOUSE_SUPPORT) \
-        $(FLOAT_SUPPORT) \
-        $(lispsource)frame.el\
-        $(X_WINDOWS_SUPPORT) \
-        $(lispsource)help.el \
-        $(lispsource)indent.el \
-        $(lispsource)isearch.el \
-        $(lispsource)emacs-lisp/lisp-mode.el \
-        $(lispsource)emacs-lisp/lisp.el \
+        $(lispsource)float-sup.elc \
+        $(lispsource)frame.elc\
+        $(lispsource)help.elc \
+        $(lispsource)indent.elc \
+        $(lispsource)isearch.elc \
         $(lispsource)loadup.el \
         $(lispsource)loaddefs.el \
-        $(lispsource)bindings.el \
-        $(lispsource)map-ynp.el \
-        $(lispsource)menu-bar.el \
-        $(lispsource)international/mule.el \
+        $(lispsource)bindings.elc \
+        $(lispsource)map-ynp.elc \
+        $(lispsource)menu-bar.elc \
+        $(lispsource)international/mule.elc \
         $(lispsource)international/mule-conf.el \
-        $(lispsource)international/mule-cmds.el \
-        $(lispsource)international/characters.el \
-        $(lispsource)international/ccl.el \
-        $(lispsource)international/codepage.el \
-        $(lispsource)international/utf-8.el \
-        $(lispsource)case-table.el \
-        $(lispsource)language/chinese.el \
-        $(lispsource)language/cyrillic.el \
-        $(lispsource)language/devanagari.el \
+        $(lispsource)international/mule-cmds.elc \
+        $(lispsource)international/characters.elc \
+        $(lispsource)international/utf-8.elc \
+        $(lispsource)international/latin-1.el \
+        $(lispsource)international/latin-2.el \
+        $(lispsource)international/latin-3.el \
+        $(lispsource)international/latin-4.el \
+        $(lispsource)international/latin-5.el \
+        $(lispsource)international/latin-8.el \
+        $(lispsource)international/latin-9.el \
+        $(lispsource)case-table.elc \
+        $(lispsource)language/chinese.elc \
+        $(lispsource)language/cyrillic.elc \
+        $(lispsource)language/indian.elc \
+        $(lispsource)language/devanagari.elc \
         $(lispsource)language/english.el \
-        $(lispsource)language/ethiopic.el \
-        $(lispsource)language/european.el \
+        $(lispsource)language/ethiopic.elc \
+        $(lispsource)language/european.elc \
         $(lispsource)language/czech.el \
         $(lispsource)language/slovak.el \
         $(lispsource)language/romanian.el \
         $(lispsource)language/greek.el \
         $(lispsource)language/hebrew.el \
-        $(lispsource)language/indian.el \
         $(lispsource)language/japanese.el \
         $(lispsource)language/korean.el \
         $(lispsource)language/lao.el \
         $(lispsource)language/thai.el \
-        $(lispsource)language/tibetan.el \
-        $(lispsource)language/vietnamese.el \
+        $(lispsource)language/tibetan.elc \
+        $(lispsource)language/vietnamese.elc \
         $(lispsource)language/misc-lang.el \
-        $(lispsource)textmodes/page.el \
-        $(lispsource)textmodes/paragraphs.el \
+        $(lispsource)language/utf-8-lang.el \
+        $(lispsource)language/georgian.el \
         $(lispsource)paths.el \
-        $(lispsource)register.el \
-        $(lispsource)replace.el \
-        $(lispsource)simple.el \
-        $(lispsource)startup.el \
-        $(lispsource)subr.el \
-        $(lispsource)term/tty-colors.el \
-        $(lispsource)textmodes/text-mode.el \
-        $(lispsource)vc-hooks.el \
-        $(lispsource)ediff-hook.el \
+        $(lispsource)register.elc \
+        $(lispsource)replace.elc \
+        $(lispsource)simple.elc \
+        $(lispsource)startup.elc \
+        $(lispsource)subr.elc \
+        $(lispsource)term/tty-colors.elc \
+        $(lispsource)textmodes/fill.elc \
+        $(lispsource)textmodes/page.elc \
+        $(lispsource)textmodes/paragraphs.elc \
+        $(lispsource)textmodes/text-mode.elc \
+        $(lispsource)vc-hooks.elc \
+        $(lispsource)ediff-hook.elc \
         $(VMS_SUPPORT) \
         $(MSDOS_SUPPORT) \
         $(WINNT_SUPPORT) \
-        $(lispsource)widget.el \
-        $(lispsource)window.el \
+        $(lispsource)widget.elc \
+        $(lispsource)window.elc \
         $(lispsource)version.el