naruse	2014-02-22 16:53:33 +0900 (Sat, 22 Feb 2014)

  New Revision: 45123

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

  Log:
    merge revision(s) 44514: [Backport #9374]
    
    * ext/json/generator/depend: add build dependencies for json extension
      [Bug #9374] [ruby-core:59609]
    
    * ext/json/parser/depend: ditto

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/json/generator/depend
    branches/ruby_2_1/ext/json/parser/depend
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45122)
+++ ruby_2_1/ChangeLog	(revision 45123)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 16:51:36 2014  Eric Wong <e@8...>
+
+	* ext/json/generator/depend: add build dependencies for json extension
+	  [Bug #9374] [ruby-core:59609]
+	* ext/json/parser/depend: ditto
+
 Sat Feb 22 16:34:12 2014  Yusuke Endoh  <mame@t...>
 
 	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
Index: ruby_2_1/ext/json/generator/depend
===================================================================
--- ruby_2_1/ext/json/generator/depend	(revision 45122)
+++ ruby_2_1/ext/json/generator/depend	(revision 45123)
@@ -1 +1,2 @@
+$(OBJS): $(ruby_headers)
 generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h
Index: ruby_2_1/ext/json/parser/depend
===================================================================
--- ruby_2_1/ext/json/parser/depend	(revision 45122)
+++ ruby_2_1/ext/json/parser/depend	(revision 45123)
@@ -1 +1,2 @@
+$(OBJS): $(ruby_headers)
 parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45122)
+++ ruby_2_1/version.h	(revision 45123)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 67
+#define RUBY_PATCHLEVEL 68
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44514


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