From 023eab52018a87a63a465aa73d25a58162115663 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Nov 2010 09:38:38 +0000
Subject: * win32/Makefile.sub (MAKEDIRS): should not include silent flag.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           |  4 +++-
 common.mk           |  6 +++---
 enc/Makefile.in     |  2 +-
 enc/depend          |  4 ++--
 enc/make_encmake.rb |  2 +-
 win32/Makefile.sub  | 10 ++++++----
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a4bd786662..3d3d48d912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Wed Nov 17 18:22:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov 17 18:38:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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]
diff --git a/common.mk b/common.mk
index 0523981265..9846c55ee4 100644
--- a/common.mk
+++ b/common.mk
@@ -169,7 +169,7 @@ golf: $(LIBRUBY) $(GOLFOBJS) PHONY
 	$(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 @@ yes-test-ruby: PHONY
 	$(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 @@ utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
   {$(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
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 61a3dde7f1..a37541d000 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -63,7 +63,7 @@ MAKEDIRS = @MAKEDIRS@
 all: make-workdir
 
 make-workdir:
-	$(MAKEDIRS) $(WORKDIRS)
+	$(Q) $(MAKEDIRS) $(WORKDIRS)
 
 clean:
 
diff --git a/enc/depend b/enc/depend
index d82988c9c4..23f7bd2922 100644
--- a/enc/depend
+++ b/enc/depend
@@ -123,13 +123,13 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
 %     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"}%>
 
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index 107a387571..ed3680313f 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -9,7 +9,7 @@ if $".grep(/mkmf/).empty?
 end
 require 'erb'
 
-CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p'
+CONFIG["MAKEDIRS"] ||= '$(MINIRUBY) -run -e mkdir -- -p'
 
 BUILTIN_ENCS = []
 BUILTIN_TRANSES = []
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index bf48af09a7..ac0839fc51 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -268,7 +268,7 @@ XRUBY = $(RUNRUBY)
 !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 @@ $(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
 		$(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 @@ lex.c: {$(srcdir)}lex.c.blt
 
 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
 
-- 
cgit v1.2.3