diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 21:41:00 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-02-19 21:41:00 +0200 |
| commit | f601db19da67d24241f17ce15913458ea33599da (patch) | |
| tree | 907d10c7bd9e5328805f8ed412aede0c6a725c02 /msdos/sed1v2.inp | |
| parent | 534e4e80e65e84f3f30567ba1b5727c79158f211 (diff) | |
| download | emacs-f601db19da67d24241f17ce15913458ea33599da.tar.gz | |
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.
Diffstat (limited to 'msdos/sed1v2.inp')
| -rw-r--r-- | msdos/sed1v2.inp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 49e45b5e0d8..604e94082a8 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|| |