summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2008-04-09 16:32:08 +0000
committerJason Rumney <jasonr@gnu.org>2008-04-09 16:32:08 +0000
commitcc48598c5a98a9e2a67810c6ca04113adbec2290 (patch)
tree5f4da7447b867e703c547176f86d66c5b2b901da /nt
parent3dc94c3075a2a08cc7bb697efb4de1fe0e7aa387 (diff)
downloademacs-cc48598c5a98a9e2a67810c6ca04113adbec2290.tar.gz
(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.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog8
-rw-r--r--nt/makefile.w32-in79
2 files changed, 84 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 0c5e837c894..918be68fb0a 100644
--- 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 2b498f9d4df..ddf279cbdf7 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -269,8 +269,6 @@ clean-other-dirs-nmake:
$(MAKE) $(MFLAGS) clean
cd ..\src
$(MAKE) $(MFLAGS) clean
- cd ..\lisp
- $(MAKE) $(MFLAGS) clean
cd ..\doc\lispintro
$(MAKE) $(MFLAGS) clean
cd ..\doc\lispref
@@ -286,8 +284,11 @@ clean-other-dirs-nmake:
clean-other-dirs-gmake:
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
- $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean
cleanall-other-dirs-nmake:
cd ..\lib-src
@@ -308,5 +309,77 @@ cleanall: clean cleanall-other-dirs-$(MAKETYPE)
- $(DEL_TREE) oo
- $(DEL_TREE) oo-spd
+top-distclean:
+ - $(DEL) $(COMPILER_TEMP_FILES)
+ - $(DEL_TREE) obj
+ - $(DEL_TREE) obj-spd
+ - $(DEL_TREE) oo
+ - $(DEL_TREE) oo-spd
+ - $(DEL) stamp_BLD
+ - $(DEL) ../etc/DOC ../etc/DOC-X
+ - $(DEL) config.log Makefile
+
+distclean: distclean-other-dirs-$(MAKETYPE) top-distclean
+
+distclean-other-dirs-nmake:
+ cd ..\lib-src
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\src
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\lisp
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\leim
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\doc\emacs
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\doc\misc
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\doc\lispintro
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\doc\lispref
+ $(MAKE) $(MFLAGS) distclean
+ cd ..\nt
+
+distclean-other-dirs-gmake:
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean
+
+maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean
+
+maintainer-clean-other-dirs-nmake:
+ cd ..\lib-src
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\src
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\lisp
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\leim
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\doc\emacs
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\doc\misc
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\doc\lispintro
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\doc\lispref
+ $(MAKE) $(MFLAGS) maintainer-clean
+ cd ..\nt
+
+maintainer-clean-other-dirs-gmake:
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean
+
realclean: cleanall
- $(DEL_TREE) ../bin