diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-05-07 15:57:24 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-05-07 15:57:24 +0300 |
| commit | 9fdec8bc72cc00fa97d72d96e12276846a0ce2f6 (patch) | |
| tree | cd91e1ba151aa1efb5bce6146e1aafaf521db66c /src | |
| parent | f724825e893b6649cb8ade08101205fe0faa363a (diff) | |
| download | emacs-9fdec8bc72cc00fa97d72d96e12276846a0ce2f6.tar.gz emacs-9fdec8bc72cc00fa97d72d96e12276846a0ce2f6.tar.bz2 emacs-9fdec8bc72cc00fa97d72d96e12276846a0ce2f6.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/Makefile.in | 9 | ||||
| -rw-r--r-- | src/s/msdos.h | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b6847aa164e..c2ba56b4e6f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,13 @@ 2010-05-07 Eli Zaretskii <eliz@gnu.org> - * 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 <rgm@gnu.org> diff --git a/src/Makefile.in b/src/Makefile.in index f6fcff659a6..43a1cae02dc 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 8cd9bfc8491..5199799a226 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) */ |