5 files changed, 124 insertions, 13 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index e906a8f4954..c52f73e640c 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,29 @@
+2004-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * sed1.inp: Revert last change.
+
+2004-11-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * sed1v2.inp: Use djecho for buildobj.lst.
+
+        * sed1.inp: Ditto.
+
+2004-11-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * sedlisp.inp (bootstrap-clean): Copy ldefs-boot.el onto
+        loaddefs.el, unless the latter exists and is newer.
+
+        * mainmake.v2 (mostlyclean, distclean, maintainer-clean)
+        (extraclean, bootfast): New targets.
+        (top_distclean): New macro, used by distclean, maintainer-clean,
+        and extraclean.
+        (.PHONY): Add bootfast.
+        (bootstrap): Make bootstrap-after in lisp.
+        (bootstrap-clean-before): Clean in man, lispref, and lispintro as
+        well.
+
+        * sed2v2.inp (HAVE_BZERO): Define for GCC v3.x and later.
+
 2004-10-06  Eli Zaretskii  <eliz@gnu.org>
 
         * sed1v2.inp (LC_ALL=C): Fix src/Makefile breakage caused by
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 0952380a202..f2291cf2989 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -21,7 +21,7 @@
 # Boston, MA 02111-1307, USA.
 
 # make all      to compile and build Emacs.
-# make install  to install it.
+# make install  to install it (installs in-place, in `bin' subdir of top dir).
 # make TAGS     to update tags tables.
 #
 # make clean  or  make mostlyclean
@@ -40,11 +40,12 @@
 #      `make distclean' should leave only the files that were in the
 #      distribution.
 #
-# make realclean
+# make maintainer-clean
 #      Delete everything from the current directory that can be
 #      reconstructed with this Makefile.  This typically includes
-#      everything deleted by distclean, plus more: C source files
-#      produced by Bison, tags tables, info files, and so on.
+#      everything deleted by distclean, plus more: *.elc files,
+#      C source files produced by Bison, tags tables, info files,
+#      and so on.
 #
 # make extraclean
 #      Still more severe - delete backup and autosave files, too.
@@ -135,22 +136,89 @@ TAGS tags:	lib-src FRC
 check:
         @echo "We don't have any tests for GNU Emacs yet."
 
-clean:
+clean mostlyclean:
         cd lib-src
-        $(MAKE) clean
+        $(MAKE) $(MFLAGS) $@
         cd ..
         cd src
-        $(MAKE) clean
+        $(MAKE) $(MFLAGS) $@
         cd ..
         cd oldxmenu
-        -$(MAKE) clean
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd man
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lispref
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lispintro
+        -$(MAKE) $(MFLAGS) $@
         cd ..
         cd leim
-        if exist Makefile redir $(MAKE) clean
+        if exist Makefile redir $(MAKE) $(MFLAGS) $@
         cd ..
+        -$(MAKE) $(MFLAGS) $@
 
-.PHONY: bootstrap bootstrap-lisp-1 boostrap-src bootstrap-lisp bootstrap-clean
-.PHONY: maybe_bootstrap
+top_distclean=rm -f Makefile */Makefile src/_gdbinit
+
+distclean maintainer-clean: FRC
+        cd src
+        $(MAKE) $(MFLAGS) $@
+        cd ..
+        cd oldxmenu
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lib-src
+        $(MAKE) $(MFLAGS) $@
+        cd ..
+        cd man
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lispref
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lispintro
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd leim
+        if exist Makefile redir $(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lisp
+        $(MAKE) $(MFLAGS) $@
+        cd ..
+        ${top_distclean}
+
+extraclean:
+        cd src
+        $(MAKE) $(MFLAGS) $@
+        cd ..
+        cd oldxmenu
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lib-src
+        $(MAKE) $(MFLAGS) $@
+        cd ..
+        cd man
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lispref
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lispintro
+        -$(MAKE) $(MFLAGS) $@
+        cd ..
+        cd leim
+        if exist Makefile redir $(MAKE) $(MFLAGS) $@
+        cd ..
+        cd lisp
+        $(MAKE) $(MFLAGS) $@
+        cd ..
+        ${top_distclean}
+        -rm -f *~ #*
+
+.PHONY: bootstrap bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean
+.PHONY: maybe_bootstrap bootfast
 
 maybe_bootstrap:
         @if not exist lisp\abbrev.elc djecho \
@@ -158,6 +226,10 @@ maybe_bootstrap:
         @if not exist lisp\abbrev.elc redir -e /dev/null -oe redir fail-this-make.exe
 
 bootstrap: bootstrap-clean-before bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean-after all info
+        cd lisp; $(MAKE) $(MFLAGS) bootstrap-after; cd ..
+
+bootfast: bootstrap-clean-before bootstrap-src bootstrap-lisp bootstrap-clean-after all info
+        cd lisp; $(MAKE) $(MFLAGS) bootstrap-after; cd ..
 
 bootstrap-lisp-1:
         cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean; cd ..
@@ -172,7 +244,10 @@ bootstrap-src:
 bootstrap-clean-before: FRC
         cd src;      $(MAKE) $(MFLAGS) mostlyclean; cd ..
         cd lib-src;  $(MAKE) $(MFLAGS) clean;       cd ..
-        cd leim;     $(MAKE) $(MFLAGS) clean;       cd ..
+        -cd man;     $(MAKE) $(MFLAGS) clean;       cd ..
+        -cd lispref; $(MAKE) $(MFLAGS) clean;       cd ..
+        -cd lispintro; $(MAKE) $(MFLAGS) clean;     cd ..
+        cd leim;     if exist Makefile redir $(MAKE) $(MFLAGS) clean; cd ..
 
 bootstrap-clean-after:
         cd src; $(MAKE) $(MFLAGS) mostlyclean; cd ..
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 8edc1616f23..93b4f7d5d89 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -58,6 +58,7 @@ s/bootstrap-doc/b-doc/
 /rm -f bootstrap-emacs/s/b-emacs/b-emacs b-emacs.exe/
 /^      els=/c\
         ${libsrc}make-docfile -o ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP:.elc=.el} ${shortlisp:.elc=.el} ${SOME_MACHINE_OBJECTS} ${obj}
+s/echo.*buildobj.lst/dj&/
 /^      mv -f emacs/a\
         stubify b-emacs\
         stubedit b-emacs.exe minstack=1024k\
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 4d77194cff0..31687bf0086 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -84,6 +84,14 @@ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
 #else\
 #undef HAVE_STDINT_H\
 #endif
+# GCC 3.x has a built-in bzero, which conflicts with the define at
+# the end of config.in
+/^#undef HAVE_BZERO/c\
+#if __GNUC__ >= 3\
+#define HAVE_BZERO 1\
+#else\
+#undef HAVE_BZERO\
+#endif
 
 # Comment out any remaining undef directives, because some of them
 # might be defined in sys/config.h we include at the top of config.h.
diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp
index 26ce2082399..9cff732a445 100644
--- a/msdos/sedlisp.inp
+++ b/msdos/sedlisp.inp
@@ -24,6 +24,7 @@ export FNCASE=y
 /^VPATH=/s|@srcdir@|.|
 /^srcdir=/s|@srcdir@|.|
 /^bootstrap-clean:/a\
-        command.com /c dtou .../*.el
+        command.com /c dtou .../*.el\
+        command.com /c update $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
 
 # arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e