[前][次][番号順一覧][スレッド一覧]

ruby-changes:24736

From: usa <ko1@a...>
Date: Thu, 23 Aug 2012 10:38:25 +0900 (JST)
Subject: [ruby-changes:24736] usa:r36787 (trunk): * common.mk (ID_H_TARGET): revert a part of r36724 and r36751. they

usa	2012-08-23 10:38:14 +0900 (Thu, 23 Aug 2012)

  New Revision: 36787

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

  Log:
    * common.mk (ID_H_TARGET): revert a part of r36724 and r36751.  they
      break mswin build from clean source.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36786)
+++ ChangeLog	(revision 36787)
@@ -1,3 +1,8 @@
+Thu Aug 23 10:36:35 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@t...>
 
 	* ext/syck: removed. Fixes [ruby-core:43360]
Index: common.mk
===================================================================
--- common.mk	(revision 36786)
+++ common.mk	(revision 36787)
@@ -27,7 +27,7 @@
 PLATFORM_D    = ./$(PLATFORM_DIR)/.time
 RDOCOUT       = $(EXTOUT)/rdoc
 CAPIOUT       = doc/capi
-ID_H_TARGET   = {$(VPATH)}id.h
+ID_H_TARGET   = ./.id.h.time
 
 DMYEXT	      = dmyext.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
@@ -562,7 +562,7 @@
 PHONY:
 
 {$(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:
 	$(ECHO) generating $@
@@ -852,9 +852,11 @@
 
 insns: $(INSNS)
 
+$(ID_H_INCLUDES): $(ID_H_TARGET)
 $(ID_H_TARGET): {$(VPATH)}parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
 	$(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
 
 node_name.inc: {$(VPATH)}node.h

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

[前][次][番号順一覧][スレッド一覧]