Merge in scanner code.

[awesomized/libmemcached] / clients / include.am

diff --git a/clients/include.am b/clients/include.am
index d91ebc661c9cfe07a6189775cc958540d2dda19c..f7503754649028eb6ae48ef96911e808dcb2bade 100644 (file)
--- 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,12 +18,15 @@ bin_PROGRAMS+= \
        clients/memdump \
        clients/memerror \
        clients/memflush \
+       clients/memparse \
        clients/memrm \
        clients/memstat
 
 if HAVE_LIBEVENT
+if !BUILD_WIN32_WRAPPERS
   bin_PROGRAMS+= clients/memslap
 endif
+endif
 
 noinst_HEADERS+= \
                clients/client_options.h \
@@ -43,6 +51,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)
 
@@ -72,8 +83,9 @@ clients_memslap_SOURCES= \
 clients_memslap_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:
@@ -90,7 +102,7 @@ test-start-server:
        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:
+client-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