Merge bzr://soup.haus/ Build: jenkins-Libmemcached-472

[awesomized/libmemcached] / clients / include.am

diff --git a/clients/include.am b/clients/include.am
index 7758e483d01f404fc3ca078bb0c2d1ffd8586727..50c76cc631bbb7c04b3c7e0a0292660e24f78036 100644 (file)
--- a/clients/include.am
+++ b/clients/include.am
@@ -79,9 +79,9 @@ clients_memerror_LDADD= $(CLIENTS_LDADDS)
 
 clients_memslap_SOURCES = clients/memslap.cc
 clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memslap_CXXFLAGS = ${PTHREAD_CFLAGS}
+clients_memslap_CXXFLAGS= @PTHREAD_CFLAGS@
 clients_memslap_LDADD= $(CLIENTS_LDADDS)
-clients_memslap_LDADD+= $(PTHREAD_LIBS)
+clients_memslap_LDADD+= @PTHREAD_LIBS@
 
 clients_memaslap_SOURCES=
 clients_memaslap_SOURCES+= clients/memaslap.c 
@@ -93,12 +93,16 @@ clients_memaslap_SOURCES+= clients/ms_task.c
 clients_memaslap_SOURCES+= clients/ms_thread.c
 
 clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memaslap_LDADD= $(LTLIBEVENT) $(CLIENTS_LDADDS)
+clients_memaslap_LDADD=
+clients_memaslap_LDADD+= @LIBEVENT_LIB@
+clients_memaslap_LDADD+= $(CLIENTS_LDADDS)
 
+clients_memcapable_CXXFLAGS= @PTHREAD_CFLAGS@
 clients_memcapable_SOURCES=
 clients_memcapable_SOURCES+= clients/memcapable.cc
 clients_memcapable_SOURCES+= libmemcached/byteorder.cc
 clients_memcapable_LDADD= $(CLIENTS_LDADDS)
+clients_memcapable_LDADD+= @PTHREAD_LIBS@
 
 test-start-server:
        clients/memflush --servers=localhost