X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2f097256b95314f85f7c4ce5dfff9e41e1cfaeb3..refs/heads/wip:/msdos/sed1v2.inp diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index cdaf9430b2..77c74fe2f0 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-2014 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -41,24 +41,28 @@ s/\.h\.in/.h-in/ /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// -/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// +/^WARN_CFLAGS *=/s/@WARN_CFLAGS@// +/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// #/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@// /^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@// -/^LIBTIFF *=/s/@LIBTIFF@// -/^LIBJPEG *=/s/@LIBJPEG@// -/^LIBPNG *=/s/@LIBPNG@// -/^LIBGIF *=/s/@LIBGIF@// -/^LIBXPM *=/s/@LIBXPM@// +/^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@// /^FONTCONFIG_CFLAGS *=/s/@FONTCONFIG_CFLAGS@// /^FONTCONFIG_LIBS *=/s/@FONTCONFIG_LIBS@// @@ -71,8 +75,10 @@ s/\.h\.in/.h-in/ /^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@// +/^GFILENOTIFY_LIBS *=/s/@GFILENOTIFY_LIBS@// /^GTK_OBJ *=/s/@GTK_OBJ@// /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// /^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/ @@ -83,8 +89,10 @@ s/\.h\.in/.h-in/ /^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/@LIBS_GNUSTEP@// /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// /^RSVG_LIBS *=/s/@RSVG_LIBS@// /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// @@ -94,16 +102,17 @@ s/\.h\.in/.h-in/ /^LIBXML2_CFLAGS *=/s/@LIBXML2_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// +/^WINDOW_SYSTEM_OBJ *=/s/@WINDOW_SYSTEM_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ -/^ns_appdir *=/s/@ns_appdir@// -/^ns_appbindir *=/s/@ns_appbindir@// -/^ns_appsrc *=/s/@ns_appsrc@// /^NS_OBJ *=/s/@NS_OBJ@// /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^LIBRESOLV *=/s/@LIBRESOLV@// /^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 /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// @@ -112,12 +121,19 @@ s/\.h\.in/.h-in/ /^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)/ @@ -125,18 +141,29 @@ s/\.h\.in/.h-in/ /^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/ /^DEPFLAGS *=/s/@DEPFLAGS@// /^MKDEPDIR *=/s/@MKDEPDIR@// +/^W32_OBJ *=/s/@W32_OBJ@// +/^W32_LIBS *=/s/@W32_LIBS@// /^version *=/s/@[^@\n]*@// -/^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! -/^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h! +/^EMACSRES *=/s/@EMACSRES@// +/^EMACS_MANIFEST *=/s/@EMACS_MANIFEST@// +/^W32_RES_LINK *=/s/@W32_RES_LINK@// +/^CM_OBJ *=/s/@CM_OBJ@/cm.o/ /^@SET_MAKE@$/s/@SET_MAKE@// +/^TEMACS_POST_LINK *=/s/@TEMACS_POST_LINK@/stubedit temacs.exe minstack=1024k/ +/^ADDSECTION *=/s/@ADDSECTION@// /^ [ ]*\$(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-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)/ /^ 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 +/^ *\$(SETFATTR) -n/d +/^ -\{0,1\} *ln /s/bootstrap-emacs\$(EXEEXT).*$/bootstrap-emacs$(EXEEXT)/ /^ fi/d /^ *LC_ALL=C \$(RUN_TEMACS)/i\ stubedit temacs.exe minstack=1024k @@ -150,7 +177,17 @@ s/ @true *$/ @rem/ s/^ [^ ]*move-if-change / update / /^ echo[ ][ ]*timestamp/s/echo /djecho / /^ .*djecho timestamp/a\ - @rm -f gl-tmp + @rm -f gl.tmp +/^ cd ..\/leim && \$(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 ..\/leim && \$(MAKE)/c\ + $(MAKE) $(MFLAGS) -C ../leim leim-list.el EMACS=$(bootstrap_exe) +/^ cd ..\/admin\/unidata && \$(MAKE)/c\ + $(MAKE) $(MFLAGS) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" /^ cd \$(lib) && \$(MAKE)/c\ $(MAKE) $(MFLAGS) -C $(lib) libgnu.a /^RUN_TEMACS *=/s|`/bin/pwd`|.| @@ -161,7 +198,7 @@ s/^ [^ ]*move-if-change / update / /^ #/d /^ cd.*make-docfile/s!$!; cd ../src! /^ @: /d -/^ -\{0,1\} *ln -/s/ln -f/cp -pf/ +/^ -\{0,1\} *ln /s/ln /cp / /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ s/@lisp_frag@// @@ -185,6 +222,10 @@ s/echo.*buildobj.lst/dj&/ /^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| /^ *THEFILE=/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | +/^buildobj\.h:/,/^ mv /{ + /^ *for /,/^ *done /c\ + djecho "$(ALLOBJS)" | sed -e 's/^ */"/' -e 's/ *$$/"/' -e 's/ */", "/g' >>$@.tmp +} # Make the GCC command line fit one screen line /^[ ][ ]*\$(GNUSTEP_CFLAGS)/d /^[ ][ ]*\$(GCONF_CFLAGS)/d @@ -195,3 +236,4 @@ s/ \$(DBUS_CFLAGS)// s| -I\$(srcdir)/../lib|| # Add our local inttypes.h to prerequisites where needed /^lread\.o:/s|lread\.c|& ../msdos/inttypes.h| +/^ *test "X/d