projects / m6w6 / libmemcached / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree | github
raw | inline | side by side
Fix cppcheck warnings.
[m6w6/libmemcached] / clients / include.am
diff --git a/clients/include.am b/clients/include.am
index a744cf789b39b852b2928632b9dc4ceac01fb798..aeda9f85bdb340df8c4325bd942592cbd39fa0ea 100644 (file)
--- a/clients/include.am
+++ b/clients/include.am
@@ -3,7 +3,6 @@
 # All paths should be given relative to the root
 
 CLIENTS_LDADDS= \
-               $(LIBM) \
                clients/libutilities.la \
                libmemcached/libmemcached.la
 
@@ -12,36 +11,41 @@ CLIENTS_LDADDS+= $(LIBSASL)
 endif
 
 bin_PROGRAMS+= \
-       clients/memcapable \
-       clients/memcat \
-       clients/memcp \
-       clients/memdump \
-       clients/memerror \
-       clients/memflush \
-       clients/memparse \
-       clients/memrm \
-       clients/memslap \
-       clients/memstat
-
+              clients/memcapable \
+              clients/memcat \
+              clients/memcp \
+              clients/memdump \
+              clients/memerror \
+              clients/memexist \
+              clients/memtouch \
+              clients/memflush \
+              clients/memparse \
+              clients/memping \
+              clients/memrm \
+              clients/memslap \
+              clients/memstat
+
+if BUILD_MEMASLAP
 if HAVE_LIBEVENT
 if !BUILD_WIN32_WRAPPERS
   bin_PROGRAMS+= clients/memaslap
 endif
 endif
+endif
 
 noinst_HEADERS+= \
-               clients/client_options.h \
-               clients/execute.h \
-               clients/generator.h \
-               clients/ms_atomic.h \
-               clients/ms_conn.h \
-               clients/ms_memslap.h \
-               clients/ms_setting.h \
-               clients/ms_sigsegv.h \
-               clients/ms_stats.h \
-               clients/ms_task.h \
-               clients/ms_thread.h \
-               clients/utilities.h
+                clients/client_options.h \
+                clients/execute.h \
+                clients/generator.h \
+                clients/ms_atomic.h \
+                clients/ms_conn.h \
+                clients/ms_memslap.h \
+                clients/ms_setting.h \
+                clients/ms_sigsegv.h \
+                clients/ms_stats.h \
+                clients/ms_task.h \
+                clients/ms_thread.h \
+                clients/utilities.h
 
 noinst_LTLIBRARIES+= clients/libutilities.la
 clients_libutilities_la_SOURCES= clients/utilities.cc
@@ -64,15 +68,26 @@ clients_memstat_LDADD= $(CLIENTS_LDADDS)
 clients_memrm_SOURCES= clients/memrm.cc
 clients_memrm_LDADD= $(CLIENTS_LDADDS)
 
+clients_memexist_SOURCES= clients/memexist.cc
+clients_memexist_LDADD= $(CLIENTS_LDADDS)
+
+clients_memtouch_SOURCES= clients/memtouch.cc
+clients_memtouch_LDADD= $(CLIENTS_LDADDS)
+
 clients_memflush_SOURCES= clients/memflush.cc
 clients_memflush_LDADD= $(CLIENTS_LDADDS)
 
+clients_memping_SOURCES= clients/memping.cc
+clients_memping_LDADD= $(CLIENTS_LDADDS) libmemcached/libmemcachedutil.la
+
 clients_memerror_SOURCES= clients/memerror.cc
 clients_memerror_LDADD= $(CLIENTS_LDADDS)
 
 clients_memslap_SOURCES = clients/memslap.cc
 clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memslap_LDADD = $(PTHREAD_LIBS) $(CLIENTS_LDADDS)
+clients_memslap_CXXFLAGS = ${PTHREAD_CFLAGS}
+clients_memslap_LDADD= $(CLIENTS_LDADDS)
+clients_memslap_LDADD+= $(PTHREAD_LIBS)
 
 clients_memaslap_SOURCES= \
                          clients/memaslap.c \
@@ -96,19 +111,19 @@ test-start-server:
        clients/memcat --servers=localhost /etc/services
        clients/memrm --servers=localhost /etc/services
        clients/memstat --servers=localhost
-       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
+       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
 
 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
+       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
Resurrection of libmemcached https://launchpad.net/libmemcached