[Xen-changelog] [xen-unstable] firmware: Fix build dependencies.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217501474 -3600
# Node ID 2ee49553a9441feee09b446fb19514791103a3be
# Parent  05391ca07588c45f5c8dd16c2a470b0d615767b8
firmware: Fix build dependencies.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/firmware/hvmloader/Makefile     |    8 ++++----
 tools/firmware/rombios/32bit/Makefile |    7 ++++---
 tools/firmware/rombios/Makefile       |    3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff -r 05391ca07588 -r 2ee49553a944 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Thu Jul 31 11:14:23 2008 +0100
+++ b/tools/firmware/hvmloader/Makefile Thu Jul 31 11:51:14 2008 +0100
@@ -33,14 +33,14 @@ OBJS  = $(patsubst %.c,%.o,$(SRCS))
 OBJS  = $(patsubst %.c,%.o,$(SRCS))
 
 .PHONY: all
-all: hvmloader
+all: subdirs-all
+       $(MAKE) hvmloader
 
 hvmloader.o: roms.h
 smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""
 
-hvmloader: subdirs-all $(OBJS)
-       $(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) \
-               -o hvmloader.tmp $(OBJS) acpi/acpi.a
+hvmloader: $(OBJS) acpi/acpi.a
+       $(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $^
        $(OBJCOPY) hvmloader.tmp hvmloader
        rm -f hvmloader.tmp
 
diff -r 05391ca07588 -r 2ee49553a944 tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile     Thu Jul 31 11:14:23 2008 +0100
+++ b/tools/firmware/rombios/32bit/Makefile     Thu Jul 31 11:51:14 2008 +0100
@@ -11,14 +11,15 @@ MODULES = tcgbios/tcgbiosext.o
 MODULES = tcgbios/tcgbiosext.o
 
 .PHONY: all
-all: $(TARGET)
+all: subdirs-all
+       $(MAKE) $(TARGET)
 
 .PHONY: clean
 clean: subdirs-clean
        rm -rf *.o $(TARGET)
 
-$(TARGET): subdirs-all 32bitbios.o util.o
-       $(LD) $(LDFLAGS_DIRECT) -s -r 32bitbios.o $(MODULES) util.o -o 
32bitbios_all.o
+$(TARGET): 32bitbios.o $(MODULES) util.o
+       $(LD) $(LDFLAGS_DIRECT) -s -r $^ -o 32bitbios_all.o
        @nm 32bitbios_all.o |                                \
          egrep '^ +U ' >/dev/null && {                      \
            echo "There are undefined symbols in the BIOS:"; \
diff -r 05391ca07588 -r 2ee49553a944 tools/firmware/rombios/Makefile
--- a/tools/firmware/rombios/Makefile   Thu Jul 31 11:14:23 2008 +0100
+++ b/tools/firmware/rombios/Makefile   Thu Jul 31 11:51:14 2008 +0100
@@ -4,7 +4,8 @@ SUBDIRS := 32bit
 SUBDIRS := 32bit
 
 .PHONY: all
-all: subdirs-all BIOS-bochs-latest
+all: subdirs-all
+       $(MAKE) BIOS-bochs-latest
 
 .PHONY: clean
 clean: subdirs-clean

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