From d56e4b1b027e15c053407ecd75743ace00a681ae Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Jan 2009 02:03:54 +0000
Subject: * common.mk (distclean-enc, realclean-enc): do not call clean of  
 enc.mk twice or more.

* enc/depend (cleanobjs): added deffile.

* lib/mkmf.rb (create_makefile): removes deffile at clean instead
  of distclean.

* win32/Makefile.sub (miniruby, LIBRUBY_SO): removes lib and exp
  files.

* win32/Makefile.sub (clean, distclean): have moved to common.mk.

* win32/rmdirs.bat: omits `not empty' message.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 9 ++-------
 win32/rmdirs.bat   | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index b3862c47c..ce3bbff0d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -661,6 +661,7 @@ miniruby: miniruby$(EXEEXT)
 miniruby$(EXEEXT):
 		@echo. $(LIBS)
 		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ $(LDFLAGS)
+		@$(RM) miniruby.lib miniruby.exp
 		miniruby.exe -v
 		$(LDSHARED_1)
 		$(LDSHARED_2)
@@ -696,6 +697,7 @@ $(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
 		$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
 			$(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \
 			$(LIBRUBY_DLDFLAGS)
+		@$(RM) dummy.lib dummy.exp
 		$(LDSHARED_0)
 		$(LDSHARED_1)
 		$(LDSHARED_2)
@@ -712,9 +714,6 @@ clean-local::
 		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
 		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
 
-clean:
-		@-rmdir $(EXTOUT:/=\)\$(arch)
-
 distclean-local::
 		@$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
 		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
@@ -724,10 +723,6 @@ distclean-local::
 distclean-rdoc:
 		@-$(RMALL) $(RDOCOUT:/=\)
 
-distclean:
-		@-rmdir $(EXTOUT:/=\)\$(arch)
-		@-rmdir $(EXTOUT:/=\)
-
 clean-ext distclean-ext realclean-ext::
 !if "$(EXTS)" != ""
 		@for %I in ($(EXTS)) \
diff --git a/win32/rmdirs.bat b/win32/rmdirs.bat
index a8549cc12..829e93d91 100755
--- a/win32/rmdirs.bat
+++ b/win32/rmdirs.bat
@@ -10,7 +10,7 @@ if "%1" == "" goto :end
         if not exist "%dir%\." goto :begin
         if "%dir%" == "." goto :begin
         if "%dir%" == ".." goto :begin
-        rd "%dir%" || goto :begin
+        rd "%dir%" 2> nul || goto :begin
         :trim_sep
             if not /%dir:~-1%/ == /\/ goto :trim_base
             set dir=%dir:~0,-1%
-- 
cgit