2009-10-29 Robert Millan <rmh.grub@aybabtu.com>

        Revert SVN r2660.

        * conf/common.rmk (script/sh/lexer.c_DEPENDENCIES): Moved from here ...
        * conf/i386-coreboot.rmk (script/sh/lexer.c_DEPENDENCIES): ... to here.
        * conf/i386-efi.rmk (script/sh/lexer.c_DEPENDENCIES): ... and here.
        * conf/i386-ieee1275.rmk: Likewise.
        * conf/i386-pc.rmk: Likewise.
        * conf/powerpc-ieee1275.rmk: Likewise.
        * conf/sparc64-ieee1275.rmk: Likewise.
        * conf/x86_64-efi.rmk: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 12e8932e7a8e4ba2670cfbd29ef6097c9b0819a2..1d504a2cce2f39991b37a45f00055111e18de7f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-29  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Revert SVN r2660.
+
+       * conf/common.rmk (script/sh/lexer.c_DEPENDENCIES): Moved from here ...
+       * conf/i386-coreboot.rmk (script/sh/lexer.c_DEPENDENCIES): ... to here.
+       * conf/i386-efi.rmk (script/sh/lexer.c_DEPENDENCIES): ... and here.
+       * conf/i386-ieee1275.rmk: Likewise.
+       * conf/i386-pc.rmk: Likewise.
+       * conf/powerpc-ieee1275.rmk: Likewise.
+       * conf/sparc64-ieee1275.rmk: Likewise.
+       * conf/x86_64-efi.rmk: Likewise.
+
 2009-10-28  Robert Millan  <rmh.grub@aybabtu.com>
 
        * Makefile.in (TARGET_CPPFLAGS): Add `-nostdinc'.

diff --git a/conf/common.rmk b/conf/common.rmk
index ce7c330848a0f188a56aeb604dbde1ed1461ea7d..c1f0bbdcf6a83d4082626da3b6e43b53517edcc2 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # For grub-mkelfimage.
 bin_UTILITIES += grub-mkelfimage
 grub_mkelfimage_SOURCES = util/elf/grub-mkimage.c util/misc.c \

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 3c2061b4eb0c0ec6145f686d30417c4a88f9a43f..09ec7787c4ebdbcd412288d881070009a135062e 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -5,6 +5,7 @@ COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
 # Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 0440359e5c904d07ce7390e39e6436f217a76d11..99ab06f6428177d9ebbfaf8777a2488695cf7a53 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -5,6 +5,7 @@ COMMON_CFLAGS = -fno-builtin -m32
 COMMON_LDFLAGS = -melf_i386 -nostdlib
 
 # Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Utilities.
 bin_UTILITIES = grub-mkimage

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index c70ecf4dd832e5dc1d8755592f555aac67049b0f..4b640de499d59cbfaaf5f7d33efa4144386570a6 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -5,6 +5,7 @@ COMMON_CFLAGS   = -ffreestanding -mrtd -mregparm=3
 COMMON_LDFLAGS = -nostdlib
 
 # Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 pkglib_PROGRAMS = kernel.img

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 30847dfa709bcc94a9312e0f943a749e610c8fec..bf8fbfb9d765c334acabae0b5e7404ecd7fd0852 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -7,6 +7,7 @@ COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
 # Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 9165e4bc06dbf9c823216bdbc50e4460c511864d..ee7f9ec27e65b0648dca4c3f9a86168332cbc5aa 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -6,6 +6,7 @@ COMMON_CFLAGS = -ffreestanding
 COMMON_LDFLAGS += -nostdlib
 
 # Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 1156fe2a9df49767555c7a58457b48f29fc360b1..62e951a5e5843d6026f88673462921f8ddc2a061 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -6,6 +6,7 @@ COMMON_CFLAGS = -ffreestanding -m64 -mno-app-regs
 COMMON_LDFLAGS = -melf64_sparc -nostdlib -mno-relax
 
 # Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 pkglib_IMAGES = boot.img diskboot.img kernel.img

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 1732275753ac1f4624600746be507be210159f52..5be1b404f57b300b566690f5bcb60e00e6c9a24c 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -5,6 +5,7 @@ COMMON_CFLAGS = -fno-builtin -m64
 COMMON_LDFLAGS = -melf_x86_64 -nostdlib
 
 # Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Utilities.
 bin_UTILITIES = grub-mkimage