usa	2012-08-23 16:15:27 +0900 (Thu, 23 Aug 2012)

  New Revision: 36797

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

  Log:
    * lib/mkmf.rb (create_makefile): add dependency to header files when
      depend files don't exist.  now we can remove simple (and often
      wrong) depend files in most cases.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36796)
+++ ChangeLog	(revision 36797)
@@ -1,3 +1,9 @@
+Thu Aug 23 16:12:40 2012  NAKAMURA Usaku  <usa@r...>
+
+	* lib/mkmf.rb (create_makefile): add dependency to header files when
+	  depend files don't exist.  now we can remove simple (and often
+	  wrong) depend files in most cases.
+
 Thu Aug 23 16:02:20 2012  Koichi Sasada  <ko1@a...>
 
 	* ext/date/depend: add dependency to $(ruby_headers).
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 36796)
+++ lib/mkmf.rb	(revision 36797)
@@ -50,6 +50,7 @@
     CXX_EXT.concat(%w[C])
   end
   SRC_EXT = C_EXT + CXX_EXT
+  HDR_EXT = %w[h hpp]
   $static = nil
   $config_h = '$(arch_hdrdir)/ruby/config.h'
   $default_static = $static
@@ -2016,6 +2017,8 @@
     end
     $srcs = srcs
 
+    hdrs = Dir[File.join(srcdir, "*.{#{HDR_EXT.join(%q{,})}}")]
+
     target = nil if $objs.empty?
 
     if target and EXPORT_PREFIX
@@ -2069,6 +2072,7 @@
 ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
 SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}
 OBJS = #{$objs.join(" ")}
+HDRS = #{hdrs.map{|h| '$(srcdir)/' + File.basename(h)}.join(' ')}
 TARGET = #{target}
 TARGET_NAME = #{target && target[/\A\w+/]}
 TARGET_ENTRY = #{EXPORT_PREFIX || ''}Init_$(TARGET_NAME)
@@ -2228,7 +2232,7 @@
     if File.exist?(depend)
       mfile.print("###\n", *depend_rules(File.read(depend)))
     else
-      mfile.print "$(OBJS): $(ruby_headers)\n"
+      mfile.print "$(OBJS): $(HDRS) $(ruby_headers)\n"
     end
 
     $makefile_created = true

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