From 9c09f9dec695c7035a4ab6a338e767d0d8a54b0c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 11 Apr 2012 14:14:13 +0100 Subject: tools: Use PTHREAD_CFLAGS, _LDFLAGS, _LIBS Replace all literal occurrences of -lpthread and -pthread in Makefiles by references to PTHREAD_CFLAGS, PTHREAD_LDFLAGS and PTHREAD_LIBS. These are the new variables set by configure, and currently expand to -pthread on the compilation and link lines as is required. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- tools/blktap/drivers/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools/blktap') diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index addb2fe765..941592ecc5 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -35,8 +35,11 @@ else AIOLIBS := -laio endif -LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -L../lib -lblktap -lrt -lm -lpthread -LDLIBS_img := $(AIOLIBS) $(CRYPT_LIB) -lpthread -lz +CFLAGS += $(PTHREAD_CFLAGS) +LDFLAGS += $(PTHREAD_LDFLAGS) + +LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -L../lib -lblktap -lrt -lm $(PTHREAD_LIBS) +LDLIBS_img := $(AIOLIBS) $(CRYPT_LIB) $(PTHREAD_LIBS) -lz BLK-OBJS-y := block-aio.o BLK-OBJS-y += block-sync.o -- cgit v1.2.3