aboutsummaryrefslogtreecommitdiffstats
path: root/tools/Makefile
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@citrix.com>2012-06-07 19:41:27 +0100
committerDavid Vrabel <david.vrabel@citrix.com>2012-06-07 19:41:27 +0100
commit3407c7f72d8468525da14c3eaa82ac506be6017b (patch)
tree870cf4f3226419e4fa72bd02f9851dfbd46400d4 /tools/Makefile
parent4226fb18da3b65f59c98bf3beddc87f5bf0d1d9d (diff)
downloadxen-3407c7f72d8468525da14c3eaa82ac506be6017b.tar.gz
xen-3407c7f72d8468525da14c3eaa82ac506be6017b.tar.bz2
xen-3407c7f72d8468525da14c3eaa82ac506be6017b.zip
tools: do not install qemu if just doing a build
Signed-off-by: David Vrabel <david.vrabel@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/Makefile')
-rw-r--r--tools/Makefile15
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 6688d07a7d..523ccdb985 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -118,7 +118,14 @@ qemu-xen-traditional-dir-force-update:
$(GIT) reset --hard $(QEMU_TAG); \
fi
-subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
+subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
+ set -e; \
+ $(buildmakevars2shellvars); \
+ cd qemu-xen-traditional-dir; \
+ $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \
+ $(MAKE) all
+
+subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
set -e; \
$(buildmakevars2shellvars); \
cd qemu-xen-traditional-dir; \
@@ -141,7 +148,7 @@ qemu-xen-dir-force-update:
$(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \
fi
-subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
+subdir-all-qemu-xen-dir: qemu-xen-dir-find
if test -d $(QEMU_UPSTREAM_URL) ; then \
source=$(QEMU_UPSTREAM_URL); \
else \
@@ -162,6 +169,10 @@ subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
--disable-kvm \
--python=$(PYTHON) \
$(IOEMU_CONFIGURE_CROSS); \
+ $(MAKE) all
+
+subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir
+ cd qemu-xen-dir; \
$(MAKE) install
subdir-clean-qemu-xen-dir: