1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* common.mk (ID_H_TARGET): revert a part of r36724 and r36751. they

Browse Source 
break mswin build from clean source.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-08-23 01:38:14 +00:00
parent 5571c7315e
commit bae282bc74
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Aug 23 10:36:35 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk (ID_H_TARGET): revert a part of r36724 and r36751. they
break mswin build from clean source.
Thu Aug 23 02:37:35 2012 Aaron Patterson <aaron@tenderlovemaking.com> Thu Aug 23 02:37:35 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/syck: removed. Fixes [ruby-core:43360] * ext/syck: removed. Fixes [ruby-core:43360]

8
common.mk
View File

@ -27,7 +27,7 @@ REVISION_H = ./.revision.time
PLATFORM_D = ./$(PLATFORM_DIR)/.time PLATFORM_D = ./$(PLATFORM_DIR)/.time
RDOCOUT = $(EXTOUT)/rdoc RDOCOUT = $(EXTOUT)/rdoc
CAPIOUT = doc/capi CAPIOUT = doc/capi
ID_H_TARGET = {$(VPATH)}id.h ID_H_TARGET = ./.id.h.time
DMYEXT = dmyext.$(OBJEXT) DMYEXT = dmyext.$(OBJEXT)
NORMALMAINOBJ = main.$(OBJEXT) NORMALMAINOBJ = main.$(OBJEXT)
@ -562,7 +562,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc
PHONY: PHONY:
{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed {$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
{$(VPATH)}parse.h: {$(VPATH)}parse.c parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
{$(srcdir)}.y.c: {$(srcdir)}.y.c:
$(ECHO) generating $@ $(ECHO) generating $@
@ -852,9 +852,11 @@ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(
insns: $(INSNS) insns: $(INSNS)
$(ID_H_INCLUDES): $(ID_H_TARGET)
$(ID_H_TARGET): {$(VPATH)}parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(ID_H_TARGET): {$(VPATH)}parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
$(ECHO) generating id.h $(ECHO) generating id.h
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --if-change --output=$@ \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --if-change --output=id.h \
--timestamp=$@ \
$(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h
node_name.inc: {$(VPATH)}node.h node_name.inc: {$(VPATH)}node.h