From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWEAI-0005h2-Um for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWEAD-0005b7-6E for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:14 -0400 Received: from [199.232.76.173] (port=34448 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWEAC-0005aN-JP for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:08 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:50170) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MWEAA-0003jM-IL for qemu-devel@nongnu.org; Wed, 29 Jul 2009 14:46:06 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e8.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id n6TIjtoV008482 for ; Wed, 29 Jul 2009 14:45:55 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n6TIk2lW255236 for ; Wed, 29 Jul 2009 14:46:02 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n6TIk2TA011679 for ; Wed, 29 Jul 2009 14:46:02 -0400 From: Anthony Liguori Date: Wed, 29 Jul 2009 13:45:54 -0500 Message-Id: <1248893159-18785-2-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> References: <1248893159-18785-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 2/7] Always build roms in a separate directory List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Avi Kivity , Alex Graf For some roms, the same source will get built multiple times for each board type. Signed-off-by: Anthony Liguori --- Makefile | 9 ++++++--- configure | 13 ++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c510ff3..059696a 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ config-host.mak: endif .PHONY: all clean cscope distclean dvi html info install install-doc \ - recurse-all speed tar tarbin test + recurse-all speed tar tarbin test roms VPATH=$(SRC_PATH):$(SRC_PATH)/hw @@ -220,9 +220,12 @@ clean: rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d rm -f qemu-img-cmds.h $(MAKE) -C tests clean - for d in $(TARGET_DIRS) $(ROMS) libhw32 libhw64; do \ + for d in $(TARGET_DIRS) libhw32 libhw64; do \ $(MAKE) -C $$d $@ || exit 1 ; \ done + for d in $(ROMS); do \ + $(MAKE) -C pc-bios/$$d $@ || exit 1 ; \ + done distclean: clean rm -f config-host.mak config-host.h config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi @@ -247,7 +250,7 @@ endif roms: for d in $(ROMS); do \ - $(MAKE) -C $$d || exit 1 ; \ + $(MAKE) -C pc-bios/$$d || exit 1 ; \ done install-doc: $(DOCS) diff --git a/configure b/configure index 264cc7b..f477aaf 100755 --- a/configure +++ b/configure @@ -1743,7 +1743,7 @@ echo "TOOLS=$tools" >> $config_host_mak roms= if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ "$targetos" != "Darwin" ; then - roms="roms/multiboot" + roms="multiboot" fi echo "ROMS=$roms" >> $config_host_mak @@ -2109,13 +2109,20 @@ fi done # for target in $targets +# make directories for roms +for rom in $roms; do + mkdir -p pc-bios/$rom + rm -f pc-bios/$rom/Makefile + ln -s $source_path/roms/$rom/Makefile pc-bios/$rom/Makefile +done + # build tree in object directory if source path is different from current one if test "$source_path_used" = "yes" ; then - DIRS="tests tests/cris slirp audio block roms/multiboot" + DIRS="tests tests/cris slirp audio block" FILES="Makefile tests/Makefile" FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" FILES="$FILES tests/test-mmap.c" - FILES="$FILES roms/multiboot/Makefile pc-bios/keymaps pc-bios/video.x" + FILES="$FILES pc-bios/keymaps pc-bios/video.x" for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do FILES="$FILES pc-bios/`basename $bios_file`" done -- 1.6.2.5