From: Eli Zaretskii Date: Fri, 7 May 2010 12:57:24 +0000 (+0300) Subject: Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation. X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/9fdec8bc72cc00fa97d72d96e12276846a0ce2f6 Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation. src/Makefile.in: Don't use Make-style comments past the "start of cpp stuff" line. (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ). src/s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is edited directly by msdos/sed1v2.inp). msdos/sed3v2.inp (C_SWITCH_MACHINE): Edit to empty. msdos/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. --- diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 3d6cd8833d..5760c7bc58 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,23 @@ +2010-05-07 Eli Zaretskii + + 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 * sed1v2.inp, sed5x.inp: Remove LN_S, unused. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 84209f59dc..f9c2398c99 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -38,17 +38,53 @@ s/\.h\.in/.h-in/ /^CPPFLAGS *=/s/@[^@\n]*@// /^LDFLAGS *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// +s/@LIB_MATH@/-lm/ /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g } /^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/ -/^GETLOADAVG_LIBS *=/s/@[^@\n]*@// +/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// +/^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// +/^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// +/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// +/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// +/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// +/^LD_SWITCH_SYSTEM_EXTRA *=/s/@LD_SWITCH_SYSTEM_EXTRA@// +/^LIBTIFF *=/s/@LIBTIFF@// +/^LIBJPEG *=/s/@LIBJPEG@// +/^LIBPNG *=/s/@LIBPNG@// +/^LIBGIF *=/s/@LIBGIF@// +/^LIBXPM *=/s/@LIBXPM@// +/^XFT_LIBS *=/s/@XFT_LIBS@// +/^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@// +/^DBUS_LIBS *=/s/@DBUS_LIBS@// +/^DBUS_OBJ *=/s/@DBUS_OBJ@// +/^GCONF_CFLAGS *=/s/@GCONF_CFLAGS@// +/^GCONF_LIBS *=/s/@GCONF_LIBS@// +/^GTK_OBJ *=/s/@GTK_OBJ@// +/^LIBXMU *=/s/@LIBXMU@// +/^LIBXSM *=/s/@LIBXSM@// +/^LIBXTR6 *=/s/@LIBXTR6@// +/^XOBJ *=/s/@XOBJ@// +/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// +/^WIDGET_OBJ *=/s/@WIDGET_OBJ@// +/^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// +/^NS_OBJ *=/s/@NS_OBJ@// +/^NS_SUPPORT *=/s/@NS_SUPPORT@// +/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// +/^GETLOADAVG_LIBS *=/s/@[^@\n]*@// +/^START_FILES *=/s/@START_FILES@// /^OTHER_FILES *=/s/@OTHER_FILES@// +/^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ +/^FONT_OBJ *=/s/@FONT_OBJ@/xfont.o ftfont.o xftfont.o ftxfont.o/ /^EXEEXT *=/s/@EXEEXT@/.exe/ +/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ +/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ +s/@unexec@/unexec.o/g /^version *=/s/@[^@\n]*@// /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 5dcde810c8..0f489d8dac 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -36,6 +36,7 @@ /^LIBS_MAIL *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! +/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^LOADLIBES *=/s!=.*$!=! /^ALLOCA *=/s!@ALLOCA@!! /^EXEEXT *=/s!@EXEEXT@!! diff --git a/src/ChangeLog b/src/ChangeLog index b6847aa164..c2ba56b4e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,13 @@ 2010-05-07 Eli Zaretskii - * Makefile.in (PRE_ALLOC_OBJ): Don't use Make-style comments past - the "start of cpp stuff" line. + Fix the MS-DOS build, broken by autoconfiscation. + + * Makefile.in: Don't use Make-style comments past the "start of + cpp stuff" line. + (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ). + + * s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is + edited directly by msdos/sed1v2.inp). 2010-05-07 Glenn Morris diff --git a/src/Makefile.in b/src/Makefile.in index f6fcff659a..43a1cae02d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -240,8 +240,8 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< #ifdef HAVE_X_WINDOWS -/* This test needs to say in cpp for the time being, since s/ms-w32.h and - s/msdos.h define HAVE_MENUS, possibly overriding configure. */ +/* This test needs to say in cpp for the time being, since s/msdos.h + defines HAVE_MENUS, and does not use the configure script. */ #ifdef HAVE_MENUS OLDXMENU=@OLDXMENU@ LIBXMENU=@LIBXMENU@ @@ -321,9 +321,10 @@ LD=ld #ifdef MSDOS #ifdef HAVE_X_WINDOWS -MSDOS_OBJ = dosfns.o msdos.o xmenu.o +MSDOS_OBJ = dosfns.o msdos.o +#define LIBS_SYSTEM -lxext -lsys #else -MSDOS_OBJ = dosfns.o msdos.o w16select.o xmenu.o termcap.o +MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o #endif #endif diff --git a/src/s/msdos.h b/src/s/msdos.h index 8cd9bfc849..5199799a22 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -131,7 +131,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ /* We have (the code to control) a mouse. */ #define HAVE_MOUSE -/* We canuse mouse menus. */ +/* We can use mouse menus. */ #define HAVE_MENUS /* Define one of these for easier conditionals. */ @@ -163,7 +163,5 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #define NO_REMAP -#define UNEXEC unexec.o - /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0 (do not change this comment) */