X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Finclude.am;h=07d49a709b4b0d8b434aa45c682a48661d9882b8;hb=6bc6cf720913ae042f36e62e09abce7d340607ab;hp=d91ebc661c9cfe07a6189775cc958540d2dda19c;hpb=ab1cac43b7d6b8401ec0c196ed6bbab84e7c1a49;p=awesomized%2Flibmemcached

diff --git a/clients/include.am b/clients/include.am
index d91ebc66..07d49a70 100644
--- a/clients/include.am
+++ b/clients/include.am
@@ -3,9 +3,14 @@
 # All paths should be given relative to the root
 
 CLIENTS_LDADDS = \
+	$(LIBM) \
 	clients/libutilities.la \
 	libmemcached/libmemcached.la
 
+if HAVE_SASL
+CLIENTS_LDADDS+= $(LIBSASL)
+endif
+
 bin_PROGRAMS+= \
 	clients/memcapable \
 	clients/memcat \
@@ -13,11 +18,15 @@ bin_PROGRAMS+= \
 	clients/memdump \
 	clients/memerror \
 	clients/memflush \
+	clients/memparse \
 	clients/memrm \
+	clients/memslap \
 	clients/memstat
 
 if HAVE_LIBEVENT
-  bin_PROGRAMS+= clients/memslap
+if !BUILD_WIN32_WRAPPERS
+  bin_PROGRAMS+= clients/memaslap
+endif
 endif
 
 noinst_HEADERS+= \
@@ -43,6 +52,9 @@ clients_libgenexec_la_SOURCES= clients/generator.c clients/execute.c
 clients_memcat_SOURCES= clients/memcat.c
 clients_memcat_LDADD= $(CLIENTS_LDADDS)
 
+clients_memparse_SOURCES= clients/memparse.cc
+clients_memparse_LDADD= $(CLIENTS_LDADDS)
+
 clients_memcp_SOURCES= clients/memcp.c
 clients_memcp_LDADD= $(CLIENTS_LDADDS)
 
@@ -61,19 +73,23 @@ clients_memflush_LDADD= $(CLIENTS_LDADDS)
 clients_memerror_SOURCES= clients/memerror.c
 clients_memerror_LDADD= $(CLIENTS_LDADDS)
 
-clients_memslap_SOURCES= \
-		clients/memslap.c \
+clients_memslap_SOURCES = clients/memslap.c
+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_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
+clients_memaslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
 
 clients_memcapable_SOURCES= clients/memcapable.c
+clients_memcapable_LDADD= $(CLIENTS_LDADDS)
 if BUILD_BYTEORDER
-clients_memcapable_LDADD= libmemcached/libbyteorder.la
+clients_memcapable_LDADD+= libmemcached/libbyteorder.la
 endif
 
 test-start-server:
@@ -82,19 +98,19 @@ test-start-server:
 	clients/memcat --servers=localhost /etc/services
 	clients/memrm --servers=localhost /etc/services
 	clients/memstat --servers=localhost
-	clients/memslap --servers=localhost
-	clients/memslap --servers=localhost --concurrency=10
-	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000
-	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
-	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
-	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
-	clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking
-
-valgrind:
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking
+	clients/memaslap --servers=localhost
+	clients/memaslap --servers=localhost --concurrency=10
+	clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000
+	clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
+	clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
+	clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
+	clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking
+
+client-valgrind:
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memaslap --servers=localhost
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memaslap --servers=localhost --concurrency=10
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  clients/memaslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking