From 2811570a7d2bf6eab1dca109a3b79e89f3568dcf Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 8 Jul 2008 14:26:09 +0100 Subject: [PATCH] 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 --- tools/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 4914033997..0fc8aa0b9c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -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 -- 2.30.2