merge revision(s) 44514: [Backport ruby#9374]

unak · unak · commit 681d225d2670 · 2014-02-14T06:51:49.000Z
* ext/json/generator/depend: add build dependencies for json extension [Bug ruby#9374] [ruby-core:59609] * ext/json/parser/depend: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 14 15:49:55 2014  Eric Wong <e@80x24.org>
+
+	* ext/json/generator/depend: add build dependencies for json extension
+	  [Bug #9374] [ruby-core:59609]
+	* ext/json/parser/depend: ditto
+
 Fri Feb 14 15:40:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* iseq.c (iseq_load): keep type_map to get rid of memory leak.
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
@@ -1 +1,2 @@
+$(OBJS): $(ruby_headers)
 generator.o: generator.c generator.h
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
@@ -1 +1,2 @@
+$(OBJS): $(ruby_headers)
 parser.o: parser.c parser.h
diff --git a/version.h b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 527
+#define RUBY_PATCHLEVEL 528
 
 #define RUBY_RELEASE_DATE "2014-02-14"
 #define RUBY_RELEASE_YEAR 2014

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+$(OBJS): $(ruby_headers)`
`1`	`2`	`generator.o: generator.c generator.h`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+$(OBJS): $(ruby_headers)`
`1`	`2`	`parser.o: parser.c parser.h`