summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-30 11:21:54 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-30 11:21:54 +0000
commit962b75384e4b6b388806fa3ff8d4381a2329ccb4 (patch)
treee83366a90f792362b9670ce2142312bcc168b2de
parent78f6130528002fc63dcaa9260f0f7e6727e42a29 (diff)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/Makefile.sub22
2 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c5ac02579..aead2e1d93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 30 20:18:32 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * win32/Makefile.sub: ditto.
+
Thu Dec 30 20:57:09 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* Makefile.in: Check V=1 argument if run "make clean" or similar.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 31e1c837a6..76897902c3 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -890,20 +890,20 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(Q) $(AR) $(ARFLAGS)$@ -def:$<
clean-local::
- @$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib
- @$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
- @$(RM) miniruby.rc $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
- @$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
+ $(Q)$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib
+ $(Q)$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
+ $(Q)$(RM) miniruby.rc $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+ $(Q)$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
distclean-local::
- @$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
- @-$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h
- @-$(RMDIRS) $(arch_hdrdir:/=\)\ruby
+ $(Q)$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
+ -$(Q)$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h
+ -$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby
clean-rdoc distclean-rdoc realclean-rdoc:
- @-$(RMALL) $(RDOCOUT:/=\)
+ -$(Q)$(RMALL) $(RDOCOUT:/=\)
clean-capi distclean-capi realclean-capi:
- @-$(RMALL) $(CAPIOUT:/=\)
+ -$(Q)$(RMALL) $(CAPIOUT:/=\)
clean-ext distclean-ext realclean-ext::
!if "$(EXTS)" != ""
@@ -920,11 +920,11 @@ clean-ext distclean-ext realclean-ext::
) )
distclean-ext realclean-ext::
- @-rmdir ext
+ -$(Q)rmdir ext
clean-extout:
!if exist($(EXTOUT)/.)
- @-$(RMDIRS) $(EXTOUT)
+ -$(Q)$(RMDIRS) $(EXTOUT)
!endif
clean-enc distclean-enc realclean-enc: