From 1324b5a5213d75cba319ad20019dc7ccf3f64d89 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Jan 2009 09:23:03 +0000
Subject: merges r21764 and r21765 from trunk into ruby_1_9_1. * Makefile.in,
 win32/Makefile.sub (RMDIRS): remove directory and   parents.

* Makefile.in, win32/Makefile.sub (distclean-rdoc): added to remove
  temprary rdoc.

* Makefile.in, win32/Makefile.sub (distclean): removes extout
  directory.

* Makefile.in, win32/Makefile.sub (clean-ext): skips non-existent
  directories.

* common.mk (clean, distclean): cleans rdoc.

* common.mk (clean-extout): removes extout directory.

* configure.in (RMDIRS, RMALL): added to clean extout.

* lib/fileutils.rb (FileUtils#rmdir): added :parents option.

* lib/mkmf.rb (create_makefile): cleans installed files at clean
  instead of distclean.

* lib/mkmf.rb (create_makefile): added clean-so and clean-rb.

* lib/mkmf.rb (def init_mkmf): added DISTCLEANDIRS.

* lib/un.rb (rmdir): added -p option.

* tool/rmdirs, win32/rmdirs.bat: removes directory and the parents.

* win32/rm.bat: added -r option.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index a8ba539fe..9c4aeefdb 100644
--- a/common.mk
+++ b/common.mk
@@ -330,7 +330,7 @@ install-prereq: $(CLEAR_INSTALLED_LIST)
 clear-installed-list:
 	@exit > $(INSTALLED_LIST)
 
-clean: clean-ext clean-local clean-enc clean-golf
+clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
 clean-local::
 	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
@@ -340,10 +340,13 @@ clean-enc:
 	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) clean
 clean-golf:
 	@$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
+clean-rdoc:
+clean-extout:
+	@-$(RMDIRS) $(EXTOUT)/$(arch)
 
-distclean: distclean-ext distclean-local distclean-enc distclean-golf
+distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
 distclean-local:: clean-local
-	@$(RM) $(MKFILES) $(arch_hdrdir)/ruby/config.h rbconfig.rb yasmdata.rb encdb.h
+	@$(RM) $(MKFILES) rbconfig.rb yasmdata.rb encdb.h
 	@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
 	@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
 distclean-ext::
@@ -351,13 +354,17 @@ distclean-enc: clean-enc
 	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) distclean
 distclean-golf: clean-golf
 	@$(RM) $(GOLFPRELUDES)
+distclean-rdoc:
+distclean-extout: clean-extout
+	@-$(RMDIRS) $(EXTOUT)
 
-realclean:: realclean-ext realclean-local realclean-enc realclean-golf
+realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
 	@$(RM) parse.c parse.h lex.c newline.c revision.h
 realclean-ext::
 realclean-enc:: distclean-enc
 realclean-golf: distclean-golf
+realclean-extout: distclean-extout
 
 check: test test-all
 
-- 
cgit