From: Eli Zaretskii Date: Sat, 19 Feb 2011 19:56:29 +0000 (+0200) Subject: Adapt and fix the MS-DOS port due to gnulib imports. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~802 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=615d868ee6add5d37db574d266f0d166c2f16bb8;p=emacs.git Adapt and fix the MS-DOS port due to gnulib imports. msdos/depfiles.bat: New file. msdos/sedlibmk.inp: New file. msdos/sedlibcf.inp: New file. 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/sed3v2.inp (-DVERSION): Edit out. (LOADLIBES): Don't edit to empty. msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME || BROKEN_MKTIME" stuff -- it's no longer in src/config.in. (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV) (HAVE__BOOL): Edit to 1. (VERSION, inline, restrict): Edit for DJGPP. (my_strftime): Edit to nstrftime. msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty. (@true): Edit to "@rem". (move-if-change): Edit to "update". (echo): Edit to "djecho". (cd $(lib) && ...): Edit to "$(MAKE) -C ...". (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. msdos/mainmake.v2 (version): Remove, no longer needed (config.in defines VERSION). (all): Add lib. (lib): New target and recipe. (lib-src): Depend on lib. (src): Depend on lib and lib-src. (clean, mostlyclean, distclean, maintainer-clean, extraclean) (bootstrap-clean): Recurse into lib. (lib, lib-src, src): Specify "all" as an explicit target. .bzrignore: Ignore cxxdefs.h and lib/*.in-h files. Add lib/deps/. config.bat: Configure in `lib'. Generate *.Po files in lib/deps. src/termcap.c (tputs): Don't declare baud_rate. src/s/msdos.h (strtold): Define to _strtold. --- 615d868ee6add5d37db574d266f0d166c2f16bb8 diff --cc msdos/ChangeLog index b9b829c4554,ed171c68b02..f1cdf510a06 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@@ -1,3 -1,65 +1,50 @@@ + 2011-02-19 Eli Zaretskii + - * sed1v2.inp: Delete gl-tmp after updating globals.h ++ * depfiles.bat: New file. + - * sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o. ++ * sedlibmk.inp: New file. ++ ++ * sedlibcf.inp: New file. + + * 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. + - * mainmake.v2 (lib, lib-src, src): Specify "all" as an explicit - target. - - * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean - rules. - (HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix - editing. - (DEFS): Edit to -DHAVE_CONFIG_H. - (Makefile, &&): Fix removal. - - * depfiles.bat: New file. - - * sedlibmk.inp: New file. - - * sedlibcf.inp: New file. ++ * sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME || ++ BROKEN_MKTIME" stuff -- it's no longer in src/config.in. ++ (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV) ++ (HAVE__BOOL): Edit to 1. ++ (VERSION, inline, restrict): Edit for DJGPP. ++ (my_strftime): Edit to nstrftime. + + * sed1v2.inp (NS_OBJC_OBJ): Edit to empty. + (@true): Edit to "@rem". + (move-if-change): Edit to "update". + (echo): Edit to "djecho". + (cd $(lib) && ...): Edit to "$(MAKE) -C ...". ++ (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. + + * mainmake.v2 (version): Remove, no longer needed (config.in + defines VERSION). + (all): Add lib. + (lib): New target and recipe. + (lib-src): Depend on lib. + (src): Depend on lib and lib-src. + (clean, mostlyclean, distclean, maintainer-clean, extraclean) + (bootstrap-clean): Recurse into lib. - - * sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME || - BROKEN_MKTIME" stuff -- it's no longer in src/config.in. - (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV) - (HAVE__BOOL): Edit to 1. - (VERSION, inline, restrict): Edit for DJGPP. ++ (lib, lib-src, src): Specify "all" as an explicit target. + 2011-01-08 Glenn Morris * sedleim.inp (RUN-EMACS): -batch implies --no-init-file.