X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c5bc2d1d0558bbaa29ef04f9bd7bef50146382ab..1650d7102ae8ea943e4197b7d91198640f0e0ff6:/msdos/sed1v2.inp diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 0ee7510bec..d0ab8afa21 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -2,7 +2,7 @@ # Configuration script for src/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1996-1997, 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2016 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -15,32 +15,24 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # ---------------------------------------------------------------------- -s/^#.*// s/^[ \f\t][ \f\t]*$// s/^ / / s/\.h\.in/.h-in/ -/^MAKE *=/s/^/# / /^SHELL *=/s/^/# / /^srcdir *=/s/@[^@\n]*@/./ -/^abs_builddir *=/s|@abs_builddir@|../src| -/^VPATH *=/s/@[^@\n]*@/./ -/^CC *=/s/@[^@\n]*@/gcc/ -/^CPP *=/s/@[^@\n]*@/gcc -e/ +/^top_srcdir *=/s/@[^@\n]*@/../ +/^CC *=/s/@[^@\n]*@/gcc -std=gnu99/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -gcoff/ /^ALL_CFLAGS *=/s/@[^@\n]*@//g /^ALL_CFLAGS *=/s/ -I\.//g /^CPPFLAGS *=/s|@[^@\n]*@|-I../msdos| /^LDFLAGS *=/s/@[^@\n]*@// -/^LD_FIRSTFLAG *=/s/@[^@\n]*@// -/^LIBS *=/s/@[^@\n]*@// -/^LIBES *=/,/^ *$/ { - s/@[^@\n]*@//g -} /^LIBOBJS *=/s/@[^@\n]*@// /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// +/^PNG_CFLAGS *=/s/@PNG_CFLAGS@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// @@ -48,19 +40,23 @@ s/\.h\.in/.h-in/ /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// +/^LD_SWITCH_X_SITE_RPATH *=/s/@LD_SWITCH_X_SITE_RPATH@// /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// -/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/ /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// /^LIB_GCC *=/s/@LIB_GCC@// /^LIB_STANDARD *=/s/@LIB_STANDARD@// /^LIB_MATH *=/s/@LIB_MATH@/-lm/ /^LIB_PTHREAD *=/s/@LIB_PTHREAD@// +/^LIB_ACL *=/s/@LIB_ACL@// +/^LIB_EACCESS *=/s/@LIB_EACCESS@// +/^LIB_FDATASYNC *=/s/@LIB_FDATASYNC@// s/ *@LIBTIFF@// s/ *@LIBJPEG@// s/ *@LIBPNG@// s/ *@LIBGIF@// s/ *@LIBXPM@// /^XFT_LIBS *=/s/@XFT_LIBS@// +/^XCB_LIBS *=/s/@XCB_LIBS@// /^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@// /^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@// /^FREETYPE_CFLAGS *=/s/@FREETYPE_CFLAGS@// @@ -72,8 +68,11 @@ s/ *@LIBXPM@// /^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@// /^DBUS_LIBS *=/s/@DBUS_LIBS@// /^DBUS_OBJ *=/s/@DBUS_OBJ@// +/^NOTIFY_OBJ *=/s/@NOTIFY_OBJ@// /^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@// /^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@// +/^NOTIFY_LIBS *=/s/@NOTIFY_LIBS@// +/^NOTIFY_CFLAGS *=/s/@NOTIFY_CFLAGS@// /^GTK_OBJ *=/s/@GTK_OBJ@// /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// /^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/ @@ -84,8 +83,10 @@ s/ *@LIBXPM@// /^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@// /^OLDXMENU_DEPS *=/s/@OLDXMENU_DEPS@// /^XOBJ *=/s/@XOBJ@// +/^XGSELOBJ *=/s/@XGSELOBJ@// /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// +/^LIBS_GNUSTEP *=/s/=.*$/=/ /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// @@ -94,15 +95,23 @@ s/ *@LIBXPM@// /^LIBXML2_LIBS *=/s/@LIBXML2_LIBS@// /^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// +/^XWIDGETS_OBJ *=/s/@XWIDGETS_OBJ@// +/^WEBKIT_LIBS *=/s/@WEBKIT_LIBS@// +/^WEBKIT_CFLAGS *=/s/@WEBKIT_CFLAGS@// +/^CAIRO_LIBS *=/s/@CAIRO_LIBS@// +/^CAIRO_CFLAGS *=/s/@CAIRO_CFLAGS@// +/^XFIXES_LIBS *=/s/@XFIXES_LIBS@// +/^XFIXES_CFLAGS *=/s/@XFIXES_CFLAGS@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ /^NS_OBJ *=/s/@NS_OBJ@// /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// -/^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// +/^GNU_OBJC_CFLAGS*=/s/=.*$/=/ /^LIBRESOLV *=/s/@LIBRESOLV@// +/^LIBMODULES *=/s/@LIBMODULES@// +/^MODULES_OBJ *=/s/@MODULES_OBJ@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// -/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g /^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^LIB_EXECINFO *=/s/@[^@\n]*@//g @@ -114,12 +123,19 @@ s/ *@LIBXPM@// /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ /^FONT_OBJ *=/s/@FONT_OBJ@// /^LIBGPM *=/s/@LIBGPM@// +/^LIBZ *=/s/@LIBZ@// /^EXEEXT *=/s/@EXEEXT@/.exe/ +/^MKDIR_P *=/s/@MKDIR_P@/gmkdir -p/ /^OLDXMENU *=/s/@OLDXMENU@/nothing/ /^LIBXMENU *=/s/@LIBXMENU@// /^LIBX_OTHER *=/s/@LIBX_OTHER@// +/^XRANDR_LIBS *=/s/@XRANDR_LIBS@// +/^XRANDR_CFLAGS *=/s/@XRANDR_CFLAGS@// +/^XINERAMA_LIBS *=/s/@XINERAMA_LIBS@// +/^XINERAMA_CFLAGS *=/s/@XINERAMA_CFLAGS@// /^GMALLOC_OBJ *=/s/@GMALLOC_OBJ@/gmalloc.o/ /^VMLIMIT_OBJ *=/s/@VMLIMIT_OBJ@/vm-limit.o/ +/^FIRSTFILE_OBJ *=/s/@FIRSTFILE_OBJ@// /^RALLOC_OBJ *=/s/@RALLOC_OBJ@/ralloc.o/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ @@ -130,57 +146,62 @@ s/ *@LIBXPM@// /^W32_OBJ *=/s/@W32_OBJ@// /^W32_LIBS *=/s/@W32_LIBS@// /^version *=/s/@[^@\n]*@// +/^EMACSRES *=/s/@EMACSRES@// +/^W32_RES_LINK *=/s/@W32_RES_LINK@// +/^CM_OBJ *=/s/@CM_OBJ@/cm.o/ /^@SET_MAKE@$/s/@SET_MAKE@// -/^ [ ]*\$(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!>.*$!! -/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp); cd ../src! -/^[ ]*$/d -/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/temacs$(EXEEXT) $(BOOTSTRAPEMACS)/ +/^ADDSECTION *=/s/@ADDSECTION@// +/^AM_DEFAULT_VERBOSITY *=/s/@AM_DEFAULT_VERBOSITY@/1/ +/^[Aa][Mm]_/s/@AM_V@/$(V)/ +/^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/ +/^AUTO_DEPEND *=/s/@AUTO_DEPEND@/yes/ +/^PAXCTL_dumped *=/s/=.*$/=/ +/^PAXCTL_notdumped *=/s/=.*$/=/ +/^lisp\.mk:/,/^$/c\ +lisp.mk: $(lispsource)/loadup.el\ + @rm -f $@\ + ${AM_V_GEN}printf 'shortlisp = \\n' > $@\ + ${AM_V_GEN}sed -n 's/^[ \t]*(load "\([^"]*\)".*/\1/p' $< | sed -e "s/$/.elc \/" -e "s/\.el\.elc/.el/" >> $@\ + ${AM_V_GEN}djecho "" >> $@ + +#" + +/^ [ ]*\$(AM_V_at)\$(libsrc)\/make-docfile -d/s!make-docfile!make-docfile -o $(etc)/DOC! +/ > \$(etc)\/DOC *$/s/ >.*$// +/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-docfile.*>.*globals.tmp/s!make-docfile!make-docfile -o globals.tmp! +/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-doc/s!>.*$!! +/^\$(libsrc)\/make-docfile\$(EXEEXT): /i\ + cd ../src +/^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/b-emacs$(EXEEXT)/ /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit -/^ *test "X\$(PAXCTL)" = X/d -/^ *test "\$(CANNOT_DUMP)" = "yes"/d -/^ if test "\$(CANNOT_DUMP)" =/,/^ else /d -/^ -\{0,1\} *ln /s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/ +/^ *ifneq (\$(PAXCTL_notdumped),)/,/^ *endif/d +/^ *ifneq (\$(PAXCTL_dumped),)/,/^ *endif/d +/^ *ln /s/ln /cp / +/^ *\$(SETFATTR_if_present) -n/d /^ fi/d +/^ *\$(RUN_TEMACS) /i\ + stubedit temacs.exe minstack=1024k /^ *LC_ALL=C \$(RUN_TEMACS)/i\ stubedit temacs.exe minstack=1024k /^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ /-batch -l loadup/a\ stubify emacs\ - stubedit emacs.exe minstack=2048k -s/ || exit 1\; \\$// -s/ || true\; \\$// + stubedit emacs.exe minstack=3072k s/ @true *$/ @rem/ s/^ [^ ]*move-if-change / update / -/^ echo[ ][ ]*timestamp/s/echo /djecho / +/^ [^ ]*echo[ ][ ]*timestamp/s/echo /djecho / /^ .*djecho timestamp/a\ - @rm -f gl-tmp -/^ cd \$(leimdir) && \$(MAKE)/i\ - $(RUN_TEMACS) -batch -l loadup dump\ - stubify emacs\ - stubedit emacs.exe minstack=2048k\ - rm -f b-emacs$(EXEEXT)\ - cp emacs$(EXEEXT) b-emacs$(EXEEXT) -/^ cd \$(leimdir) && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C $(leimdir) leim-list.el EMACS=$(bootstrap_exe) -/^ cd \$(lib) && \$(MAKE)/c\ - $(MAKE) $(MFLAGS) -C $(lib) libgnu.a -/^RUN_TEMACS *=/s|`/bin/pwd`|.| + @rm -f globals.tmp /^ *@\$(MKDEPDIR) *$/d /^ mv \.\/\.gdbinit/d /^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit /^ #/d -/^ cd.*make-docfile/s!$!; cd ../src! /^ @: /d /^ -\{0,1\} *ln /s/ln /cp / /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ -s/@lisp_frag@// -s/@deps_frag@// -s/@ns_frag@// s/@PRE_EDIT_LDFLAGS@// s/@POST_EDIT_LDFLAGS@// s/bootstrap-emacs/b-emacs/ @@ -188,17 +209,24 @@ s/bootstrap-temacs/b-temacs/ s/bootstrap-doc/b-doc/ /rm -f bootstrap-emacs/s/b-emacs/b-emacs b-emacs.exe/ s/echo.*buildobj.lst/dj&/ -/ --load loadup bootstrap/i\ - stubedit temacs.exe minstack=1024k / --load loadup bootstrap/a\ stubify emacs /^ mv -f emacs/a\ stubedit b-emacs.exe minstack=3072k\ djecho bootlisp > bootlisp /^ -\{0,1\}rm -f/s/\\#/#/ -/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| -/^ *THEFILE=/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | +/^buildobj\.h:/,/^ *\$(AM_V_at)mv /{ + /^ *\$(AM_V_GEN)for /,/^ *done /c\ + djecho "$(ALLOBJS)" | sed -e 's/^ */"/' -e 's/ *$$/"/' -e 's/ */", "/g' >>$@.tmp +} +# Remove or replace dependencies we cannot have +/^\.PRECIOUS: /s!\.\./config.status !! +/^\.\.\/config.status: /d +/^Makefile: /s!\.\./config.status !! +/^\$(top_srcdir)\/aclocal\.m4 /,/^doc\.o:/c\ +\ +doc.o: buildobj.h # Make the GCC command line fit one screen line /^[ ][ ]*\$(GNUSTEP_CFLAGS)/d /^[ ][ ]*\$(GCONF_CFLAGS)/d @@ -206,7 +234,13 @@ s/echo.*buildobj.lst/dj&/ s/\$(LIBOTF_CFLAGS) \$(M17N_FLT_CFLAGS) \$(DEPFLAGS) // s/ \$(C_SWITCH_X_SITE)// s/ \$(DBUS_CFLAGS)// -s| -I\$(srcdir)/../lib|| +s/ \$(PNG_CFLAGS) // +s/ \$(XINERAMA_CFLAGS)// +s/ \$(XFIXES_CFLAGS)// +s/ \$(FREETYPE_CFLAGS)// +s/ \$(FONTCONFIG_CFLAGS)// +s| -I\$(srcdir)/\.\./lib|| +s| -I\$(top_srcdir)/lib|| # Add our local inttypes.h to prerequisites where needed /^lread\.o:/s|lread\.c|& ../msdos/inttypes.h| /^ *test "X/d