From: Wei Liu Date: Mon, 4 Sep 2017 13:44:47 +0000 (+0100) Subject: tools: eliminate LIBXL_BLKTAP2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=007a5a5c587d8bbed7c10aaf89d35d18061e1a97;p=people%2Froyger%2Fxen.git tools: eliminate LIBXL_BLKTAP2 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 --- 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 74c70abcf4..aee0a4c374 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