[前][次][番号順一覧][スレッド一覧]

ruby-changes:10221

From: nobu <ko1@a...>
Date: Sun, 25 Jan 2009 11:24:07 +0900 (JST)
Subject: [ruby-changes:10221] Ruby:r21765 (trunk): * common.mk (clean-extout): removes extout directory.

nobu	2009-01-25 11:23:47 +0900 (Sun, 25 Jan 2009)

  New Revision: 21765

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21765

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

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21764)
+++ ChangeLog	(revision 21765)
@@ -1,4 +1,4 @@
-Sun Jan 25 11:07:51 2009  Nobuyoshi Nakada  <nobu@r...>
+Sun Jan 25 11:25:10 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and
 	  parents.
@@ -6,14 +6,13 @@
 	* 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.
Index: common.mk
===================================================================
--- common.mk	(revision 21764)
+++ common.mk	(revision 21765)
@@ -340,7 +340,7 @@
 clear-installed-list:
 	@exit > $(INSTALLED_LIST)
 
-clean: clean-ext clean-local clean-enc clean-golf clean-rdoc
+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
@@ -351,8 +351,10 @@
 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) rbconfig.rb yasmdata.rb encdb.h
 	@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
@@ -363,13 +365,16 @@
 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
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 21764)
+++ win32/Makefile.sub	(revision 21765)
@@ -712,6 +712,9 @@
 		@$(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
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 21764)
+++ Makefile.in	(revision 21765)
@@ -229,10 +229,6 @@
 distclean-rdoc:
 	@$(RMALL) $(RDOCOUT:/=\)
 
-distclean:
-	@-rmdir $(EXTOUT)/$(arch)
-	@-rmdir $(EXTOUT)
-
 clean-ext distclean-ext realclean-ext::
 	@set dummy ${EXTS}; shift; \
 	if test "$$#" = 0; then \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]