[Xen-changelog] [xen-unstable] Fix hvmloader makefile dependencies, and do not recurse into

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201959643 0
# Node ID a47ac24951379f066483484eb39623e3e270076e
# Parent  bb0477a0e9f25eb8b0ae812c6c0ac34e454dfb9b
Fix hvmloader makefile dependencies, and do not recurse into
tools/firmware/etherboot by default (the dependency of eb_roms.h on
Config does not seem to always prevent the build from going ahead, for
some reason).
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/firmware/Makefile           |    2 +-
 tools/firmware/hvmloader/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -r bb0477a0e9f2 -r a47ac2495137 tools/firmware/Makefile
--- a/tools/firmware/Makefile   Sat Feb 02 11:24:20 2008 +0000
+++ b/tools/firmware/Makefile   Sat Feb 02 13:40:43 2008 +0000
@@ -11,7 +11,7 @@ SUBDIRS += vgabios
 SUBDIRS += vgabios
 SUBDIRS += vmxassist
 SUBDIRS += extboot
-SUBDIRS += etherboot
+#SUBDIRS += etherboot
 SUBDIRS += hvmloader
 
 .PHONY: all
diff -r bb0477a0e9f2 -r a47ac2495137 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Sat Feb 02 11:24:20 2008 +0000
+++ b/tools/firmware/hvmloader/Makefile Sat Feb 02 13:40:43 2008 +0000
@@ -50,7 +50,7 @@ acpi/acpi.a:
 acpi/acpi.a:
        $(MAKE) -C acpi
 
-roms.h:        ../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin 
../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../vmxassist/vmxassist.bin 
../etherboot/eb-rtl8139.zrom.h
+roms.h: ../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin 
../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../vmxassist/vmxassist.bin 
../etherboot/eb-roms.h ../extboot/extboot.bin
        sh ./mkhex rombios ../rombios/BIOS-bochs-latest > roms.h
        sh ./mkhex vgabios_stdvga ../vgabios/VGABIOS-lgpl-latest.bin >> roms.h
        sh ./mkhex vgabios_cirrusvga ../vgabios/VGABIOS-lgpl-latest.cirrus.bin 
>> roms.h

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog