[Xen-changelog] [xen-unstable] tools: do not install qemu if just doing a build

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User David Vrabel <david.vrabel@xxxxxxxxxx>
# Date 1339094487 -3600
# Node ID 4195a034d81946e460182dec1f58abc4a3b7b3b9
# Parent  15ed87e385a3828c65ca78f555d05dff3c0e44b8
tools: do not install qemu if just doing a build

Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 15ed87e385a3 -r 4195a034d819 tools/Makefile
--- a/tools/Makefile    Thu Jun 07 19:40:23 2012 +0100
+++ b/tools/Makefile    Thu Jun 07 19:41:27 2012 +0100
@@ -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-q
                --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:

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