yugui	2009-01-30 14:41:19 +0900 (Fri, 30 Jan 2009)

  New Revision: 21894

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

  Log:
    merges r21892 from trunk into ruby_1_9_1.
    * enc/depend: extract comile rules to each target for VC++.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/enc/depend

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21893)
+++ ruby_1_9_1/ChangeLog	(revision 21894)
@@ -1,3 +1,7 @@
+Fri Jan 30 14:11:48 2009  NAKAMURA Usaku  <usa@r...>
+
+	* enc/depend: extract comile rules to each target for VC++.
+
 Fri Jan 30 12:59:49 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* cygwin/GNUmakefile.in (RUBYDEF): depends on makefiles.
Index: ruby_1_9_1/enc/depend
===================================================================
--- ruby_1_9_1/enc/depend	(revision 21893)
+++ ruby_1_9_1/enc/depend	(revision 21894)
@@ -76,16 +76,6 @@
 
 srcs: $(TRANSCSRCS)
 
-% if rule = (compile_rules = COMPILE_RULES).find(&/\$\(srcdir\)/.method(:=~))
-%   compile_rules = [rule.sub(/\$\(srcdir\)/, '\&/enc'), rule.sub(/\$\(srcdir\)/, '\&/enc/trans')] + compile_rules
-% end
-% compile_rules.each do |rule|
-<%=  rule % %w[c $(OBJEXT)] %>
-	-@$(MAKEDIRS) "$(@D)"
-	<%=COMPILE_C%>
-
-% end
-
 <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
 	$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
 
@@ -121,7 +111,10 @@
 
 % end
 % dependencies.each do |e|
-<%=rule_subst % "enc/#{e}.$(OBJEXT)"%>: <%=rule_subst % "enc/#{e}.c"%>
+<%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
+	-@$(MAKEDIRS) "$(@D)"
+	<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
+
 % end
 
 enc/encdb.$(OBJEXT): encdb.h

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