From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 25 Mar 2008 10:17:22 +0000 (+0000)
Subject: tools build: Fix build after subdir rules cleanups.
X-Git-Tag: 3.3.0-rc1~252^2~9
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6ab58a7ed9cbcffe1f5235ad9626f0bc90bf9723;p=xen.git

tools build: Fix build after subdir rules cleanups.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/Config.mk b/Config.mk
index 5715debf9b..077bfa4d5c 100644
--- a/Config.mk
+++ b/Config.mk
@@ -25,6 +25,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 --git a/tools/Rules.mk b/tools/Rules.mk
index 58f6fbf487..29639a341d 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -49,13 +49,11 @@ $(eval $(check-y))
 %.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 --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 533fa81e72..0defed1264 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -40,9 +40,9 @@ SRCS = hvmloader.c mp_tables.c util.c smbios.c 32bitbios_support.c
 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 --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 553fe8d1b2..90d86db0a9 100644
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -16,14 +16,14 @@ SUBDIRS = tcgbios
 
 MODULES = tcgbios/tcgbiosext.o
 
-.PHONY: all subdirs clean
-
-all: subdirs-all $(TARGET)
+.PHONY: all
+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 --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile
index dcf2143c6c..be2fef672a 100644
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -4,10 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 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 --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile
index 6e97308c8b..7dd3c4f0fb 100644
--- a/tools/libfsimage/Makefile
+++ b/tools/libfsimage/Makefile
@@ -4,7 +4,8 @@ include $(XEN_ROOT)/tools/Rules.mk
 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