[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/15] remove source_path_used
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 12/15] remove source_path_used |
Date: |
Thu, 23 Dec 2010 11:43:59 +0100 |
Not necessary since we use mkdir -p and from this patch test -f.
Also, dirname returns "." if a path has no directory component,
as is the case for "sh configure".
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/configure b/configure
index a9c0219..b3f771b 100755
--- a/configure
+++ b/configure
@@ -480,14 +480,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=""
@@ -501,7 +494,6 @@ for opt do
--interp-prefix=*) interp_prefix="$optarg"
;;
--source-path=*) source_path="$optarg"
- source_path_used="yes"
;;
--cross-prefix=*)
;;
@@ -3196,26 +3188,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
- symlink $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 || symlink $source_path/$f $f
+done
# temporary config to build submodules
for rom in seabios vgabios ; do
--
1.7.3.2
- [Qemu-devel] [PATCH v3 02/15] default make and install to environment variables, (continued)
- [Qemu-devel] [PATCH v3 02/15] default make and install to environment variables, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 03/15] move feature variables to the top, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 04/15] fix sparse support (?), Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 05/15] test cc with the complete set of chosen flags, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 06/15] do not pass bogus $(SRC_PATH) include paths to cc during configure, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 08/15] fix spelling of $pkg_config, move default together with other cross tools, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 07/15] provide portable HOST_LONG_BITS test, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 09/15] do not default to non-prefixed pkg-config when cross compiling, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 11/15] move "ln -sf" emulation to a function, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 10/15] reorganize sdl-config tests, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 12/15] remove source_path_used,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 15/15] make trace options use autoconfy names, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 13/15] move --srcdir detection earlier, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 14/15] remove HOST_CC mention from roms/{sea, vga}bios/config.mak, Paolo Bonzini, 2010/12/23