From 7ed06911dc596d23f21dee209b7f2db294e34b56 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 8 Oct 2014 09:41:27 +0200 Subject: [PATCH] Remove dead qemu code from toplevel Makefile After commit b0f69ec5c71de1248d915c193b57c43e786857dd ("tools: Make qemu-xen-traditional build optional.") the existing make targets are wrapped in ifeq ($(CONF),y), but CONF is never set because config/Tools.mk is not included. Drop the dead code. The same effect can be achieved by calling the make commands directly, after calling configure. A better approach would be a simple, single 'make $something' which should be a wrapper around a targets in tools/Makefile that clones, updates and cleans the subprojects. That has to be worked out in a different patch. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- Makefile | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Makefile b/Makefile index bf8028a331..0355b49d8a 100644 --- a/Makefile +++ b/Makefile @@ -64,28 +64,6 @@ docs: dist-docs install-xen: $(MAKE) -C xen install -ifeq ($(CONFIG_QEMU_TRAD),y) -QEMU_TRAD_DIR_TGT := tools/qemu-xen-traditional-dir - -tools/qemu-xen-traditional-dir: - $(MAKE) -C tools qemu-xen-traditional-dir-find - -.PHONY: tools/qemu-xen-traditional-dir-force-update -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 - .PHONY: install-tools install-tools: $(QEMU_TRAD_DIR_TARGET) $(QEMU_XEN_DIR_TARGET) $(MAKE) -C tools install -- 2.30.2