aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-05-15 14:47:32 +0100
committerIan Campbell <ian.campbell@citrix.com>2013-08-21 10:39:20 +0100
commit5c7cbadaccca8dbb47f2c42ab1b5a8afac9275e3 (patch)
tree0f3fa769942ff67d46cb9cd6fd5dc412c6cb6656 /Makefile
parentb0f69ec5c71de1248d915c193b57c43e786857dd (diff)
downloadxen-5c7cbadaccca8dbb47f2c42ab1b5a8afac9275e3.tar.gz
xen-5c7cbadaccca8dbb47f2c42ab1b5a8afac9275e3.tar.bz2
xen-5c7cbadaccca8dbb47f2c42ab1b5a8afac9275e3.zip
tools: allow user to specify a system qemu-xen binary
If this option is given don't bother building qemu-xen ourselves. Likely to be handy for distros who have an existing qemu package which they want to reuse. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 12 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index a936fbe441..2b915374a8 100644
--- a/Makefile
+++ b/Makefile
@@ -84,8 +84,19 @@ tools/qemu-xen-traditional-dir-force-update:
$(MAKE) -C tools qemu-xen-traditional-dir-force-update
endif
+ifeq ($(CONFIG_QEMU_XEN),y)
+QEMU_XEN_DIR_TGT := tools/qemu-xen-dir
+
+tools/qemu-xen-dir:
+ $(MAKE) -C tools qemu-xen-dir-find
+
+.PHONY: tools/qemu-xen-dir-force-update
+tools/qemu-xen-dir-force-update:
+ $(MAKE) -C tools qemu-xen-dir-force-update
+endif
+
ifeq ($(CONFIG_IOEMU),y)
-install-tools: $(QEMU_TRAD_DIR_TARGET) tools/qemu-xen-dir
+install-tools: $(QEMU_TRAD_DIR_TARGET) $(QEMU_XEN_DIR_TARGET)
endif
.PHONY: install-kernels
@@ -99,13 +110,6 @@ ifeq (x86_64,$(XEN_TARGET_ARCH))
XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
endif
-tools/qemu-xen-dir:
- $(MAKE) -C tools qemu-xen-dir-find
-
-.PHONY: tools/qemu-xen-dir-force-update
-tools/qemu-xen-dir-force-update:
- $(MAKE) -C tools qemu-xen-dir-force-update
-
.PHONY: tools/firmware/seabios-dir-force-update
tools/firmware/seabios-dir-force-update:
$(MAKE) -C tools/firmware seabios-dir-force-update