nobu	2010-11-17 18:38:38 +0900 (Wed, 17 Nov 2010)

  New Revision: 29818

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

  Log:
    * win32/Makefile.sub (MAKEDIRS): should not include silent flag.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/enc/Makefile.in
    trunk/enc/depend
    trunk/enc/make_encmake.rb
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29817)
+++ ChangeLog	(revision 29818)
@@ -1,5 +1,7 @@
-Wed Nov 17 18:22:21 2010  Nobuyoshi Nakada  <nobu@r...>
+Wed Nov 17 18:38:35 2010  Nobuyoshi Nakada  <nobu@r...>
 
+	* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
+
 	* common.mk (ext/ripper/ripper.c, ext/json/parser/parser.c): pass
 	  Q and ECHO.  [ruby-core:33226]
 
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 29817)
+++ enc/Makefile.in	(revision 29818)
@@ -63,7 +63,7 @@
 all: make-workdir
 
 make-workdir:
-	$(MAKEDIRS) $(WORKDIRS)
+	$(Q) $(MAKEDIRS) $(WORKDIRS)
 
 clean:
 
Index: enc/make_encmake.rb
===================================================================
--- enc/make_encmake.rb	(revision 29817)
+++ enc/make_encmake.rb	(revision 29818)
@@ -9,7 +9,7 @@
 end
 require 'erb'
 
-CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p'
+CONFIG["MAKEDIRS"] ||= '$(MINIRUBY) -run -e mkdir -- -p'
 
 BUILTIN_ENCS = []
 BUILTIN_TRANSES = []
Index: enc/depend
===================================================================
--- enc/depend	(revision 29817)
+++ enc/depend	(revision 29818)
@@ -123,13 +123,13 @@
 %     cmd.sub!(/\$\(DEFFILE\)/) {df}
 %     cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
 %   end
-	@$(MAKEDIRS) "$(@D)"
+	$(Q) $(MAKEDIRS) "$(@D)"
 	$(Q) <%=cmd%>
 
 % end
 % dependencies.each do |e|
 <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
-	-@$(MAKEDIRS) "$(@D)"
+	-$(Q) $(MAKEDIRS) "$(@D)"
 	$(ECHO) compiling <%= "#{e}.c"%>
 	$(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
 
Index: common.mk
===================================================================
--- common.mk	(revision 29817)
+++ common.mk	(revision 29818)
@@ -169,7 +169,7 @@
 	$(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
 capi: $(CAPIOUT)/.timestamp PHONY
 doc/capi/.timestamp: Doxyfile $(PREP) 
-	@$(MAKEDIRS) doc/capi
+	$(Q) $(MAKEDIRS) doc/capi
 	$(ECHO) generating capi
 	$(Q) $(DOXYGEN) -b
 	$(Q) $(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}'
@@ -467,7 +467,7 @@
 	$(RUNRUBY) "$(srcdir)/test/runner.rb" ruby
 
 extconf: $(PREP)
-	$(MAKEDIRS) "$(EXTCONFDIR)"
+	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
 $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
@@ -712,7 +712,7 @@
   {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
 
 newline.c: $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
-	$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
+	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans
 newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \
   {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
   {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 29817)
+++ win32/Makefile.sub	(revision 29818)
@@ -268,7 +268,7 @@
 !ifndef RUBY
 RUBY = ruby
 !endif
-MAKEDIRS = @$(MINIRUBY) -run -e mkdir -- -p
+MAKEDIRS = $(MINIRUBY) -run -e mkdir -- -p
 
 !if !defined(STACK)
 !if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
@@ -837,11 +837,12 @@
 		$(Q) $(LDSHARED_2)
 
 $(RUBYDEF):	$(LIBRUBY_A) $(PREP)
-		$(MINIRUBY) $(srcdir)/win32/mkexports.rb \
+		$(ECHO) generating $@
+		$(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb \
 		  -output=$@ -arch=$(ARCH) $(LIBRUBY_A)
 
 {$(win_srcdir)}.def.lib:
-		$(AR) $(ARFLAGS)$@ -def:$<
+		$(Q) $(AR) $(ARFLAGS)$@ -def:$<
 
 clean-local::
 		@$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib
@@ -974,7 +975,8 @@
 
 enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt
 	@if not exist $(@D:/=\) md $(@D:/=\)
-	copy $(?:/=\) $(@:/=\)
+	$(ECHO) copying $@
+	$(Q) copy $(?:/=\) $(@:/=\) > nul
 
 $(OBJS): {$(hdrdir)/ruby}win32.h
 

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