From d224b3e2b39f1fa20e7197bee260f65edd803fb3 Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Thu, 9 Jun 2011 10:36:11 -0700 Subject: [PATCH] Makefile.am: Add -lpthread to UNITTEST_LDADD Signed-off-by: Colin McCabe --- src/Makefile.am | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ccc612f2b0da4..f47a8fc37dd2c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -367,7 +367,8 @@ UNITTEST_CXXFLAGS = \ -I$(top_builddir)/src/gtest/include UNITTEST_LDADD = \ $(top_builddir)/src/gtest/lib/libgtest.la \ - $(top_builddir)/src/gtest/lib/libgtest_main.la + $(top_builddir)/src/gtest/lib/libgtest_main.la \ + -lpthread unittest_encoding_SOURCES = test/encoding.cc unittest_encoding_LDADD = libceph.la -lpthread -lm \ @@ -378,8 +379,7 @@ check_PROGRAMS += unittest_encoding unittest_base64_SOURCES = test/base64.cc unittest_base64_LDFLAGS = -pthread ${AM_LDFLAGS} -unittest_base64_LDADD = libceph.la -lpthread -lm \ - ${UNITTEST_LDADD} +unittest_base64_LDADD = libceph.la -lm ${UNITTEST_LDADD} unittest_base64_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} check_PROGRAMS += unittest_base64 @@ -405,8 +405,7 @@ check_PROGRAMS += unittest_simple_spin unittest_librados_SOURCES = test/librados.cc unittest_librados_LDFLAGS = -pthread ${AM_LDFLAGS} -unittest_librados_LDADD = librados.la \ - ${UNITTEST_LDADD} +unittest_librados_LDADD = librados.la ${UNITTEST_LDADD} unittest_librados_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} check_PROGRAMS += unittest_librados @@ -417,15 +416,13 @@ check_PROGRAMS += unittest_bufferlist unittest_crypto_SOURCES = test/crypto.cc unittest_crypto_LDFLAGS = -lrt ${CRYPTO_LDFLAGS} ${AM_LDFLAGS} -unittest_crypto_LDADD = libceph.la ${CRYPTO_LIBS} \ - ${UNITTEST_LDADD} +unittest_crypto_LDADD = libceph.la ${CRYPTO_LIBS} ${UNITTEST_LDADD} unittest_crypto_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} check_PROGRAMS += unittest_crypto unittest_ceph_crypto_SOURCES = test/ceph_crypto.cc unittest_ceph_crypto_LDFLAGS = ${CRYPTO_LDFLAGS} ${AM_LDFLAGS} -unittest_ceph_crypto_LDADD = libcommon.a ${CRYPTO_LIBS} \ - ${UNITTEST_LDADD} +unittest_ceph_crypto_LDADD = libcommon.a ${CRYPTO_LIBS} ${UNITTEST_LDADD} unittest_ceph_crypto_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} check_PROGRAMS += unittest_ceph_crypto -- 2.39.5