[Pkg-xen-changes] [xen] 03/15: tools-disable.diff

[Ian Campbell]

This is an automated email from the git hooks/post-receive script.

ijc-guest pushed a commit to branch feature/4.4-updates
in repository xen.

commit 308779f063f3a220fb6f1ee837e3677c6fb13d55
Author: Bastian Blank <waldi at debian.org>
Date:   Sat Jul 5 11:47:23 2014 +0200

    tools-disable.diff
---
 tools/Makefile | 9 +++++----
 tools/Rules.mk | 4 ----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 00c69ee..2c95cc6 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,8 +19,6 @@ SUBDIRS-$(CONFIG_Linux) += memshr
 ifeq ($(CONFIG_X86)$(CONFIG_Linux),yy)
 SUBDIRS-$(CONFIG_BLKTAP1) += blktap
 endif
-SUBDIRS-$(CONFIG_Linux) += blktap2
-SUBDIRS-$(CONFIG_NetBSD) += blktap2
 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
 SUBDIRS-y += libfsimage
 SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
@@ -28,8 +26,11 @@ SUBDIRS-$(CONFIG_Linux) += libvchan
 
 # do not recurse in to a dir we are about to delete
 ifneq "$(MAKECMDGOALS)" "distclean"
-SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir
-SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir
+CONFIG_QEMU = $(CURDIR)/../qemu
+ifneq ($(wildcard $(CONFIG_QEMU)),)
+SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
+SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
+endif
 endif
 
 SUBDIRS-y += xenpmd
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 0d9d98c..74ce6bc 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -41,11 +41,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
 LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan
 SHLIB_libxenvchan  = -Wl,-rpath-link=$(XEN_LIBVCHAN)
 
-ifeq ($(CONFIG_Linux),y)
-LIBXL_BLKTAP ?= y
-else
 LIBXL_BLKTAP ?= n
-endif
 
 ifeq ($(LIBXL_BLKTAP),y)
 CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git