[Xen-changelog] [xen-unstable] Improve plumbing for calling external qemu builds

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1215523569 -3600
# Node ID edd6969f609c1cd49923ae38bf3fb11f4b78813f
# Parent  914a31d2ad0841bec1f3efe5a1d3352cb500706d
Improve plumbing for calling external qemu builds

* Remove ioemu-dir before replacing it with a symlink so that
  switching between trees doesn't go wrong.
* Remove case-based arrangement for making XEN_ROOT absolute
  and replace with $(abspath ...) since we depend on GNU make
  anyway.
* `make clean' recurses into ioemu-dir

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/Makefile |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff -r 914a31d2ad08 -r edd6969f609c tools/Makefile
--- a/tools/Makefile    Tue Jul 08 12:24:14 2008 +0100
+++ b/tools/Makefile    Tue Jul 08 14:26:09 2008 +0100
@@ -79,15 +79,14 @@ ioemu-dir-find:
                        $(GIT) clone $(CONFIG_QEMU) ioemu-remote.tmp; \
                        mv ioemu-remote.tmp ioemu-remote; \
                fi; \
+               rm -f ioemu-dir; \
                ln -sf ioemu-remote ioemu-dir; \
        fi
-       set -e; \
-               case "$XEN_ROOT" in \
-               /*)     XEN_ROOT=$(XEN_ROOT) ;; \
-               *)      XEN_ROOT=`pwd`/$(XEN_ROOT) ;; \
-               esac; \
-               export XEN_ROOT; \
-               cd ioemu-dir; \
-               ./xen-setup
+       cd ioemu-dir && XEN_ROOT="$(abspath $(XEN_ROOT))" ./xen-setup
 
 subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
+
+subdir-clean-ioemu-dir:
+       if test -d ioemu-dir/.; then \
+               $(MAKE) -C ioemu-dir clean; \
+       fi

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog