ia64/xen-unstable

changeset 17303:784f6dc204be

tools build: Fix build after subdir rules cleanups.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 25 10:17:22 2008 +0000 (2008-03-25)
parents 2c07fda47494
children 71b8f46f376d
files Config.mk tools/Rules.mk tools/firmware/hvmloader/Makefile tools/firmware/rombios/32bit/Makefile tools/firmware/rombios/Makefile tools/libfsimage/Makefile
line diff
     1.1 --- a/Config.mk	Tue Mar 25 09:51:03 2008 +0000
     1.2 +++ b/Config.mk	Tue Mar 25 10:17:22 2008 +0000
     1.3 @@ -25,6 +25,9 @@ HOSTCFLAGS += -fno-strict-aliasing
     1.4  DISTDIR     ?= $(XEN_ROOT)/dist
     1.5  DESTDIR     ?= /
     1.6  
     1.7 +# Allow phony attribute to be listed as dependency rather than fake target
     1.8 +.PHONY: .phony
     1.9 +
    1.10  include $(XEN_ROOT)/config/$(XEN_OS).mk
    1.11  include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
    1.12  
     2.1 --- a/tools/Rules.mk	Tue Mar 25 09:51:03 2008 +0000
     2.2 +++ b/tools/Rules.mk	Tue Mar 25 10:17:22 2008 +0000
     2.3 @@ -49,13 +49,11 @@ check-$(CONFIG_X86) = $(call cc-ver-chec
     2.4  %.o: %.cc
     2.5  	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
     2.6  
     2.7 -.PHONY: subdirs-all subdirs-clean subdirs-install
     2.8 -.NOTPARALLEL: subdirs-all subdirs-clean subdirs-install
     2.9 -subdirs-all subdirs-clean subdirs-install:
    2.10 +subdirs-all subdirs-clean subdirs-install: .phony
    2.11  	@set -e; for subdir in $(SUBDIRS) $(SUBDIRS-y); do \
    2.12  		$(MAKE) subdir-$(patsubst subdirs-%,%,$@)-$$subdir; \
    2.13  	done
    2.14  
    2.15 -subdir-all-% subdir-clean-% subdir-install-%:
    2.16 +subdir-all-% subdir-clean-% subdir-install-%: .phony
    2.17  	$(MAKE) -C $* $(patsubst subdir-%-$*,%,$@)
    2.18  
     3.1 --- a/tools/firmware/hvmloader/Makefile	Tue Mar 25 09:51:03 2008 +0000
     3.2 +++ b/tools/firmware/hvmloader/Makefile	Tue Mar 25 10:17:22 2008 +0000
     3.3 @@ -40,9 +40,9 @@ SRCS = hvmloader.c mp_tables.c util.c sm
     3.4  OBJS = $(patsubst %.c,%.o,$(SRCS))
     3.5  
     3.6  .PHONY: all
     3.7 -all: subdirs-all hvmloader
     3.8 +all: hvmloader
     3.9  
    3.10 -hvmloader: roms.h acpi/acpi.a $(SRCS)
    3.11 +hvmloader: roms.h subdirs-all $(SRCS)
    3.12  	$(CC) $(CFLAGS) -c $(SRCS)
    3.13  	$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) acpi/acpi.a
    3.14  	$(OBJCOPY) hvmloader.tmp hvmloader
     4.1 --- a/tools/firmware/rombios/32bit/Makefile	Tue Mar 25 09:51:03 2008 +0000
     4.2 +++ b/tools/firmware/rombios/32bit/Makefile	Tue Mar 25 10:17:22 2008 +0000
     4.3 @@ -16,14 +16,14 @@ SUBDIRS = tcgbios
     4.4  
     4.5  MODULES = tcgbios/tcgbiosext.o
     4.6  
     4.7 -.PHONY: all subdirs clean
     4.8 +.PHONY: all
     4.9 +all: $(TARGET)
    4.10  
    4.11 -all: subdirs-all $(TARGET)
    4.12 -
    4.13 +.PHONY: clean
    4.14  clean: subdirs-clean
    4.15  	rm -rf *.o $(TARGET)
    4.16  
    4.17 -$(TARGET): 32bitbios.o util.o
    4.18 +$(TARGET): subdirs-all 32bitbios.o util.o
    4.19  	$(LD) $(LDFLAGS_DIRECT) -s -r 32bitbios.o $(MODULES) util.o -o 32bitbios_all.o
    4.20  	@nm 32bitbios_all.o |                                \
    4.21  	  egrep '^ +U ' >/dev/null && {                      \
     5.1 --- a/tools/firmware/rombios/Makefile	Tue Mar 25 09:51:03 2008 +0000
     5.2 +++ b/tools/firmware/rombios/Makefile	Tue Mar 25 10:17:22 2008 +0000
     5.3 @@ -4,10 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
     5.4  SUBDIRS := 32bit
     5.5  
     5.6  .PHONY: all
     5.7 -all: subdirs-all bios
     5.8 -
     5.9 -.PHONY: bios
    5.10 -bios: biossums BIOS-bochs-latest
    5.11 +all: subdirs-all BIOS-bochs-latest
    5.12  
    5.13  .PHONY: clean
    5.14  clean: subdirs-clean
     6.1 --- a/tools/libfsimage/Makefile	Tue Mar 25 09:51:03 2008 +0000
     6.2 +++ b/tools/libfsimage/Makefile	Tue Mar 25 10:17:22 2008 +0000
     6.3 @@ -4,7 +4,8 @@ include $(XEN_ROOT)/tools/Rules.mk
     6.4  SUBDIRS-y = common ufs reiserfs iso9660 fat
     6.5  SUBDIRS-y += $(shell env CC="$(CC)" ./check-libext2fs)
     6.6  
     6.7 -.PHONE: all clean install
     6.8 +.PHONY: all clean install
     6.9  all clean install: %: subdirs-%
    6.10  
    6.11 +.PHONY: distclean
    6.12  distclean: clean