From patchwork Tue Oct 12 13:00:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 67595 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 9A646B70E0 for ; Wed, 13 Oct 2010 01:27:18 +1100 (EST) Received: from localhost ([127.0.0.1]:39812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5fYB-0005m5-3X for incoming@patchwork.ozlabs.org; Tue, 12 Oct 2010 10:09:55 -0400 Received: from [140.186.70.92] (port=42087 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5eUh-0007uj-0Y for qemu-devel@nongnu.org; Tue, 12 Oct 2010 09:02:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P5eUY-0004yg-SA for qemu-devel@nongnu.org; Tue, 12 Oct 2010 09:02:14 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:48077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P5eUY-0004Lx-Pn for qemu-devel@nongnu.org; Tue, 12 Oct 2010 09:02:06 -0400 Received: by mail-qy0-f173.google.com with SMTP id 36so629119qyk.4 for ; Tue, 12 Oct 2010 06:02:06 -0700 (PDT) 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=zO1BofRejFpTAHEd+fSK+M2VsenNNKz0KYuTm6VHjGg=; b=YFscmFXE9sFgbRSyTvavb8QSSMrsout0vhULRSx3ia83TBZOTmFIqNk+qE1mj/rnJT WdsYBtCGDWZZoNB4+RIhWXBMbTwOhd6TaXOqu2SC6Rz3bgjx4ZsodiOMTmkSG3gQPbWd NVz56wRyVkQhfx9dE8ZvdEs5330JnwWs/G0WA= 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=EGRhPosjXHV4T7eNZFyppvTRgQaAh5zyIJ4KxRSOEBBvIEE04jUiyrUodhkiciHgvN M/VCU2DWxR435kM0RGjC7UrrtcPcLbUYOsR93TAsS7bTL9QKBBUlCu+24sXU+58HqZnB rQ6rav7KyCsGn4ncSyhLj/q6JIBvcb5bw32YQ= Received: by 10.229.75.3 with SMTP id w3mr3206724qcj.296.1286888526275; Tue, 12 Oct 2010 06:02:06 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id s34sm5931078qcp.20.2010.10.12.06.02.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 12 Oct 2010 06:02:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 12 Oct 2010 15:00:51 +0200 Message-Id: <1286888457-5033-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1286888457-5033-1-git-send-email-pbonzini@redhat.com> References: <1286888457-5033-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 33/39] rename source_path to srcdir 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 Signed-off-by: Paolo Bonzini --- configure | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 432bd3b..8ed9736 100755 --- a/configure +++ b/configure @@ -182,8 +182,8 @@ for opt do ;; CC=*|--cc=*) CC="$optarg" ;; - --srcdir=*|--source-path=*) source_path="$optarg" - source_path_used="yes" + --srcdir=*|--source-path=*) srcdir="$optarg" + srcdir_used="yes" ;; CPP=*) CPP="$optarg" ;; @@ -245,15 +245,15 @@ else fi # find source path -source_path=`dirname "$0"` -source_path_used="no" +srcdir=`dirname "$0"` +srcdir_used="no" workdir=`pwd` -if [ -z "$source_path" ]; then - source_path=$workdir +if [ -z "$srcdir" ]; then + srcdir=$workdir else - source_path=`cd "$source_path"; pwd` + srcdir=`cd "$srcdir"; pwd` fi -[ -f "$workdir/vl.c" ] || source_path_used="yes" +[ -f "$workdir/vl.c" ] || srcdir_used="yes" check_define() { cat > $TMPC < /dev/null 2> /dev/null +sh "$srcdir/tracetool" "--$trace_backend" --check-backend > /dev/null 2> /dev/null if test "$?" -ne 0 ; then echo echo "Error: invalid trace backend" @@ -2237,7 +2237,7 @@ fi # Consult white-list to determine whether to enable werror # by default. Only enable by default for git builds -z_version=`cut -f3 -d. $source_path/VERSION` +z_version=`cut -f3 -d. $srcdir/VERSION` if test -z "$werror" ; then if test "$z_version" = "50" -a \ @@ -2308,7 +2308,7 @@ if test "$mingw32" = "no" ; then echo "Manual directory `eval echo $mandir`" echo "Target sysroot `eval echo $sysroot`" fi -echo "Source path $source_path" +echo "Source path $srcdir" echo "C compiler $cc" echo "C preprocessor $cpp" echo "CFLAGS $CFLAGS" @@ -2517,10 +2517,10 @@ fi if test "$uuid" = "yes" ; then echo "CONFIG_UUID=y" >> $config_host_mak fi -qemu_version=`head $source_path/VERSION` +qemu_version=`head $srcdir/VERSION` echo "VERSION=$qemu_version" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak -echo "srcdir=$source_path" >> $config_host_mak +echo "srcdir=$srcdir" >> $config_host_mak echo "TARGET_DIRS=$target_list" >> $config_host_mak if [ "$docs" = "yes" ] ; then echo "BUILD_DOCS=yes" >> $config_host_mak @@ -2710,7 +2710,7 @@ fi for d in libdis libdis-user; do mkdir -p $d rm -f $d/Makefile - ln -s $source_path/Makefile.dis $d/Makefile + ln -s $srcdir/Makefile.dis $d/Makefile echo > $d/config.mak done if test "$static" = "no" -a "$user_pie" = "yes" ; then @@ -2779,7 +2779,7 @@ fi # don't use ln -sf as not all "ln -sf" over write the file/link # rm -f $target_dir/Makefile -ln -s $source_path/Makefile.target $target_dir/Makefile +ln -s $srcdir/Makefile.target $target_dir/Makefile echo "# Automatically generated by configure - do not modify" > $config_target_mak @@ -2959,7 +2959,7 @@ fi list="" if test ! -z "$gdb_xml_files" ; then for x in $gdb_xml_files; do - list="$list $source_path/gdb-xml/$x" + list="$list $srcdir/gdb-xml/$x" done echo "TARGET_XML_FILES=$list" >> $config_target_mak fi @@ -3133,7 +3133,7 @@ echo "QEMU_CPPFLAGS+=$cppflags" >> $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 +if test "$srcdir_used" = "yes" ; then DIRS="tests tests/cris slirp audio block net pc-bios/optionrom" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS fsdev ui" @@ -3142,7 +3142,7 @@ if test "$source_path_used" = "yes" ; then FILES="$FILES tests/test-mmap.c" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps pc-bios/video.x" 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 + for bios_file in $srcdir/pc-bios/*.bin $srcdir/pc-bios/*.dtb $srcdir/pc-bios/openbios-*; do FILES="$FILES pc-bios/`basename $bios_file`" done for dir in $DIRS ; do @@ -3151,7 +3151,7 @@ if test "$source_path_used" = "yes" ; then # remove the link and recreate it, as not all "ln -sf" overwrite the link for f in $FILES ; do rm -f $f - ln -s $source_path/$f $f + ln -s $srcdir/$f $f done fi @@ -3159,7 +3159,7 @@ fi for rom in seabios vgabios ; do config_mak=roms/$rom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak - echo "srcdir=$source_path/roms/$rom" >> $config_mak + echo "srcdir=$srcdir/roms/$rom" >> $config_mak echo "CC=$cc" >> $config_mak echo "BCC=bcc" >> $config_mak echo "CPP=$cpp" >> $config_mak @@ -3173,14 +3173,14 @@ for hwlib in 32 64; do mkdir -p $d mkdir -p $d/ide rm -f $d/Makefile - ln -s $source_path/Makefile.hw $d/Makefile + ln -s $srcdir/Makefile.hw $d/Makefile echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak done d=libuser mkdir -p $d rm -f $d/Makefile -ln -s $source_path/Makefile.user $d/Makefile +ln -s $srcdir/Makefile.user $d/Makefile if test "$static" = "no" -a "$user_pie" = "yes" ; then echo "QEMU_CFLAGS+=-fpie" > $d/config.mak fi