nobu	2010-12-29 20:27:36 +0900 (Wed, 29 Dec 2010)

  New Revision: 30420

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

  Log:
    * win32/Makefile.sub (clean-enc): pass V to inferior make.

  Modified files:
    trunk/ChangeLog
    trunk/enc/Makefile.in
    trunk/enc/depend
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30419)
+++ ChangeLog	(revision 30420)
@@ -1,3 +1,7 @@
+Wed Dec 29 20:27:32 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/Makefile.sub (clean-enc): pass V to inferior make.
+
 Wed Dec 29 18:23:46 2010  NAKAMURA Usaku  <usa@r...>
 
 	* re.c (rb_reg_expr_str): need to escape if the coderange is invalid.
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 30419)
+++ enc/Makefile.in	(revision 30420)
@@ -63,10 +63,10 @@
 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
Index: enc/depend
===================================================================
--- enc/depend	(revision 30419)
+++ enc/depend	(revision 30420)
@@ -83,7 +83,7 @@
 
 <%=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 @@
 %   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 @@
 
 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%>
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 30419)
+++ win32/Makefile.sub	(revision 30420)
@@ -930,7 +930,7 @@
 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

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