From 03145f0fe42c007834c1ef50d95fe6c4f58a326a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Jul 2013 16:15:50 +0100 Subject: tools: make building xend configurable. xend has been deprecated for 2 releases now. Lets make it possible to not even build it. For now I'm leaving the default of on but I would like to change that before the 4.4 release. Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper Acked-by: Matt Wilson Acked-by: Ian Jackson --- tools/examples/Makefile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'tools/examples') diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 8cea724e10..cc853fabec 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -1,31 +1,30 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -# Init scripts. -XEND_INITD = init.d/xend -XENDOMAINS_INITD = init.d/xendomains -XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains - # Xen configuration dir and configs to go there. XEN_READMES = README XEN_READMES += README.incompatibilities -XEN_CONFIGS = xend-config.sxp -XEN_CONFIGS += xm-config.xml -XEN_CONFIGS += xmexample1 -XEN_CONFIGS += xmexample2 -XEN_CONFIGS += xmexample3 -XEN_CONFIGS += xmexample.hvm -XEN_CONFIGS += xmexample.hvm-stubdom -XEN_CONFIGS += xmexample.pv-grub -XEN_CONFIGS += xmexample.nbd -XEN_CONFIGS += xmexample.vti + +XEN_CONFIGS-$(CONFIG_XEND) += xend-config.sxp +XEN_CONFIGS-$(CONFIG_XEND) += xm-config.xml +XEN_CONFIGS-$(CONFIG_XEND) += xmexample1 +XEN_CONFIGS-$(CONFIG_XEND) += xmexample2 +XEN_CONFIGS-$(CONFIG_XEND) += xmexample3 +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.hvm-stubdom +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.pv-grub +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.nbd +XEN_CONFIGS-$(CONFIG_XEND) += xmexample.vti +XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-quirks.sxp +XEN_CONFIGS-$(CONFIG_XEND) += xend-pci-permissive.sxp + XEN_CONFIGS += xlexample.hvm XEN_CONFIGS += xlexample.pvlinux -XEN_CONFIGS += xend-pci-quirks.sxp -XEN_CONFIGS += xend-pci-permissive.sxp XEN_CONFIGS += xl.conf XEN_CONFIGS += cpupool +XEN_CONFIGS += $(XEN_CONFIGS-y) + .PHONY: all all: -- cgit v1.2.3