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/blktap/drivers/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/blktap') diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index d2bd02f2e4..addb2fe765 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -3,14 +3,12 @@ include $(XEN_ROOT)/tools/Rules.mk IBIN = blktapctrl tapdisk QCOW_UTIL = img2qcow qcow2raw qcow-create -MEMSHR_DIR = ../../memshr CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -I../lib CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenstore) -CFLAGS += -I $(MEMSHR_DIR) CFLAGS += -D_GNU_SOURCE ifeq ($CONFIG_GCRYPT,y) @@ -23,7 +21,9 @@ endif MEMSHRLIBS := ifeq ($(CONFIG_Linux), y) +MEMSHR_DIR = ../../memshr CFLAGS += -DMEMSHR +CFLAGS += -I $(MEMSHR_DIR) MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif -- cgit v1.2.3