tools/firmware - Use generic subdirs rules

diff -r 771c3ebe0c8c -r d80f5d24af7a tools/firmware/Makefile
@@ -7,7 +7,7 @@ INST_DIR := $(DESTDIR)/usr/lib/xen/boot
 INST_DIR := $(DESTDIR)/usr/lib/xen/boot
 
 SUBDIRS :=
-SUBDIRS += rombios rombios/32bit
+SUBDIRS += rombios
 SUBDIRS += vgabios
 SUBDIRS += extboot
 #SUBDIRS += etherboot

@@ -21,9 +21,7 @@ all:
 	echo "(visit http://www.cix.co.uk/~mayday for more information)"; \
 	echo "***********************************************************"; \
 	else \
-	for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir $@; \
-	done; \
+	$(MAKE) subdirs-$@; \
 	fi
 
 

@@ -33,7 +31,4 @@ install: all
 	[ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
 
 .PHONY: clean
-clean: 
-	@set -e; for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir $@; \
-	done
+clean: subdirs-clean

diff -r 771c3ebe0c8c -r d80f5d24af7a tools/firmware/hvmloader/Makefile
@@ -23,6 +23,8 @@ CFLAGS :=
 CFLAGS :=
 include $(XEN_ROOT)/tools/Rules.mk
 
+SUBDIRS := acpi
+
 # The HVM loader is started in 32-bit mode at the address below:
 LOADADDR = 0x100000
 

@@ -38,17 +40,13 @@ OBJS = $(patsubst %.c,%.o,$(SRCS))
 OBJS = $(patsubst %.c,%.o,$(SRCS))
 
 .PHONY: all
-all: hvmloader
+all: subdirs-all hvmloader
 
 hvmloader: roms.h acpi/acpi.a $(SRCS)
 	$(CC) $(CFLAGS) -c $(SRCS)
 	$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $(OBJS) acpi/acpi.a
 	$(OBJCOPY) hvmloader.tmp hvmloader
 	rm -f hvmloader.tmp
-
-.PHONY: acpi/acpi.a
-acpi/acpi.a:
-	$(MAKE) -C acpi
 
 roms.h: ../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin ../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../etherboot/eb-roms.h ../extboot/extboot.bin
 	sh ./mkhex rombios ../rombios/BIOS-bochs-latest > roms.h

@@ -58,7 +56,6 @@ roms.h: ../rombios/BIOS-bochs-latest ../
 	sh ./mkhex extboot ../extboot/extboot.bin >> roms.h
 
 .PHONY: clean
-clean:
+clean: subdirs-clean
 	rm -f roms.h acpi.h
 	rm -f hvmloader hvmloader.tmp *.o
-	$(MAKE) -C acpi clean

diff -r 771c3ebe0c8c -r d80f5d24af7a tools/firmware/rombios/32bit/Makefile
@@ -18,20 +18,12 @@ MODULES = tcgbios/tcgbiosext.o
 
 .PHONY: all subdirs clean
 
-subdirs:
-	@set -e; for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir all; \
-	done;
+all: subdirs-all $(TARGET)
 
-all: $(TARGET)
+clean: subdirs-clean
+	rm -rf *.o $(TARGET)
 
-clean:
-	rm -rf *.o $(TARGET)
-	@for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir $@; \
-	done;
-
-$(TARGET): subdirs 32bitbios.o util.o
+$(TARGET): 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 771c3ebe0c8c -r d80f5d24af7a tools/firmware/rombios/Makefile
@@ -1,12 +1,16 @@
+XEN_ROOT = ../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
+SUBDIRS := 32bit
 
 .PHONY: all
-all: bios
+all: subdirs-all bios
 
 .PHONY: bios
 bios: biossums BIOS-bochs-latest
 
 .PHONY: clean
-clean:
+clean: subdirs-clean
 	rm -f  *.o *.a *.s rombios.bin _rombios*_.c
 	rm -f  as86-sym.txt ld86-sym.txt 
 	rm -f  rombios*.txt rombios*.sym usage biossums