Commit acddf8ae authored by Glenn Morris's avatar Glenn Morris

On msdos, set LIBS_SYSTEM with config.bat, not cpp.

* config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.

* src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
* src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.

* msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
* msdos/sed3x.inp: New file.

* lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
(config.h) [MSDOS]: Do not include.
parent 4e2af782
2010-05-11 Glenn Morris <rgm@gnu.org>
* config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
2010-05-10 Glenn Morris <rgm@gnu.org> 2010-05-10 Glenn Morris <rgm@gnu.org>
* configure.in (LIBS_SYSTEM): New output variable, replacing cpp. * configure.in (LIBS_SYSTEM): New output variable, replacing cpp.
......
...@@ -231,6 +231,11 @@ Goto libsrc2 ...@@ -231,6 +231,11 @@ Goto libsrc2
sed -f ../msdos/sed3v2.inp <makefile.new >Makefile sed -f ../msdos/sed3v2.inp <makefile.new >Makefile
:libsrc2 :libsrc2
rm -f makefile.new junk.c rm -f makefile.new junk.c
if "%X11%" == "" goto libsrc2a
mv Makefile makefile.tmp
sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile
rm -f makefile.tmp
:libsrc2a
if "%nodebug%" == "" goto libsrc3 if "%nodebug%" == "" goto libsrc3
sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp
sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile
......
2010-05-11 Glenn Morris <rgm@gnu.org>
* Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
(config.h) [MSDOS]: Do not include.
2010-05-10 Glenn Morris <rgm@gnu.org> 2010-05-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (LIBS_SYSTEM): Set with configure, not cpp. * Makefile.in (LIBS_SYSTEM): Set with configure, not cpp.
......
...@@ -167,11 +167,6 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src ...@@ -167,11 +167,6 @@ CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H -I. -I../src
# ========================== start of cpp stuff ======================= # ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */ /* From here on, comments must be done in C syntax. */
#ifdef MSDOS
#include "../src/config.h"
LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
#endif
LOADLIBES=$(LIBS_SYSTEM) LOADLIBES=$(LIBS_SYSTEM)
......
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> 2010-05-10 Glenn Morris <rgm@gnu.org>
* sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty. * sed1v2.inp, sed3v2.inp (LIBS_SYSTEM): Edit to empty.
......
...@@ -5,6 +5,7 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.! ...@@ -5,6 +5,7 @@ s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.!
s!^ @true *$! @rem! s!^ @true *$! @rem!
s/DOC/DOC-X/g s/DOC/DOC-X/g
#/^LIBXMENU *=/s!= *!= ../oldxmenu/! #/^LIBXMENU *=/s!= *!= ../oldxmenu/!
/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
/^temacs *:/s!OLDXMENU!LIBXMENU! /^temacs *:/s!OLDXMENU!LIBXMENU!
# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19 # arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19
# -sed3x.inp------------------------------------------------------------
# Extra configuration script for lib-src/makefile for DesqView/X
# ----------------------------------------------------------------------
/^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
2010-05-11 Glenn Morris <rgm@gnu.org>
* Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
* s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
2010-05-10 Eli Zaretskii <eliz@gnu.org> 2010-05-10 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (init_iterator): Don't turn on bidi reordering in * xdisp.c (init_iterator): Don't turn on bidi reordering in
......
...@@ -322,7 +322,6 @@ LD=ld ...@@ -322,7 +322,6 @@ LD=ld
#endif #endif
#ifdef MSDOS #ifdef MSDOS
LIBS_SYSTEM = MSDOS_LIBS_SYSTEM
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
MSDOS_OBJ = dosfns.o msdos.o MSDOS_OBJ = dosfns.o msdos.o
#else #else
......
...@@ -140,9 +140,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ ...@@ -140,9 +140,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
commentary below, in the non-X branch. The 140KB number was commentary below, in the non-X branch. The 140KB number was
measured on GNU/Linux and on MS-WIndows. */ measured on GNU/Linux and on MS-WIndows. */
#define SYSTEM_PURESIZE_EXTRA (-170000+140000) #define SYSTEM_PURESIZE_EXTRA (-170000+140000)
#define MSDOS_LIBS_SYSTEM -lxext -lsys
#else #else
#define MSDOS_LIBS_SYSTEM
/* We need a little extra space, see ../../lisp/loadup.el. /* We need a little extra space, see ../../lisp/loadup.el.
As of 20091024, DOS-specific files use up 62KB of pure space. But As of 20091024, DOS-specific files use up 62KB of pure space. But
overall, we end up wasting 130KB of pure space, because overall, we end up wasting 130KB of pure space, because
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment