nobu	2012-08-22 16:57:22 +0900 (Wed, 22 Aug 2012)

  New Revision: 36780

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

  Log:
    lib/mkmf.rb: ruby_headers
    
    * lib/mkmf.rb (configuration): extact least ruby headers list as
      ruby_headers.

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36779)
+++ ChangeLog	(revision 36780)
@@ -1,3 +1,8 @@
+Wed Aug 22 16:57:04 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (configuration): extact least ruby headers list as
+	  ruby_headers.
+
 Wed Aug 22 15:27:50 2012  Koichi Sasada  <ko1@a...>
 
 	* vm_insnhelper.c (vm_setup_method): fix last commit of
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 36779)
+++ lib/mkmf.rb	(revision 36780)
@@ -1775,6 +1775,12 @@
     end
     possible_command = (proc {|s| s if /top_srcdir/ !~ s} unless $extmk)
     extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ") << " "
+    headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
+    if RULE_SUBST
+      headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
+    end
+    headers << $config_h
+    headers << '$(RUBY_EXTCONF_H)' if $extconf_h
     mk << %{
 
 CC = #{CONFIG['CC']}
@@ -1814,6 +1820,8 @@
 ruby_version = #{RbConfig::CONFIG['ruby_version']}
 ruby = #{$ruby}
 RUBY = $(ruby#{sep})
+ruby_headers = #{headers.join(' ')}
+
 RM = #{config_string('RM', &possible_command) || '$(RUBY) -run -e rm -- -f'}
 RM_RF = #{'$(RUBY) -run -e rm -- -rf'}
 RMDIRS = #{config_string('RMDIRS', &possible_command) || '$(RUBY) -run -e rmdir -- -p'}
@@ -2220,13 +2228,7 @@
     if File.exist?(depend)
       mfile.print("###\n", *depend_rules(File.read(depend)))
     else
-      headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
-      if RULE_SUBST
-        headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
-      end
-      headers << $config_h
-      headers << '$(RUBY_EXTCONF_H)' if $extconf_h
-      mfile.print "$(OBJS): ", headers.join(' '), "\n"
+      mfile.print "$(OBJS): $(ruby_headers)\n"
     end
 
     $makefile_created = true

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