Mailing List Archive

[xen-unstable] tools: Use PTHREAD_CFLAGS, _LDFLAGS, _LIBS
# HG changeset patch
# User Ian Jackson <ian.jackson@eu.citrix.com>
# Date 1334150053 -3600
# Node ID 0ff2b4d05c2eaf7ab4cf62ec87f1ceea24f8830c
# Parent 22d34c10797b496a1da2f242512911f92f8f145b
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 <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---


diff -r 22d34c10797b -r 0ff2b4d05c2e tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile Wed Apr 11 14:14:12 2012 +0100
+++ b/tools/blktap/drivers/Makefile Wed Apr 11 14:14:13 2012 +0100
@@ -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
diff -r 22d34c10797b -r 0ff2b4d05c2e tools/libfsimage/common/Makefile
--- a/tools/libfsimage/common/Makefile Wed Apr 11 14:14:12 2012 +0100
+++ b/tools/libfsimage/common/Makefile Wed Apr 11 14:14:13 2012 +0100
@@ -8,6 +8,9 @@ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,map
LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
LDFLAGS = $(LDFLAGS-y)

+CFLAGS += $(PTHREAD_CFLAGS)
+LDFLAGS += $(PTHREAD_LDFLAGS)
+
LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c

PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
@@ -37,7 +40,7 @@ libfsimage.so.$(MAJOR): libfsimage.so.$(
ln -sf $< $@

libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ -lpthread
+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)

-include $(DEPS)

diff -r 22d34c10797b -r 0ff2b4d05c2e tools/vtpm_manager/manager/Makefile
--- a/tools/vtpm_manager/manager/Makefile Wed Apr 11 14:14:12 2012 +0100
+++ b/tools/vtpm_manager/manager/Makefile Wed Apr 11 14:14:13 2012 +0100
@@ -33,4 +33,6 @@ mrproper: clean

# libraries
LIBS += ../tcs/libTCS.a ../util/libTCGUtils.a ../crypto/libtcpaCrypto.a
-LIBS += -lcrypto -lpthread -lm
+LIBS += -lcrypto $(PTHREAD_LIBS) -lm
+CFLAGS += $(PTHREAD_CFLAGS)
+LDFLAGS += $(PTHREAD_LDFLAGS)
diff -r 22d34c10797b -r 0ff2b4d05c2e tools/xenpaging/Makefile
--- a/tools/xenpaging/Makefile Wed Apr 11 14:14:12 2012 +0100
+++ b/tools/xenpaging/Makefile Wed Apr 11 14:14:13 2012 +0100
@@ -1,8 +1,9 @@
XEN_ROOT=$(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk

-CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore)
-LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -pthread
+CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS)
+LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS)
+LDFLAGS += $(PTHREAD_LDFLAGS)

POLICY = default


_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xen.org
http://lists.xensource.com/xen-changelog