msdos/inttypes.h: New file.
msdos/sed2v2.inp (HAVE_DECL_STRTOULL, HAVE_DECL_STRTOUMAX)
(HAVE_STRTOULL, HAVE_STRTOULL): Define to 1.
src/sedlibmk.inp (BUILT_SOURCES): Edit out inttypes.h.
src/sed1v2.inp (CPPFLAGS): Edit to "-I../msdos".
Add ../msdos/inttypes.h to prerequisites of lread.o.
src/dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
rather than `XVECTOR (FOO)->size'.
msdos/sedlibmk.inp (am_libgnu_a_OBJECTS): Edit out
allocator.$(OBJEXT). Add editing for the new GNULIB_* and
REPLACE_* variables.
src/msdos.c (XMenuActivate, XMenuAddSelection): Adjust argument list
to changes in oldXMenu/XMenu.h from 2011-04-16.
<menu_help_message, prev_menu_help_message>: Constify.
(IT_menu_make_room): menu->help_text is now `const char **';
adjust.
src/msdos.h (XMenuActivate, XMenuAddSelection): Adjust prototypes
to changes in oldXMenu/XMenu.h from 2011-04-16.
(struct XMenu): Declare `help_text' `const char **'.
src/xfaces.c <Qunspecified>: Make extern again.
src/syntax.c: Include sys/types.h before including regex.h, as
required by Posix.
msdos/sedlibmk.inp: Update checklist.
(am_libgnu_a_OBJECTS): Remove careadlinkat.$(OBJEXT).
($(top_builddir)/config.status): Edit away, both as target and in
prerequisites.
(@am__fastdepCC_FALSE@): Fix editing.
(@GL_GENERATE_STDBOOL_H_TRUE@, @GL_GENERATE_STDBOOL_H_FALSE@)
(@GL_GENERATE_STDDEF_H_TRUE@, @GL_GENERATE_STDDEF_H_FALSE@)
(@GL_GENERATE_STDINT_H_TRUE@, @GL_GENERATE_STDINT_H_FALSE@): Edit
to either nothing or "#".
src/msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements.
config.bat: Generate src/config.h and lib/Makefile from
autogen/config.in and autogen/Makefile.in.
msdos/sedlibmk.inp: Adapt to addition of the gnulib stdio module.
Add a description of what needs to be done when a new gnulib
module is added.
(MKDIR_P): Fix replacement command.
config.bat: Use autogen/config.in in one more place.
msdos/sedlibmk.inp (GNULIB_PRINTF, GNULIB_PRINTF_POSIX): Add missing
variables.
(MKDIR_P): Fix replacement command.
(NEXT_AS_FIRST_DIRECTIVE_STDIO_H, NEXT_STDIO_H): Edit to
"<stdio.h>", as lib/stdio.h cannot be left unused.
msdos/sedlibmk.inp: Adapt to addition of the gnulib stdio module.
config.bat: Generate src/config.h and lib/Makefile from
autogen/config.in and autogen/Makefile.in.
config.bat: Rename stdint.in.h and sys_stat.in.h. Call
depfiles.bat even if lib/deps already exist.
msdos/depfiles.bat: Create a dummy .Po file only if a file by the same
name does not already exist in the deps/ subdirectory.
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.
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.
src/unexcoff.c (make_hdr): Fix prototype according to changes in
2010-10-03T13:59:56Z!dann@ics.uci.edu.
msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed
because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.
* configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.
* lib-src/Makefile.in (PROFILING_LDFLAGS): Remove, not needed.
* msdos/sed1v2.inp (PROFILING_LDFLAGS):
* msdos/sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.
* src/Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
(PROFILING_LDFLAGS): Remove, not needed anymore.
msods/mainmake.v2 (version): Update due to change in emacs.c.
src/emacs.c <emacs_version>: Add a comment regarding msdos/mainmake.v2's
dependency on the syntax of this declaration.
msdos/sed1v2.inp (C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
Edit to empty.
msdos/sed3v2.inp(C_WARNINGS_SWITCH, PROFILING_CFLAGS, PROFILING_LDFLAGS):
Edit to empty.
src/process.c (setup_process_coding_systems): Move to the part
shared by non-subprocesses systems, and make its body empty when
subprocesses is not defined.
(close_process_descs): Move to the part shared by non-subprocesses
systems.
sed1v2.inp (stamp-oldxmenu): Don't edit out in `temacs:' target,
which doesn't exist.
sed2v2.inp (HAVE_MEMCPY): Don't edit, already defined on <sys/config.h>.
* configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC):
(USE_MMAP_FOR_BUFFERS, C_WARNING_SWITCH): Set with shell, not cpp.
(LIBX): Remove, just use -lX11 in the one place this was used.
(cannot_dump): Replace with CANNOT_DUMP.
* src/Makefile.in (CANNOT_DUMP): Update for configure name change.
* src/s/freebsd.h (USE_MMAP_FOR_BUFFERS):
* src/s/irix6-5.h (USE_MMAP_FOR_BUFFERS):
* src/s/darwin.h (SYSTEM_MALLOC):
* src/s/sol2-10.h (SYSTEM_MALLOC): Move to configure.
* src/m/alpha.h: Remove old comment.
* src/s/aix4-2.h: Update comment.
* src/s/template.h: Remove USE_MMAP_FOR_BUFFERS.
* msdos/sed1v2.inp (CANNOT_DUMP): Update for configure name change.
* admin/CPP-DEFINES: Remove USE_MMAP_FOR_BUFFERS, CANNOT_DUMP.
* etc/DEBUG: Update SYSTEM_MALLOC and CANNOT_DUMP references.
Some re-filling.
config.bat: Remove white space around "+" in COPY commands.
msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c
instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org).
msdos/sed1v2.inp (MKDEPDIR): Edit to empty.
Delete lines in rules that invoke $(MKDEPDIR).
Fix editing rules that begin with "cd ../lisp".
Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.
* src/m/hp800.h (HAVE_ALLOCA):
* src/m/ibms390x.h (HAVE_ALLOCA): Do not define, no longer needed.
* msdos/sed2v2.inp: Do not edit HAVE_ALLOCA.
* admin/CPP-DEFINES: Remove HAVE_ALLOCA.
* configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
(GNUSTEP_MAKEFILES): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
stuff to here.
* src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
Remove.
(TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
* msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
No longer present.
Comments:
See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html.
Nothing from gui.make was used at all in src/Makefile.in. The only
thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only
set shared _after_ sourcing base.make, it was always empty. We can
move the remaining flags, set in configure, to the standard variable
LD_SWITCH_SYSTEM_TEMACS.
* configure.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Put darwin stuff from LD_SWITCH_SYSTEM_EXTRA
here instead.
* src/Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.
* msdos/sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.