From 0dfd81cb2397600ce92bd690f4c4f9152518b952 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 29 Dec 2010 11:27:36 +0000
Subject: * win32/Makefile.sub (clean-enc): pass V to inferior make.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  4 ++++
 enc/Makefile.in    |  4 ++--
 enc/depend         | 28 ++++++++++++++--------------
 win32/Makefile.sub |  2 +-
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2680393fb..e11101937a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 29 20:27:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (clean-enc): pass V to inferior make.
+
 Wed Dec 29 18:23:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* re.c (rb_reg_expr_str): need to escape if the coderange is invalid.
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 0894b26fb2..3dace9fde6 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -63,10 +63,10 @@ MAKEDIRS = @MAKEDIRS@
 all: make-workdir
 
 make-workdir:
-	$(Q) $(MAKEDIRS) $(WORKDIRS)
+	$(Q)$(MAKEDIRS) $(WORKDIRS)
 
 clean:
 
 distclean: clean
-	@$(RM) enc.mk
+	$(Q)$(RM) enc.mk
 realclean: distclean clean-srcs
diff --git a/enc/depend b/enc/depend
index e331d5b595..7285649016 100644
--- a/enc/depend
+++ b/enc/depend
@@ -83,7 +83,7 @@ srcs: $(TRANSCSRCS)
 
 <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
 	$(ECHO) generating table from $@
-	$(Q) $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
+	$(Q)$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
 
 % unless encs.empty? or trans.empty?
 
@@ -120,20 +120,20 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
 %   base = File.basename(e)
 %   cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
 %   if df
-	$(Q) echo> <%=df%> EXPORTS
-	$(Q) echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
+	$(Q)echo> <%=df%> EXPORTS
+	$(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
 %     cmd.sub!(/\$\(DEFFILE\)/) {df}
 %     cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
 %   end
-	$(Q) $(MAKEDIRS) "$(@D)"
-	$(Q) <%=cmd%>
+	$(Q)$(MAKEDIRS) "$(@D)"
+	$(Q)<%=cmd%>
 
 % end
 % dependencies.each do |e|
 <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
-	-$(Q) $(MAKEDIRS) "$(@D)"
+	-$(Q)$(MAKEDIRS) "$(@D)"
 	$(ECHO) compiling <%= "#{e}.c"%>
-	$(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
+	$(Q)<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
 
 % end
 
@@ -142,16 +142,16 @@ enc/trans/transdb.$(OBJEXT): transdb.h
 
 clean:
 % %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
-	@$(RM) <%=pathrep[clean]%>
+	$(Q)$(RM) <%=pathrep[clean]%>
 % end
 % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 % workdirs.reverse_each do|dir|
-	@-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
+	-$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
 % end
 
 clean-srcs:
-	@$(RM) <%=pathrep['$(TRANSCSRCS)']%>
-	@-$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
-	@$(RM) enc/unicode/name2ctype.h
-	@-$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
-	@-$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>
+	$(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
+	-$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
+	$(Q)$(RM) enc/unicode/name2ctype.h
+	-$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
+	-$(Q)$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 4e2a0697e4..31e1c837a6 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -930,7 +930,7 @@ clean-extout:
 clean-enc distclean-enc realclean-enc:
 !if exist($(ENC_MK))
 	@echo $(@:-enc=ing) encodings
-	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
+	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=)
 !endif
 
 $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
-- 
cgit v1.2.3