diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 05:13:22 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-30 05:13:22 +0000 |
commit | 6539c7176328f8609284981d65bacc3def1b6111 (patch) | |
tree | 32115bbd57561981b8eba49c1b2669d39d6b6f15 | |
parent | 7414326681452f24bfe2ff5e276ebfd4b7386a35 (diff) | |
download | ruby-6539c7176328f8609284981d65bacc3def1b6111.tar.gz ruby-6539c7176328f8609284981d65bacc3def1b6111.tar.xz ruby-6539c7176328f8609284981d65bacc3def1b6111.zip |
* enc/depend: extract comile rules to each target for VC++.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | enc/depend | 15 |
2 files changed, 8 insertions, 11 deletions
@@ -1,3 +1,7 @@ +Fri Jan 30 14:11:48 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * enc/depend: extract comile rules to each target for VC++. + Fri Jan 30 12:59:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * cygwin/GNUmakefile.in (RUBYDEF): depends on makefiles. diff --git a/enc/depend b/enc/depend index 2d9c4ab78..f5aa76ef7 100644 --- a/enc/depend +++ b/enc/depend @@ -77,16 +77,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 "$@" "$<" @@ -122,7 +112,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 |