aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-07-31 11:51:14 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-07-31 11:51:14 +0100
commit0a72f4c6f8ee311b3b93069f5a3f8db2d39809e7 (patch)
treea3d4b7cdf436a5fb3ce9cbe43c5d2b19c4f956b3
parent1e7e2bbc26b162d421f19e23f0d8d749c39209c8 (diff)
downloadxen-0a72f4c6f8ee311b3b93069f5a3f8db2d39809e7.tar.gz
xen-0a72f4c6f8ee311b3b93069f5a3f8db2d39809e7.tar.bz2
xen-0a72f4c6f8ee311b3b93069f5a3f8db2d39809e7.zip
firmware: Fix build dependencies.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-rw-r--r--tools/firmware/hvmloader/Makefile8
-rw-r--r--tools/firmware/rombios/32bit/Makefile7
-rw-r--r--tools/firmware/rombios/Makefile3
3 files changed, 10 insertions, 8 deletions
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 826338560e..5988da6816 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -33,14 +33,14 @@ SRCS += 32bitbios_support.c smp.c cacheattr.c
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 --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index ea8cc99375..cdad7561b9 100644
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -11,14 +11,15 @@ SUBDIRS = tcgbios
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 --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile
index be2fef672a..8ea8cb7560 100644
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -4,7 +4,8 @@ include $(XEN_ROOT)/tools/Rules.mk
SUBDIRS := 32bit
.PHONY: all
-all: subdirs-all BIOS-bochs-latest
+all: subdirs-all
+ $(MAKE) BIOS-bochs-latest
.PHONY: clean
clean: subdirs-clean