naruse	2014-11-19 21:12:22 +0900 (Wed, 19 Nov 2014)

  New Revision: 48496

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

  Log:
    * common.mk (ext/json/parser/parser.c): don't touch parse.c,
      ruby repo is a downstream.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 48495)
+++ ChangeLog	(revision 48496)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Nov 19 21:11:01 2014  NARUSE, Yui  <naruse@r...>
+
+	* common.mk (ext/json/parser/parser.c): don't touch parse.c,
+	  ruby repo is a downstream.
+
 Wed Nov 19 20:38:11 2014  NARUSE, Yui  <naruse@r...>
 
 	* common.mk (ext/ripper/ripper.c): use $(PWD) to get
Index: common.mk
===================================================================
--- common.mk	(revision 48495)
+++ common.mk	(revision 48496)
@@ -721,7 +721,7 @@ common-srcs: {$(VPATH)}parse.c {$(VPATH) https://github.com/ruby/ruby/blob/trunk/common.mk#L721
 
 srcs: common-srcs srcs-enc
 
-EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \
+EXT_SRCS = $(srcdir)/ext/ripper/ripper.c \
 	   $(srcdir)/ext/rbconfig/sizeof/sizes.c
 
 srcs-ext: $(EXT_SRCS)
@@ -811,11 +811,6 @@ $(srcdir)/ext/ripper/ripper.c: parse.y i https://github.com/ruby/ruby/blob/trunk/common.mk#L811
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=$(PWD) \
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
-	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
-
 $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
 		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
 	$(ECHO) generating $@

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