aboutsummaryrefslogtreecommitdiffstats
path: root/tools/Makefile
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2013-08-06 11:32:32 +0100
committerIan Campbell <ian.campbell@citrix.com>2013-08-21 10:32:42 +0100
commitb0f69ec5c71de1248d915c193b57c43e786857dd (patch)
tree3e1d239ee2b68d08b80fe25385da22e71d4c6bd3 /tools/Makefile
parent874f76a86adf1da70921884f5a868eec105cf8cd (diff)
downloadxen-b0f69ec5c71de1248d915c193b57c43e786857dd.tar.gz
xen-b0f69ec5c71de1248d915c193b57c43e786857dd.tar.bz2
xen-b0f69ec5c71de1248d915c193b57c43e786857dd.zip
tools: Make qemu-xen-traditional build optional.
Now that we have upstream qemu people may want to avoid building this extra code. There is a little bit of trickery in stubdom/configure.ac to ensure that the ioemu stubdom is only built if qemu-traditional is enabled. libxl will return an error if a caller tries to build a domain using qemu-xen-traditional when this support was disabled at build time. Since qemu-xen-traditional has been historically tightly bound to the Xen releases I don't see any value in supporting "3rd party" provision of qemu-xen-traditional. We also do not want/need this on ARM therefore default is on for x86 and off otherwise. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> [ ijc -- trivial conflicts in Tools.mk.in and tools/configure.ac. Reran autogen.sh ]
Diffstat (limited to 'tools/Makefile')
-rw-r--r--tools/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 381af04849..6fa589b09c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -28,7 +28,7 @@ SUBDIRS-$(CONFIG_Linux) += libvchan
# do not recurse in to a dir we are about to delete
ifneq "$(MAKECMDGOALS)" "distclean"
-SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
+SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir
SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
endif