From 4b448d36ea6728b871d548878281bd1cfa7b00a6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 22 Aug 2012 07:57:22 +0000
Subject: lib/mkmf.rb: ruby_headers

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'lib/mkmf.rb')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index dcbb8596ac..2c50ff568c 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1775,6 +1775,12 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
     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 @@ sitearch = #{CONFIG['sitearch']}
 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 @@ site-install-rb: install-rb
     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
-- 
cgit v1.2.3