[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/14] simplify source_path handling
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/14] simplify source_path handling |
Date: |
Sun, 14 Nov 2010 12:49:00 +0100 |
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 <address@hidden>
---
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
--
1.7.2.3
- [Qemu-devel] [PATCH 04/14] fix sparse support (?), (continued)
- [Qemu-devel] [PATCH 04/14] fix sparse support (?), Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 05/14] test cc with the complete set of chosen flags, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 07/14] provide portable HOST_LONG_BITS test, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 08/14] fix spelling of $pkg_config, move default together with other cross tools, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 09/14] do not default to non-prefixed pkg-config when cross compiling, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 10/14] reorganize sdl-config tests, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf", Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 12/14] simplify source_path handling,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/14] move --srcdir detection earlier, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 14/14] remove HOST_CC mention from roms/{sea, vga}bios/config.mak, Paolo Bonzini, 2010/11/14
- Re: [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script, Blue Swirl, 2010/11/14