[Xen-changelog] [xen-unstable] tools build: Fix build after subdir rules cleanups.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206440242 0
# Node ID 784f6dc204be4f208eafef7e35cb8d827fc44040
# Parent  2c07fda47494cba5ca1a74c58283cb3d3aaf6725
tools build: Fix build after subdir rules cleanups.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 Config.mk                             |    3 +++
 tools/Rules.mk                        |    6 ++----
 tools/firmware/hvmloader/Makefile     |    4 ++--
 tools/firmware/rombios/32bit/Makefile |    8 ++++----
 tools/firmware/rombios/Makefile       |    5 +----
 tools/libfsimage/Makefile             |    3 ++-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff -r 2c07fda47494 -r 784f6dc204be Config.mk
--- a/Config.mk Tue Mar 25 09:51:03 2008 +0000
+++ b/Config.mk Tue Mar 25 10:17:22 2008 +0000
@@ -24,6 +24,9 @@ HOSTCFLAGS += -fno-strict-aliasing
 
 DISTDIR     ?= $(XEN_ROOT)/dist
 DESTDIR     ?= /
+
+# Allow phony attribute to be listed as dependency rather than fake target
+.PHONY: .phony
 
 include $(XEN_ROOT)/config/$(XEN_OS).mk
 include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
diff -r 2c07fda47494 -r 784f6dc204be tools/Rules.mk
--- a/tools/Rules.mk    Tue Mar 25 09:51:03 2008 +0000
+++ b/tools/Rules.mk    Tue Mar 25 10:17:22 2008 +0000
@@ -49,13 +49,11 @@ check-$(CONFIG_X86) = $(call cc-ver-chec
 %.o: %.cc
        $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 
-.PHONY: subdirs-all subdirs-clean subdirs-install
-.NOTPARALLEL: subdirs-all subdirs-clean subdirs-install
-subdirs-all subdirs-clean subdirs-install:
+subdirs-all subdirs-clean subdirs-install: .phony
        @set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \
                $(MAKE) subdir-$(patsubst subdirs-%,%,$@)-$$subdir; \
        done
 
-subdir-all-% subdir-clean-% subdir-install-%:
+subdir-all-% subdir-clean-% subdir-install-%: .phony
        $(MAKE) -C $* $(patsubst subdir-%-$*,%,$@)
 
diff -r 2c07fda47494 -r 784f6dc204be tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Tue Mar 25 09:51:03 2008 +0000
+++ b/tools/firmware/hvmloader/Makefile Tue Mar 25 10:17:22 2008 +0000
@@ -40,9 +40,9 @@ OBJS = $(patsubst %.c,%.o,$(SRCS))
 OBJS = $(patsubst %.c,%.o,$(SRCS))
 
 .PHONY: all
-all: subdirs-all hvmloader
+all: hvmloader
 
-hvmloader: roms.h acpi/acpi.a $(SRCS)
+hvmloader: roms.h subdirs-all $(SRCS)
        $(CC) $(CFLAGS) -c $(SRCS)
        $(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) 
acpi/acpi.a
        $(OBJCOPY) hvmloader.tmp hvmloader
diff -r 2c07fda47494 -r 784f6dc204be tools/firmware/rombios/32bit/Makefile
--- a/tools/firmware/rombios/32bit/Makefile     Tue Mar 25 09:51:03 2008 +0000
+++ b/tools/firmware/rombios/32bit/Makefile     Tue Mar 25 10:17:22 2008 +0000
@@ -16,14 +16,14 @@ SUBDIRS = tcgbios
 
 MODULES = tcgbios/tcgbiosext.o
 
-.PHONY: all subdirs clean
+.PHONY: all
+all: $(TARGET)
 
-all: subdirs-all $(TARGET)
-
+.PHONY: clean
 clean: subdirs-clean
        rm -rf *.o $(TARGET)
 
-$(TARGET): 32bitbios.o util.o
+$(TARGET): subdirs-all 32bitbios.o util.o
        $(LD) $(LDFLAGS_DIRECT) -s -r 32bitbios.o $(MODULES) util.o -o 
32bitbios_all.o
        @nm 32bitbios_all.o |                                \
          egrep '^ +U ' >/dev/null && {                      \
diff -r 2c07fda47494 -r 784f6dc204be tools/firmware/rombios/Makefile
--- a/tools/firmware/rombios/Makefile   Tue Mar 25 09:51:03 2008 +0000
+++ b/tools/firmware/rombios/Makefile   Tue Mar 25 10:17:22 2008 +0000
@@ -4,10 +4,7 @@ SUBDIRS := 32bit
 SUBDIRS := 32bit
 
 .PHONY: all
-all: subdirs-all bios
-
-.PHONY: bios
-bios: biossums BIOS-bochs-latest
+all: subdirs-all BIOS-bochs-latest
 
 .PHONY: clean
 clean: subdirs-clean
diff -r 2c07fda47494 -r 784f6dc204be tools/libfsimage/Makefile
--- a/tools/libfsimage/Makefile Tue Mar 25 09:51:03 2008 +0000
+++ b/tools/libfsimage/Makefile Tue Mar 25 10:17:22 2008 +0000
@@ -4,7 +4,8 @@ SUBDIRS-y = common ufs reiserfs iso9660 
 SUBDIRS-y = common ufs reiserfs iso9660 fat
 SUBDIRS-y += $(shell env CC="$(CC)" ./check-libext2fs)
 
-.PHONE: all clean install
+.PHONY: all clean install
 all clean install: %: subdirs-%
 
+.PHONY: distclean
 distclean: clean

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