From 22e145141bcd98ab68ff57e9cd991796227b534f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 8 Aug 2012 13:45:41 +0000
Subject: [PATCH] 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 common.mk | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec6ea04a3e..15174d0dbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Aug  8 22:45:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@atdot.net>
 
 	* compile.c (ADD_INSNL): make ADD_INSNSL as alias of ADD_INSN1.
diff --git a/common.mk b/common.mk
index 1c873db20d..9a72a68eec 100644
--- a/common.mk
+++ b/common.mk
@@ -565,6 +565,11 @@ parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
 	$(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 @@ parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
   {$(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 @@ insns: $(INSNS)
 
 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