X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Finclude.am;h=281aa0b92060dee3909454cafc0f6b48d9776ea6;hb=635e02c96cff1d87c6c89853a8a157fd98db87e7;hp=2e4d87eeb58fdaed4bb92c994380669ba178b5a4;hpb=c801828a5a8937eeb9c008135185a6b5ab6199a9;p=awesomized%2Flibmemcached

diff --git a/clients/include.am b/clients/include.am
index 2e4d87ee..281aa0b9 100644
--- a/clients/include.am
+++ b/clients/include.am
@@ -2,9 +2,14 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-CLIENTS_LDADDS = \
-	clients/libutilities.la \
-	libmemcached/libmemcached.la
+CLIENTS_LDADDS= \
+		$(LIBM) \
+		clients/libutilities.la \
+		libmemcached/libmemcached.la
+
+if HAVE_SASL
+CLIENTS_LDADDS+= $(LIBSASL)
+endif
 
 bin_PROGRAMS+= \
 	clients/memcapable \
@@ -13,11 +18,17 @@ bin_PROGRAMS+= \
 	clients/memdump \
 	clients/memerror \
 	clients/memflush \
+	clients/memparse \
 	clients/memrm \
+	clients/memslap \
 	clients/memstat
 
+if BUILD_MEMASLAP
 if HAVE_LIBEVENT
-  bin_PROGRAMS+= clients/memslap
+if !BUILD_WIN32_WRAPPERS
+  bin_PROGRAMS+= clients/memaslap
+endif
+endif
 endif
 
 noinst_HEADERS+= \
@@ -35,46 +46,51 @@ noinst_HEADERS+= \
 		clients/utilities.h
 
 noinst_LTLIBRARIES+= clients/libutilities.la
-clients_libutilities_la_SOURCES= clients/utilities.c
+clients_libutilities_la_SOURCES= clients/utilities.cc
 
-noinst_LTLIBRARIES+= clients/libgenexec.la
-clients_libgenexec_la_SOURCES= clients/generator.c clients/execute.c
-
-clients_memcat_SOURCES= clients/memcat.c
+clients_memcat_SOURCES= clients/memcat.cc
 clients_memcat_LDADD= $(CLIENTS_LDADDS)
 
-clients_memcp_SOURCES= clients/memcp.c
+clients_memparse_SOURCES= clients/memparse.cc
+clients_memparse_LDADD= $(CLIENTS_LDADDS)
+
+clients_memcp_SOURCES= clients/memcp.cc
 clients_memcp_LDADD= $(CLIENTS_LDADDS)
 
-clients_memdump_SOURCES= clients/memdump.c
+clients_memdump_SOURCES= clients/memdump.cc
 clients_memdump_LDADD= $(CLIENTS_LDADDS)
 
-clients_memstat_SOURCES= clients/memstat.c
+clients_memstat_SOURCES= clients/memstat.cc
 clients_memstat_LDADD= $(CLIENTS_LDADDS)
 
-clients_memrm_SOURCES= clients/memrm.c
+clients_memrm_SOURCES= clients/memrm.cc
 clients_memrm_LDADD= $(CLIENTS_LDADDS)
 
-clients_memflush_SOURCES= clients/memflush.c
+clients_memflush_SOURCES= clients/memflush.cc
 clients_memflush_LDADD= $(CLIENTS_LDADDS)
 
-clients_memerror_SOURCES= clients/memerror.c
+clients_memerror_SOURCES= clients/memerror.cc
 clients_memerror_LDADD= $(CLIENTS_LDADDS)
 
-clients_memslap_SOURCES= \
-		clients/memslap.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_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
-
-clients_memcapable_SOURCES= clients/memcapable.c
-if BUILD_BYTEORDER
-clients_memcapable_LDADD= libmemcached/libbyteorder.la
-endif
+clients_memslap_SOURCES = clients/memslap.cc
+clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
+clients_memslap_LDADD = $(PTHREAD_LIBS) $(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_SOURCES+= clients/generator.cc clients/execute.cc
+clients_memaslap_LDADD= $(LTLIBEVENT) $(CLIENTS_LDADDS)
+
+clients_memcapable_SOURCES= \
+			    clients/memcapable.cc \
+			    libmemcached/byteorder.cc
+clients_memcapable_LDADD= $(CLIENTS_LDADDS)
 
 test-start-server:
 	clients/memflush --servers=localhost