From patchwork Sun Nov 14 11:49:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 71110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 40C58B7121 for ; Sun, 14 Nov 2010 23:10:38 +1100 (EST) Received: from localhost ([127.0.0.1]:43672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHbPg-0004EM-6C for incoming@patchwork.ozlabs.org; Sun, 14 Nov 2010 07:10:28 -0500 Received: from [140.186.70.92] (port=43611 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHb5c-00034O-F8 for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PHb5a-0004In-Kv for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:43 -0500 Received: from mail-pv0-f173.google.com ([74.125.83.173]:39811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PHb5a-0004EC-FA for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:42 -0500 Received: by mail-pv0-f173.google.com with SMTP id 11so976782pvh.4 for ; Sun, 14 Nov 2010 03:49:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=oKqtSWmZPUasWzBAbmJ2Hr0KSkWprifYmKlXLEisJZk=; b=gYS/OwpZuQbpSurQeDq0Ov3mP0G7NxAQiZoyxxKUzlxiLzzFeP2s/9ET0+qQmlFbRm L7iXDyZ8zXUqVm9f15FTgGDuZxVOVEP5BvMjs4fwpQAhracqp9wuPHuNeZvizkYDi3gY lYV1d6UQc+BqUiJ+vB1xkje9apf0ilytzxiqA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=YloN8VaeGqfxXUq/68q5hMGKpzQc9OBdF+B0WDcUxFP0pOZCD1f1jcBuzu0NBPm8e2 QcX4MWxd6U9LlPVNb7v2zunZEakuDQ4RI80HpYUUp9hEfc9lZfyv8ZiH12WugLEr7Dhj XMyPrRqEu9dF5MecgJWxP6xoVOOwRsDxxsgNM= Received: by 10.142.162.19 with SMTP id k19mr1550661wfe.313.1289735382010; Sun, 14 Nov 2010 03:49:42 -0800 (PST) Received: from localhost.localdomain (s209p8.home.99maxprogres.cz [85.93.118.17]) by mx.google.com with ESMTPS id x35sm7086810wfd.13.2010.11.14.03.49.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 03:49:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 14 Nov 2010 12:49:00 +0100 Message-Id: <1289735342-8660-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1289735342-8660-1-git-send-email-pbonzini@redhat.com> References: <1289735342-8660-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 12/14] simplify source_path handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org source_path_used is not necessary since we use mkdir -p and test -f. Also, dirname returns "." if a path has no directory component, as is the case for "sh configure". Signed-off-by: Paolo Bonzini --- configure | 45 ++++++++++++++++----------------------------- 1 files changed, 16 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 5a3b127..e667b12 100755 --- a/configure +++ b/configure @@ -472,14 +472,7 @@ fi # find source path source_path=`dirname "$0"` -source_path_used="no" -workdir=`pwd` -if [ -z "$source_path" ]; then - source_path=$workdir -else - source_path=`cd "$source_path"; pwd` -fi -[ -f "$workdir/vl.c" ] || source_path_used="yes" +source_path=`cd "$source_path"; pwd` werror="" @@ -493,7 +486,6 @@ for opt do --interp-prefix=*) interp_prefix="$optarg" ;; --source-path=*) source_path="$optarg" - source_path_used="yes" ;; --cross-prefix=*) ;; @@ -3093,26 +3085,21 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak done # for target in $targets -# 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 net pc-bios/optionrom" - DIRS="$DIRS roms/seabios roms/vgabios" - DIRS="$DIRS fsdev ui" - FILES="Makefile tests/Makefile" - FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" - FILES="$FILES tests/test-mmap.c" - FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" - FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" - 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 - for dir in $DIRS ; do - mkdir -p $dir - done - for f in $FILES ; do - test -f $f || ln -sf $source_path/$f $f - done -fi +# build tree in object directory in case the source is not in the current directory +DIRS="tests tests/cris slirp audio block net pc-bios/optionrom" +DIRS="$DIRS roms/seabios roms/vgabios" +DIRS="$DIRS fsdev ui" +FILES="Makefile tests/Makefile" +FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" +FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" +FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" +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 +mkdir -p $DIRS +for f in $FILES ; do + test -f $f || ln -sf $source_path/$f $f +done # temporary config to build submodules for rom in seabios vgabios ; do