* src/Makefile.in (SOME_MACHINE_LISP): Add w32-vars.

Remove ccl and duplicate mouse.

diff --git a/src/ChangeLog b/src/ChangeLog
index ecac971be195fafb51907143283fd3e8bc1e3a18..1b1de29a0f11c94caef40b48baa28182ec8b9510 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-22  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (SOME_MACHINE_LISP): Add w32-vars.
+       Remove ccl and duplicate mouse.
+
 2010-10-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * insdel.c (prepare_to_modify_buffer): Don't set

diff --git a/src/Makefile.in b/src/Makefile.in
index 0437b0087aa8a77952803ca9b03d45e4f31052e8..87abc9ea734100358ab68bbc231aee4c75f49432 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
+# src/Makefile for GNU Emacs.
 
-# Makefile for GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
 #   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
@@ -575,18 +575,18 @@ shortlisp= \
 
 ## Like $shortlisp, but includes only those files from $lisp that are loaded
 ## conditionally (i.e., only on some platforms).
+## Confusingly, term/internal is not in loadup, but is unconditionally
+## loaded by pc-win, which is.
 SOME_MACHINE_LISP = ../lisp/mouse.elc \
   ../lisp/select.elc ../lisp/scroll-bar.elc \
   ../lisp/ls-lisp.elc ../lisp/dos-fns.elc \
   ../lisp/w32-fns.elc ../lisp/dos-w32.elc \
-  ../lisp/disp-table.elc ../lisp/dos-vars.elc \
+  ../lisp/disp-table.elc ../lisp/dos-vars.elc ../lisp/w32-vars.elc \
   ../lisp/tooltip.elc ../lisp/image.elc \
   ../lisp/fringe.elc ../lisp/dnd.elc \
   ../lisp/mwheel.elc ../lisp/tool-bar.elc \
   ../lisp/x-dnd.elc ../lisp/dynamic-setting.elc \
-  ../lisp/international/ccl.elc \
   ../lisp/international/fontset.elc \
-  ../lisp/mouse.elc \
   ../lisp/term/common-win.elc \
   ../lisp/term/x-win.elc \
   ../lisp/term/pc-win.elc ../lisp/term/internal.elc \