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

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 9f434fe08e130cf662cee6097f7d9338014d272d..a403e148fff4913564e94c456db0e0d6004b360c 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,14 @@
 2004-11-08  Eli Zaretskii  <eliz@gnu.org>
 
+       * 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>

diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index 0952380a2024ee038e88d5790ae3e4a351b24e55..f2291cf29890ac60d4fa6132833a9d62abfa25ab 100644 (file)
--- 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 ..