Fix parallel build.

	* conf/common.rmk: Add grub_script.tab.h as a grub-script-check
	dependency.
	* script/parser.y: #include grub_script.tab.h header.

diff --git a/ChangeLog b/ChangeLog
index 9fe3fa8b0a21a4110c6542196fef58c9c9879c4e..477ccbbae0a647aeeb777462a152dacee3612d23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-21  BVK Chaitanya  <bvk.groups@gmail.com>
+
+       Fix parallel build.
+
+       * conf/common.rmk: Add grub_script.tab.h as a grub-script-check
+       dependency.
+       * script/parser.y: #include grub_script.tab.h header.
+
 2010-06-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Support >3GiB and <16MiB RAM in i386-qemu.

diff --git a/conf/common.rmk b/conf/common.rmk
index bf73c2d5931dbdf5ad25d79cd205c64f7b1d90f1..0f67622b554b80875d5ebc3743bfbdd00c7eaa25 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -95,6 +95,7 @@ grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c
        kern/misc.c kern/env.c grub_script.tab.c \
        grub_script.yy.c
 grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
+grub_script_check_DEPENDENCIES = grub_script.tab.h
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 

diff --git a/script/parser.y b/script/parser.y
index b5815ea8de809e076b5e3a67087c83ca639eadbf..e85ba624dd8e553c5527d719cd6a24bacdac0a22 100644 (file)
--- a/script/parser.y
+++ b/script/parser.y
@@ -26,6 +26,7 @@
 #define YYLTYPE_IS_TRIVIAL      0
 #define YYENABLE_NLS    0
 
+#include "grub_script.tab.h"
 %}
 
 %union {
@@ -126,6 +127,7 @@ word: GRUB_PARSER_TOKEN_NAME { $$ = grub_script_add_arglist (state, 0, $1); }
 statement: command   { $$ = $1; }
          | function  { $$ = 0;  }
          | menuentry { $$ = $1; }
+;
 
 argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
          | "do"        { $$ = grub_script_add_arglist (state, 0, $1); }