From: Eli Zaretskii Date: Sat, 19 Feb 2011 19:41:00 +0000 (+0200) Subject: Finish fixing the MS-DOS build. Everything builds and works. X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/f601db19da67d24241f17ce15913458ea33599da Finish fixing the MS-DOS build. Everything builds and works. src/termcap.c (tputs): Don't declare baud_rate. msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o. msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS. (BUILT_EMACS): Rename from BUILT-EMACS. msdos/sed6.inp (MAKEINFO): Edit to "makeinfo". (ENVADD): Adjust to MAKEINFO_OPTS. (texinputdir): Don't edit. msdos/sed2v2.inp (my_strftime): Edit to nstrftime. msdos/sed1v2.inp (LIBOBJS): Edit to empty. ($(libsrc)/make-docfile): Two new edits, one each for every invocation of make-docfile. (move-if-change): Fix edit. Remove some unused switches from $(ALL_CFLAGS), to make the GCC command line shorter. --- diff --git a/msdos/ChangeLog b/msdos/ChangeLog index c6c6001397..bf80bff3eb 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,23 @@ 2011-02-19 Eli Zaretskii + * sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o. + + * sedleim.inp (RUN_EMACS): Rename from RUN-EMACS. + (BUILT_EMACS): Rename from BUILT-EMACS. + + * sed6.inp (MAKEINFO): Edit to "makeinfo". + (ENVADD): Adjust to MAKEINFO_OPTS. + (texinputdir): Don't edit. + + * sed2v2.inp (my_strftime): Edit to nstrftime. + + * sed1v2.inp (LIBOBJS): Edit to empty. + ($(libsrc)/make-docfile): Two new edits, one each for every + invocation of make-docfile. + (move-if-change): Fix edit. + Remove some unused switches from $(ALL_CFLAGS), to make the GCC + command line shorter. + * sed3v2.inp (-DVERSION): Edit out. (LOADLIBES): Don't edit to empty. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 49e45b5e0d..604e94082a 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -35,7 +35,7 @@ s/\.h\.in/.h-in/ /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g } -/^LIBOBJS *=/s/@[^@\n]*@/getloadavg.o/ +/^LIBOBJS *=/s/@[^@\n]*@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^C_SWITCH_X_SYSTEM *=/s/@C_SWITCH_X_SYSTEM@// @@ -131,7 +131,8 @@ s/\.h\.in/.h-in/ /^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! /^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// -/^.\$(libsrc)\/make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! +/^.\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o ../etc/DOC! +/^.\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! /^.\$(libsrc)\/make-doc/s!>.*$!! /^[ ]*$/d /^ if test -f/,/^ fi$/c\ @@ -147,7 +148,7 @@ s/\.h\.in/.h-in/ s/ || exit 1\; \\$// s/ || true\; \\$// s/ @true *$/ @rem/ -s/^ [^ ]*move-if-change /update / +s/^ [^ ]*move-if-change / update / /^ echo[ ][ ]*timestamp/s/echo /djecho / /^ cd \$(lib) && \$(MAKE)/c\ $(MAKE) $(MFLAGS) -C $(lib) libgnu.a @@ -182,4 +183,11 @@ s/echo.*buildobj.lst/dj&/ /^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| /^ *THEFILE=/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | - +# Make the GCC command line fit one screen line +/^[ ][ ]*\$(C_SWITCH_X_SYSTEM)/d +/^[ ][ ]*\$(GCONF_CFLAGS)/d +/^[ ][ ]*\$(LIBGNUTLS_CFLAGS)/d +s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) // +s/ \$(C_SWITCH_X_SITE)// +s/ \$(DBUS_CFLAGS)// +s| -I\$(srcdir)/../lib|| diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index d885bbc97e..470c1bf60a 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -64,6 +64,7 @@ /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/ /^#undef HAVE__BOOL/s/^.*$/#define HAVE__BOOL 1/ /^#undef inline/s/^.*$/#define inline __inline__/ +/^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/ /^#undef restrict/s/^.*$/#define restrict __restrict/ /^#undef GNU_MALLOC *$/s/^.*$/#define GNU_MALLOC 1/ diff --git a/msdos/sed6.inp b/msdos/sed6.inp index 2c5f027360..888b680a6c 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -18,13 +18,11 @@ # ---------------------------------------------------------------------- /^srcdir *=/s/@[^@\n]*@/./ /^VPATH *=/s/@[^@\n]*@/./ -/^ENVADD/c\ +/^MAKEINFO *=/s/@[^@\n]*@/makeinfo/ +/^ENVADD/,/^$/c\ ENVADD =\ export TEXINPUTS := $(srcdir)";"$(TEXINPUTS)\ -export MAKEINFO := $(MAKEINFO) -I$(srcdir) -/^texinputdir/c\ -texinputdir =\ -export texinputdir := $(srcdir)";"$(TEXINPUTS) +export MAKEINFO := $(MAKEINFO) $(MAKEINFO_OPTS) /^SHELL *=/s/^/# / /^elisp.dvi:/,/^$/ { /^ *if \[ *\a${permuted_index}/,/^ *fi *$/c\ diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index c2f7d84542..2d70695ebe 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -31,9 +31,9 @@ INSTALLDIR=. s|\([ ]\)echo|\1djecho|g /^ @true *$/d -/RUN-EMACS *=/,/^$/c\ +/RUN_EMACS *=/,/^$/c\ export EMACSLOADPATH=${buildlisppath}\ -RUN-EMACS = ${BUILT-EMACS} -batch --no-site-file +RUN_EMACS = ${BUILT_EMACS} -batch --no-site-file /^ cd ../c\ ${MAKE} -C ../src ${MFLAGS} emacs diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 3000a1e3fc..b85b20f149 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -262,7 +262,7 @@ am__cd = cd /^TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ /^UNISTD_H_HAVE_WINSOCK2_H *=/s/@[^@\n]*@/0/ /^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/ -/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o/ +/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o/ /^srcdir *=/s/@[^@\n]*@/./ /^top_srcdir *=/s/@[^@\n]*@/../ /^top_builddir *=/s/@[^@\n]*@/../ diff --git a/src/ChangeLog b/src/ChangeLog index 31e778043f..2b4d60f918 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-02-19 Eli Zaretskii + * termcap.c (tputs): Don't declare baud_rate. + * s/msdos.h (strtold): Define to _strtold. 2011-02-18 Stefan Monnier diff --git a/src/termcap.c b/src/termcap.c index 9e64d02764..69ce56d93b 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -268,7 +268,6 @@ tputs (register char *str, int nlines, register int (*outfun) (/* ??? */)) register int padcount = 0; register int speed; - extern EMACS_INT baud_rate; speed = baud_rate; /* For quite high speeds, convert to the smaller units to avoid overflow. */