diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | common.mk | 7 |
2 files changed, 6 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Wed Nov 19 21:11:01 2014 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@ruby-lang.org> * common.mk (ext/ripper/ripper.c): use $(PWD) to get @@ -721,7 +721,7 @@ common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id. 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 id.h 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 $@ |