kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file. 

fixed: [ruby-dev:26294]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-06-07 09:30:35 +00:00
parent 15dfe8eee6
commit f36783751b
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jun 7 18:30:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
fixed: [ruby-dev:26294]
Tue Jun 7 17:20:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): allow ';;' to be block terminator in
@ -45,7 +50,7 @@ Sat Jun 4 14:55:18 2005 Tanaka Akira <akr@m17n.org>
* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
* test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
modification to use test/unit.

11
lib/mkmf.rb
View File

@ -1110,11 +1110,13 @@ site-install-rb: install-rb
depend = File.join(srcdir, "depend")
if File.exist?(depend)
suffixes = []
depout = []
open(depend, "r") do |dfile|
mfile.printf "###\n"
cont = implicit = nil
impconv = proc do
COMPILE_RULES.each {|rule| mfile.print(rule % implicit[0], implicit[1])}
COMPILE_RULES.each {|rule| depout << (rule % implicit[0]) << implicit[1]}
implicit = nil
end
ruleconv = proc do |line|
@ -1127,12 +1129,13 @@ site-install-rb: install-rb
end
end
if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
suffixes << m[1] << m[2]
implicit = [[m[1], m[2]], [m.post_match]]
next
elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line
line.gsub!(%r"(?<=\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {|*m| RULE_SUBST % m}
end
mfile.print line
depout << line
end
while line = dfile.gets()
line.gsub!(/\.o\b/, ".#{$OBJEXT}")
@ -1152,6 +1155,10 @@ site-install-rb: install-rb
impconv.call
end
end
unless suffixes.empty?
mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n"
end
mfile.print depout
else
headers = %w[ruby.h defines.h]
if RULE_SUBST