Re: [Xen-devel] [PATCH 08/20] tools: Use PTHREAD_CFLAGS, _LDFLAGS, _LIBS

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Fri, 2012-03-16 at 16:26 +0000, Ian Jackson wrote:
> 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@xxxxxxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

> ---
>  tools/blktap/drivers/Makefile       |    7 +++++--
>  tools/libfsimage/common/Makefile    |    5 ++++-
>  tools/vtpm_manager/manager/Makefile |    4 +++-
>  tools/xenpaging/Makefile            |    5 +++--
>  4 files changed, 15 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
> index d2bd02f..7535011 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
> diff --git a/tools/libfsimage/common/Makefile 
> b/tools/libfsimage/common/Makefile
> index 11621e7..3684913 100644
> --- a/tools/libfsimage/common/Makefile
> +++ b/tools/libfsimage/common/Makefile
> @@ -8,6 +8,9 @@ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
>  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.$(MAJOR).$(MINOR)
>       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 --git a/tools/vtpm_manager/manager/Makefile 
> b/tools/vtpm_manager/manager/Makefile
> index 149f01d..7564af1 100644
> --- a/tools/vtpm_manager/manager/Makefile
> +++ b/tools/vtpm_manager/manager/Makefile
> @@ -33,4 +33,6 @@ $(BIN): $(OBJS)
>  
>  # 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 --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
> index 08230a6..548d9dd 100644
> --- a/tools/xenpaging/Makefile
> +++ b/tools/xenpaging/Makefile
> @@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel