diff mbox

[4/4] tools: eliminate LIBXL_BLKTAP2

Message ID 20170904134447.19176-5-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu Sept. 4, 2017, 1:44 p.m. UTC 
Use CONFIG_BLKTAP2 directly. There is no reason why one would want to
set LIBXL_BLKTAP2 separately as things stand.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/Rules.mk       | 4 +---
 tools/libxl/Makefile | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 4592601db1..dbc7635112 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -163,9 +163,7 @@  else
 CFLAGS += -O2 -fomit-frame-pointer
 endif
 
-LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2)
-
-ifeq ($(LIBXL_BLKTAP),y)
+ifeq ($(CONFIG_BLKTAP2),y)
 CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)
 SHDEPS_libblktapctl =
 LDLIBS_libblktapctl = $(SHDEPS_libblktapctl) $(XEN_BLKTAP2)/control/libblktapctl$(libextension)
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 082af8f716..bbfc0c0708 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -46,7 +46,7 @@  LIBXL_LIBS += $(LIBXL_LIBS-y)
 LIBXLU_LIBS = $(LDLIBS_libxenlight)
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o
-ifeq ($(LIBXL_BLKTAP),y)
+ifeq ($(CONFIG_BLKTAP2),y)
 LIBXL_OBJS-y += libxl_blktap2.o
 else
 LIBXL_OBJS-y += libxl_noblktap2.o