X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Finclude.am;h=aeda9f85bdb340df8c4325bd942592cbd39fa0ea;hb=7d698ad128550cb4d2e3a60c83533c4370efd106;hp=d91ebc661c9cfe07a6189775cc958540d2dda19c;hpb=ab1cac43b7d6b8401ec0c196ed6bbab84e7c1a49;p=m6w6%2Flibmemcached

diff --git a/clients/include.am b/clients/include.am
index d91ebc66..aeda9f85 100644
--- a/clients/include.am
+++ b/clients/include.am
@@ -2,79 +2,108 @@
 # 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= \
+		clients/libutilities.la \
+		libmemcached/libmemcached.la
 
-bin_PROGRAMS+= \
-	clients/memcapable \
-	clients/memcat \
-	clients/memcp \
-	clients/memdump \
-	clients/memerror \
-	clients/memflush \
-	clients/memrm \
-	clients/memstat
+if HAVE_SASL
+CLIENTS_LDADDS+= $(LIBSASL)
+endif
 
+bin_PROGRAMS+= \
+	       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
-  bin_PROGRAMS+= clients/memslap
+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.c
-
-noinst_LTLIBRARIES+= clients/libgenexec.la
-clients_libgenexec_la_SOURCES= clients/generator.c clients/execute.c
+clients_libutilities_la_SOURCES= clients/utilities.cc
 
-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_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_memerror_SOURCES= clients/memerror.c
+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.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_CXXFLAGS = ${PTHREAD_CFLAGS}
+clients_memslap_LDADD= $(CLIENTS_LDADDS)
+clients_memslap_LDADD+= $(PTHREAD_LIBS)
+
+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
@@ -90,7 +119,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