diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 05:41:19 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 05:41:19 +0000 |
commit | a5e61c952ea3595552401603793cf323cf0c0aa0 (patch) | |
tree | 0e884256b1df95202ce810e2231653da8ca78bd1 /enc | |
parent | 6d3b47c4e3fb040b92eef3624c7d6fd1f137fdab (diff) |
merges r21892 from trunk into ruby_1_9_1.
* enc/depend: extract comile rules to each target for VC++.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rw-r--r-- | enc/depend | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/enc/depend b/enc/depend index 0cc00336be..b3c8f01f0e 100644 --- a/enc/depend +++ b/enc/depend @@ -76,16 +76,6 @@ trans: $(TRANSSOS) 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 @@ $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%> % 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 |