diff options
| author | Eli Zaretskii | 2010-05-07 15:57:24 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-05-07 15:57:24 +0300 |
| commit | 9fdec8bc72cc00fa97d72d96e12276846a0ce2f6 (patch) | |
| tree | cd91e1ba151aa1efb5bce6146e1aafaf521db66c /src/s | |
| parent | f724825e893b6649cb8ade08101205fe0faa363a (diff) | |
| download | emacs-9fdec8bc72cc00fa97d72d96e12276846a0ce2f6.tar.gz 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/s')
| -rw-r--r-- | src/s/msdos.h | 4 |
1 files changed, 1 insertions, 3 deletions
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 */ | |||
| 131 | /* We have (the code to control) a mouse. */ | 131 | /* We have (the code to control) a mouse. */ |
| 132 | #define HAVE_MOUSE | 132 | #define HAVE_MOUSE |
| 133 | 133 | ||
| 134 | /* We canuse mouse menus. */ | 134 | /* We can use mouse menus. */ |
| 135 | #define HAVE_MENUS | 135 | #define HAVE_MENUS |
| 136 | 136 | ||
| 137 | /* Define one of these for easier conditionals. */ | 137 | /* Define one of these for easier conditionals. */ |
| @@ -163,7 +163,5 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 163 | 163 | ||
| 164 | #define NO_REMAP | 164 | #define NO_REMAP |
| 165 | 165 | ||
| 166 | #define UNEXEC unexec.o | ||
| 167 | |||
| 168 | /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0 | 166 | /* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0 |
| 169 | (do not change this comment) */ | 167 | (do not change this comment) */ |