Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267

1 files changed, 87 insertions, 12 deletions

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 ..