aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-03-21 18:05:49 +0000
committerIan Campbell <ian.campbell@citrix.com>2011-03-21 18:05:49 +0000
commitca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4 (patch)
tree0ab1f5bd7b6d51a2ff3b6ad80b3ccf15b8e74181 /tools/blktap2
parent3531dea6fd314a8734b08eac0bf9a7bb7ee7b37c (diff)
downloadxen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.gz
xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.tar.bz2
xen-ca366c33f32cce9b16c5f4ba4c5d26a0b1d429d4.zip
tools: consistently use $({CFLAGS,LDLIBS}_libxenctrl) instead of open coding.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/blktap2')
-rw-r--r--tools/blktap2/control/Makefile2
-rw-r--r--tools/blktap2/drivers/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index e2d76a524f..53384ac567 100644
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -12,7 +12,7 @@ CFLAGS += -Werror
CFLAGS += -Wno-unused
CFLAGS += -I../include -I../drivers
CFLAGS += $(CFLAGS_xeninclude)
-CFLAGS += -I$(XEN_LIBXC)
+CFLAGS += $(CFLAGS_libxenctrl)
CFLAGS += -D_GNU_SOURCE
CFLAGS += -DTAPCTL
diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile
index 54b2a64328..472dd62d9d 100644
--- a/tools/blktap2/drivers/Makefile
+++ b/tools/blktap2/drivers/Makefile
@@ -42,7 +42,7 @@ MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
endif
tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := $(LIBAIO_DIR)/libaio.a
-tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS += -I$(LIBAIO_DIR) -I$(XEN_LIBXC)
+tapdisk-client tapdisk-stream tapdisk-diff $(QCOW_UTIL): CFLAGS += -I$(LIBAIO_DIR)
ifeq ($(VHD_STATIC),y)
td-util: CFLAGS += -static