[Emacs-diffs] emacs/src ChangeLog Makefile.in

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/26 19:40:57

Modified files:
        src            : ChangeLog Makefile.in 

Log message:
        (MSDOS_SUPPORT) [MSDOS]: Remove unneeded '/' in internal.elc.
        Add term/pc-win.elc.
        (WINDOW_SUPPORT) [HAVE_X_WINDOWS]: Add term/common-win.elc and 
term/x-win.elc.
        (WINNT_SUPPORT) [WINDOWSNT]: Add term/common-win.elc and 
term/w32-win.elc.
        (NS_SUPPORT): New.
        (lisp): Add NS_SUPPORT.
        (SOME_MACHINE_LISP): Add term/w32-win.elc and emacs-lisp/easymenu.elc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7769&r2=1.7770
http://cvs.savannah.gnu.org/viewcvs/emacs/src/Makefile.in?cvsroot=emacs&r1=1.448&r2=1.449

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7769
retrieving revision 1.7770
diff -u -b -r1.7769 -r1.7770
--- ChangeLog   25 Sep 2009 17:40:53 -0000      1.7769
+++ ChangeLog   26 Sep 2009 19:40:55 -0000      1.7770
@@ -1,3 +1,15 @@
+2009-09-26  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MSDOS_SUPPORT) [MSDOS]: Remove unneeded '/' in
+       internal.elc.  Add term/pc-win.elc.
+       (WINDOW_SUPPORT) [HAVE_X_WINDOWS]: Add term/common-win.elc and
+       term/x-win.elc.
+       (WINNT_SUPPORT) [WINDOWSNT]: Add term/common-win.elc and
+       term/w32-win.elc.
+       (NS_SUPPORT): New.
+       (lisp): Add NS_SUPPORT.
+       (SOME_MACHINE_LISP): Add term/w32-win.elc and emacs-lisp/easymenu.elc.
+
 2009-09-25  David Reitter  <address@hidden>
 
        * nsmenu.m (EmacsMenu-clear): Recognize application menu

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/src/Makefile.in,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -b -r1.448 -r1.449
--- Makefile.in 17 Sep 2009 18:06:23 -0000      1.448
+++ Makefile.in 26 Sep 2009 19:40:57 -0000      1.449
@@ -631,7 +631,7 @@
 #ifdef MSDOS
 #define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
  ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \
- ${lispsource}/term/internal.elc
+ ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc
 
 #else
 #define MSDOS_SUPPORT
@@ -641,7 +641,8 @@
 #ifdef HAVE_X_WINDOWS
 #define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \
  ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
- ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc
+ ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc \
+ ${lispsource}term/common-win.elc ${lispsource}term/x-win.elc
 #else
 #define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \
  ${lispsource}international/fontset.elc ${lispsource}dnd.elc \
@@ -654,7 +655,8 @@
 #ifdef WINDOWSNT
 #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
   ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \
-  ${lispsource}w32-fns.elc
+  ${lispsource}w32-fns.elc ${lispsource}term/common-win.elc \
+  ${lispsource}term/w32-win.elc
 #else
 #define WINNT_SUPPORT
 #endif
@@ -665,6 +667,13 @@
 #define TOOLTIP_SUPPORT
 #endif
 
+#ifdef HAVE_NS
+#define NS_SUPPORT ${lispsource}emacs-lisp/easymenu.elc \
+  ${lispsource}term/ns-win.elc
+#else
+#define NS_SUPPORT
+#endif
+
 /* List of Lisp files loaded into the dumped Emacs.  It is arranged
    like this because it is easier to generate it semi-mechanically from
    loadup.el this way.
@@ -765,6 +774,7 @@
        MSDOS_SUPPORT \
        WINNT_SUPPORT \
        WINDOW_SUPPORT \
+       NS_SUPPORT \
        ${lispsource}widget.elc \
        ${lispsource}window.elc \
        ${lispsource}version.el
@@ -876,7 +886,8 @@
   ../lisp/term/common-win.elc \
   ../lisp/term/x-win.elc \
   ../lisp/term/pc-win.elc ../lisp/term/internal.elc \
-  ../lisp/term/ns-win.elc
+  ../lisp/term/ns-win.elc ../lisp/term/w32-win.elc \
+  ../lisp/emacs-lisp/easymenu.elc
 
 /* Construct full set of libraries to be linked.
    Note that SunOS needs -lm to come before -lc; otherwise, you get