From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 8 Jul 2008 13:26:09 +0000 (+0100)
Subject: Improve plumbing for calling external qemu builds
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14188^2~84
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2811570a7d2bf6eab1dca109a3b79e89f3568dcf;p=xen.git

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@eu.citrix.com>
---

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