move the call to xen-setup after libxc and xenstore are built

From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Move the call to xen-setup, the wrapper script to configure
qemu-xen-traditional, right before building qemu-xen-traditional and
after libxc and xenstore are already built.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 14e6d07002fc5b8fc0fc0e5aa6f22f18f42a88a8..3ff1ed1a3497a06d4224bbc678c5e5666aa1e32c 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -96,10 +96,6 @@ qemu-xen-traditional-dir-find:
                export GIT=$(GIT); \
                $(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) qemu-xen-traditional-dir; \
        fi
-       set -e; \
-               $(buildmakevars2shellvars); \
-               cd qemu-xen-traditional-dir; \
-               $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS)
 
 .PHONY: qemu-xen-traditional-dir-force-update
 qemu-xen-traditional-dir-force-update:
@@ -111,6 +107,11 @@ qemu-xen-traditional-dir-force-update:
        fi
 
 subdir-all-qemu-xen-traditional-dir subdir-install-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) install
 
 subdir-clean-qemu-xen-traditional-dir:
        set -e; if test -d qemu-xen-traditional-dir/.; then \