nobu	2012-08-08 22:45:41 +0900 (Wed, 08 Aug 2012)

  New Revision: 36661

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

  Log:
    common.mk: id.h dependency
    
    * common.mk (.y.h): split from .y.c rule to manage dependency on
      parse.h.  [ruby-core:46741] [Bug #6789]
    * common.mk (id.h): keep old file unless changed.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36660)
+++ ChangeLog	(revision 36661)
@@ -1,3 +1,10 @@
+Wed Aug  8 22:45:38 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (.y.h): split from .y.c rule to manage dependency on
+	  parse.h.  [ruby-core:46741] [Bug #6789]
+
+	* common.mk (id.h): keep old file unless changed.
+
 Wed Aug  8 17:11:20 2012  Koichi Sasada  <ko1@a...>
 
 	* compile.c (ADD_INSNL): make ADD_INSNSL as alias of ADD_INSN1.
Index: common.mk
===================================================================
--- common.mk	(revision 36660)
+++ common.mk	(revision 36661)
@@ -565,6 +565,11 @@
 	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c $(SRC_FILE)
 	$(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
 	$(Q)$(MV) $@.new $@
+	$(Q)$(RM) y.tab.c y.tab.h
+
+{$(srcdir)}.y.h:
+	$(ECHO) generating $@
+	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c $(SRC_FILE)
 	$(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse\.y/d" y.tab.h > $(@:.c=.h).new
 	$(Q)$(IFCHANGE) $(@:.c=.h) $(@:.c=.h).new
 	$(Q)$(RM) y.tab.c y.tab.h
@@ -686,7 +691,7 @@
   {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
   {$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
   {$(VPATH)}parse.h \
-  {$(VPATH)}internal.h {$(VPATH)}id.h
+  {$(VPATH)}internal.h
 proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
   $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
   {$(VPATH)}debug.h {$(VPATH)}internal.h {$(VPATH)}iseq.h
@@ -842,7 +847,7 @@
 
 id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --if-change --output=$@ \
 		$(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/