merge trunk

[bpt/emacs.git] / msdos / ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 3d6cd88..780ec19 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,79 @@
+2010-05-14  Glenn Morris  <rgm@gnu.org>
+
+       * sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o.
+       (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL).
+       * sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o.
+
+       * sed2x.inp (HAVE_WINDOW_SYSTEM): Define.
+       * sed1x.inp (TOOLTIP_SUPPORT): Edit to ${lispsource}tooltip.elc.
+       (WINDOW_SUPPORT): Edit to $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT).
+       * sed1v2.inp (MOUSE_SUPPORT): Edit to $(REAL_MOUSE_SUPPORT).
+       (TOOLTIP_SUPPORT, WINDOW_SUPPORT): Edit to empty.
+
+       * sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype).
+
+       * sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil.
+
+2010-05-13  Glenn Morris  <rgm@gnu.org>
+
+       * sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a.
+       (LIBXMENU): Edit to ${OLDXMENU}.
+       (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}.
+
+       * sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
+       (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
+       (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
+       (GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM):
+       Edit to empty,
+       (LIB_MATH): Edit to -lm.
+       (UNEXEC_OBJ): Edit to unexec.o.
+
+2010-05-12  Glenn Morris  <rgm@gnu.org>
+
+       * sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@.
+
+       * sed1v2.inp (LIB_GCC): Edit to -Lgcc.
+
+2010-05-11  Glenn Morris  <rgm@gnu.org>
+
+       * sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
+       * sed3x.inp: New file.
+
+2010-05-10  Glenn Morris  <rgm@gnu.org>
+
+       * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty.
+
+       * sed3v2.inp (BLESSMAIL_TARGET): Edit to need-blessmail.
+
+2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Version 23.2 released.
+
+2010-05-08  Glenn Morris  <rgm@gnu.org>
+
+       * sed1v2.inp (LIBS_TERMCAP): Edit to empty.
+       (TERMCAP_OBJ): Edit to tparam.o.
+
+2010-05-07  Eli Zaretskii  <eliz@gnu.org>
+
+       Fix breakage due to autoconfiscation of Makefile.in files.
+
+       * sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
+
+       * sed1v2.inp (@LIB_MATH@): Edit to -lm.
+       (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
+       (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
+       (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
+       (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
+       (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
+       (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
+       (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
+       (XMENU_OBJ): Edit to xmenu.o.
+       (FONT_OBJ): Edit to value used for X on Unix.
+       (PRE_ALLOC_OBJ): Edit to lastfile.o.
+       (POST_ALLOC_OBJ): Edit to $(vmlimitobj).
+       (@unexec@): Edit to unexec.o.
+
 2010-05-06  Glenn Morris  <rgm@gnu.org>
 
        * sed1v2.inp, sed5x.inp: Remove LN_S, unused.