Unify lexer.c_DEPENDENCIES

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index ee5ab3cd45e01dca3e09d4adc4b046788b863a74..95f44844c66602a06153757eae2c1a972d284fae 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -3,9 +3,6 @@
 COMMON_LDFLAGS += -nostdlib
 COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img

diff --git a/conf/common.rmk b/conf/common.rmk
index b97de8e22a43bc7ab41f76481898362e8c75771c..55a430572e3fd2628b4ee68a57cbfc68ee18c3c8 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -1,5 +1,8 @@
 # -*- makefile -*-
 
+# Used by various components.  These rules need to precede them.
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
+
 sbin_UTILITIES += grub-mkdevicemap
 grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
        util/deviceiter.c \

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 44b80761ec1e230a7dc7ae21974d18ba08892aa4..048356a53e99d17bacc71882ba608c04b7841ae6 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -4,9 +4,6 @@ COMMON_ASFLAGS  = -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 
 GRUB_KERNEL_MACHINE_LINK_ADDR  = 0x8200

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index d23ba4c0ee0692b13fbe5c757678b3783cad942e..c65e2f7defc4205b20d8021f6f1befb06b95977e 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -4,9 +4,6 @@ COMMON_ASFLAGS  = -m32 -nostdinc -fno-builtin
 COMMON_CFLAGS  = -ffreestanding -mrtd -mregparm=3
 COMMON_LDFLAGS = -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/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 b620c43af06785cb0707ad050437d8b9cebf2111..57904b265609b1d7ba4a4655728f78b67fe8b4e8 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -6,9 +6,6 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
        pxeboot.img

diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 355870c89b0249d568a554cb0363ea823f0fc749..c7209f348ed8e4b6c13580212a7f7cc113b35170 100644 (file)
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -4,9 +4,6 @@ COMMON_ASFLAGS  = -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 
 GRUB_KERNEL_MACHINE_LINK_ADDR  = 0x8200

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 6948d8d668cfbde141ea74a1177e15bfc0e55f62..84eed880594ce3adaf0cc98ae541ef834f7b53a2 100644 (file)
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -5,9 +5,6 @@ COMMON_ASFLAGS += -nostdinc
 COMMON_CFLAGS += -ffreestanding -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 COMMON_LDFLAGS += -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 kernel_img_HEADERS += cpu/libgcc.h cpu/cache.h
 

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 59cde4efe1f5528d4652426f21f923b37eca7e89..ce54ca494a4b5639819afbe8d1921172fa7f2fa5 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -5,9 +5,6 @@ COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY__
 COMMON_CFLAGS = -ffreestanding
 COMMON_LDFLAGS += -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 
 kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index dbca42e580d946914bdc810762aac6cced635534..ffa8c1e7c062c669c96850bceb444fc93cec4676 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -5,9 +5,6 @@ COMMON_ASFLAGS = -nostdinc -m64
 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/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 pkglib_IMAGES = boot.img diskboot.img kernel.img
 

diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 94f3055063f36ccee3f8ef4de5b852bed8388a43..b27855aa4158fb4ca6a30f47b2faf0d5fa869c14 100644 (file)
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -1,8 +1,5 @@
 # -*- makefile -*-
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Utilities.
 bin_UTILITIES = grub-mkimage