From f75172d9e7481421c4ef2f350c38918186f374d2 Mon Sep 17 00:00:00 2001 From: robertmh Date: Sun, 27 Jan 2008 21:35:44 +0000 Subject: [PATCH] 2008-01-27 Robert Millan Fix parallel builds with grub-emu. Based on earlier commit for grub-probe and grub-setup. * conf/i386-pc.rmk (grub-emu_DEPENDENCIES): Renamed to ... (util/grub-emu.c_DEPENDENCIES): ... this. * conf/i386-efi.rmk (grub-emu_DEPENDENCIES): Renamed to ... (util/grub-emu.c_DEPENDENCIES): ... this. * conf/i386-linuxbios.rmk (grub-emu_DEPENDENCIES): Renamed to ... (util/grub-emu.c_DEPENDENCIES): ... this. * conf/i386-ieee1275.rmk (grub-emu_DEPENDENCIES): Renamed to ... (util/grub-emu.c_DEPENDENCIES): ... this. * conf/powerpc-ieee1275.rmk (grub-emu_DEPENDENCIES): Renamed to ... (util/grub-emu.c_DEPENDENCIES): ... this. --- ChangeLog | 16 ++++++++++++++++ conf/i386-efi.mk | 2 +- conf/i386-efi.rmk | 2 +- conf/i386-ieee1275.mk | 2 +- conf/i386-ieee1275.rmk | 2 +- conf/i386-linuxbios.mk | 2 +- conf/i386-linuxbios.rmk | 2 +- conf/i386-pc.mk | 2 +- conf/i386-pc.rmk | 2 +- conf/powerpc-ieee1275.mk | 2 +- conf/powerpc-ieee1275.rmk | 2 +- 11 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81fbbfbc0..8c3345e32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-01-27 Robert Millan + + Fix parallel builds with grub-emu. Based on earlier commit for + grub-probe and grub-setup. + + * conf/i386-pc.rmk (grub-emu_DEPENDENCIES): Renamed to ... + (util/grub-emu.c_DEPENDENCIES): ... this. + * conf/i386-efi.rmk (grub-emu_DEPENDENCIES): Renamed to ... + (util/grub-emu.c_DEPENDENCIES): ... this. + * conf/i386-linuxbios.rmk (grub-emu_DEPENDENCIES): Renamed to ... + (util/grub-emu.c_DEPENDENCIES): ... this. + * conf/i386-ieee1275.rmk (grub-emu_DEPENDENCIES): Renamed to ... + (util/grub-emu.c_DEPENDENCIES): ... this. + * conf/powerpc-ieee1275.rmk (grub-emu_DEPENDENCIES): Renamed to ... + (util/grub-emu.c_DEPENDENCIES): ... this. + 2008-01-27 Pavel Roskin * include/grub/powerpc/ieee1275/kernel.h: Introduce GRUB_MOD_GAP diff --git a/conf/i386-efi.mk b/conf/i386-efi.mk index 2f2664dd9..f91c4ed7c 100644 --- a/conf/i386-efi.mk +++ b/conf/i386-efi.mk @@ -226,7 +226,7 @@ grub_probe-grub_probe_init.o: grub_probe_init.c $(grub_probe_init.c_DEPENDENCIES # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \ diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk index a49bd858a..37c642385 100644 --- a/conf/i386-efi.rmk +++ b/conf/i386-efi.rmk @@ -44,7 +44,7 @@ grub_probe_SOURCES = util/grub-probe.c \ disk/lvm.c disk/raid.c grub_probe_init.c # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \ diff --git a/conf/i386-ieee1275.mk b/conf/i386-ieee1275.mk index 74a0928e2..0ac1e1829 100644 --- a/conf/i386-ieee1275.mk +++ b/conf/i386-ieee1275.mk @@ -362,7 +362,7 @@ grub_probe-grub_probe_init.o: grub_probe_init.c $(grub_probe_init.c_DEPENDENCIES # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk index 0ba538201..e1e1e5d77 100644 --- a/conf/i386-ieee1275.rmk +++ b/conf/i386-ieee1275.rmk @@ -70,7 +70,7 @@ grub_probe_SOURCES = util/grub-probe.c \ disk/lvm.c disk/raid.c grub_probe_init.c # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ diff --git a/conf/i386-linuxbios.mk b/conf/i386-linuxbios.mk index 1ef02a9f7..c9f67e4b7 100644 --- a/conf/i386-linuxbios.mk +++ b/conf/i386-linuxbios.mk @@ -348,7 +348,7 @@ grub_probe-grub_probe_init.o: grub_probe_init.c $(grub_probe_init.c_DEPENDENCIES # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ diff --git a/conf/i386-linuxbios.rmk b/conf/i386-linuxbios.rmk index 321467752..1188a4f52 100644 --- a/conf/i386-linuxbios.rmk +++ b/conf/i386-linuxbios.rmk @@ -68,7 +68,7 @@ grub_probe_SOURCES = util/grub-probe.c \ disk/lvm.c disk/raid.c grub_probe_init.c # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk index d379e1106..264bde2db 100644 --- a/conf/i386-pc.mk +++ b/conf/i386-pc.mk @@ -569,7 +569,7 @@ grub_probe-grub_probe_init.o: grub_probe_init.c $(grub_probe_init.c_DEPENDENCIES # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk index 52dc06bb0..29b825e85 100644 --- a/conf/i386-pc.rmk +++ b/conf/i386-pc.rmk @@ -104,7 +104,7 @@ grub_probe_SOURCES = util/grub-probe.c \ disk/lvm.c disk/raid.c grub_probe_init.c # For grub-emu. -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/echo.c commands/help.c \ diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk index 8869f5bde..c8f8ad17b 100644 --- a/conf/powerpc-ieee1275.mk +++ b/conf/powerpc-ieee1275.mk @@ -238,7 +238,7 @@ grub_probe-grub_probe_init.o: grub_probe_init.c $(grub_probe_init.c_DEPENDENCIES # For grub-emu -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \ diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk index 5a43e9fac..4a300a566 100644 --- a/conf/powerpc-ieee1275.rmk +++ b/conf/powerpc-ieee1275.rmk @@ -56,7 +56,7 @@ grub_probe_SOURCES = util/grub-probe.c \ disk/lvm.c disk/raid.c grub_probe_init.c # For grub-emu -grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ +util/grub-emu.c_DEPENDENCIES = grub_script.tab.c grub_script.tab.h \ grub_emu_init.h grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ commands/configfile.c commands/help.c \