From 5c7cbadaccca8dbb47f2c42ab1b5a8afac9275e3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 15 May 2013 14:47:32 +0100 Subject: 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 Acked-by: Ian Jackson --- Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3