(clean-other-dirs-nmake): Don't clean lisp dir.

(clean-other-dirs-gmake): Likewise. Clean doc dirs.
(top-distclean, distclean, distclean-other-dirs-nmake)
(distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
(maintainer-clean-other-dirs-gmake, maintainer-clean): New targets.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 0c5e837c8947d2619436116cd2c5a57ab0c49f32..918be68fb0a19ec71f209fb79474afe6602db1cf 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-09  Jason Rumney  <jasonr@gnu.org>
+
+       * makefile.w32-in (clean-other-dirs-nmake): Don't clean lisp dir.
+       (clean-other-dirs-gmake): Likewise. Clean doc dirs.
+       (top-distclean, distclean, distclean-other-dirs-nmake)
+       (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
+       (maintainer-clean-other-dirs-gmake, maintainer-clean): New targets.
+
 2008-04-05  Eli Zaretskii  <eliz@gnu.org>
 
        * inc/sys/stat.h: New file.

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 2b498f9d4dfe2894188c689ba384cc3bc59018d3..ddf279cbdf74486888e5bfe285cdc7766b2482d5 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -269,8 +269,6 @@ clean-other-dirs-nmake:
        $(MAKE) $(MFLAGS) clean\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) clean\r
-       cd ..\lisp\r
-       $(MAKE) $(MFLAGS) clean\r
        cd ..\doc\lispintro\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\doc\lispref\r
@@ -286,8 +284,11 @@ clean-other-dirs-nmake:
 clean-other-dirs-gmake:\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean\r
-       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean\r
 \r
 cleanall-other-dirs-nmake:\r
        cd ..\lib-src\r
@@ -308,5 +309,77 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE)
         - $(DEL_TREE) oo\r
         - $(DEL_TREE) oo-spd\r
 \r
+top-distclean:\r
+       - $(DEL) $(COMPILER_TEMP_FILES)\r
+       - $(DEL_TREE) obj\r
+       - $(DEL_TREE) obj-spd\r
+       - $(DEL_TREE) oo\r
+       - $(DEL_TREE) oo-spd\r
+       - $(DEL) stamp_BLD\r
+       - $(DEL) ../etc/DOC ../etc/DOC-X\r
+       - $(DEL) config.log Makefile\r
+\r
+distclean: distclean-other-dirs-$(MAKETYPE) top-distclean\r
+\r
+distclean-other-dirs-nmake:\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\leim\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\emacs\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\misc\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\lispintro\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\doc\lispref\r
+       $(MAKE) $(MFLAGS) distclean\r
+       cd ..\nt\r
+\r
+distclean-other-dirs-gmake:\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean\r
+\r
+maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean\r
+\r
+maintainer-clean-other-dirs-nmake:\r
+       cd ..\lib-src\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\src\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\lisp\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\leim\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\emacs\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\misc\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\lispintro\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\doc\lispref\r
+       $(MAKE) $(MFLAGS) maintainer-clean\r
+       cd ..\nt\r
+\r
+maintainer-clean-other-dirs-gmake:\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean\r
+\r
 realclean: cleanall\r
        - $(DEL_TREE) ../bin\r