diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/mkmf.rb | 11 |
2 files changed, 17 insertions, 5 deletions
@@ -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:39:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * object.c (rb_mod_cvar_get): Module#class_variable_get(): back @@ -53,7 +58,7 @@ Mon May 30 23:48:29 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Sat May 28 16:40:15 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> - * Sat/openssl/test_x509store.rb: add test for expired CRL + * Sat/openssl/test_x509store.rb: add test for expired CRL and refine some assertions. May 28 05:15:51 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> @@ -93,7 +98,7 @@ Wed May 25 20:06:27 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS strings. To avoid the trouble, add arguments to control converting - encoding, and do split on a UTF8 string. + encoding, and do split on a UTF8 string. * ext/tk/lib/multi-tk.rb: modify to attend encoding. @@ -125,7 +130,7 @@ Wed May 25 20:06:27 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Tk#lower_window/raise_window by reason of method-name conflict * ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given - non-TkcItem arguments. + non-TkcItem arguments. * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 3c61eccbda..d5fa3e51c5 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1104,11 +1104,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| @@ -1121,12 +1123,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)") {$1 + RULE_SUBST % $2} end - mfile.print line + depout << line end while line = dfile.gets() line.gsub!(/\.o\b/, ".#{$OBJEXT}") @@ -1146,6 +1149,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 |