From 645c523d0a7654e38641266249c0c0c9d1a3fe0a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Mar 2012 17:02:23 +0100 Subject: tools/blktap: reorder MEMSHR_DIR to fix CFLAGS In blktap2 MEMSHR_DIR is used before it is set. This removes the required -D_GNU_SOURCE from CFLAGS, its used as option for -I Fix this by moving memshr related flags to the place where its actually used. The failure is a missing O_DIRECT define. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- tools/blktap2/drivers/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/blktap2') diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 15e1bc0df8..2f93d2d1cc 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -14,7 +14,6 @@ CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers CFLAGS += $(CFLAGS_libxenctrl) -CFLAGS += -I $(MEMSHR_DIR) CFLAGS += -D_GNU_SOURCE CFLAGS += -DUSE_NFS_LOCKS @@ -38,11 +37,11 @@ else tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := -laio endif -MEMSHR_DIR = $(XEN_ROOT)/tools/memshr - MEMSHRLIBS := ifeq ($(CONFIG_Linux), __fixme__) +MEMSHR_DIR = $(XEN_ROOT)/tools/memshr CFLAGS += -DMEMSHR +CFLAGS += -I $(MEMSHR_DIR) MEMSHRLIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl $(MEMSHR_DIR)/libmemshr.a endif -- cgit v1.2.3