-clients_memslap_LDADD = $(PTHREAD_LIBS) clients/libgenexec.la $(CLIENTS_LDADDS)
-
-clients_memaslap_SOURCES= \
- clients/memaslap.c \
- clients/ms_conn.c \
- clients/ms_setting.c \
- clients/ms_sigsegv.c \
- clients/ms_stats.c \
- clients/ms_task.c \
- clients/ms_thread.c
-clients_memaslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
-
-clients_memcapable_SOURCES= \
- clients/memcapable.cc \
- libmemcached/byteorder.cc
+clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
+clients_memslap_CXXFLAGS= @PTHREAD_CFLAGS@
+clients_memslap_LDADD= $(CLIENTS_LDADDS)
+clients_memslap_LDADD+= @PTHREAD_LIBS@
+
+clients_memaslap_SOURCES=
+clients_memaslap_SOURCES+= clients/memaslap.c
+clients_memaslap_SOURCES+= clients/ms_conn.c
+clients_memaslap_SOURCES+= clients/ms_setting.c
+clients_memaslap_SOURCES+= clients/ms_sigsegv.c
+clients_memaslap_SOURCES+= clients/ms_stats.c
+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=
+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