X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2FMakefile.am;h=244c80d3b9e5a01b7759e581b5acce77841b2e1a;hb=efa17fea71b96f27c95c1662cf03b3d5141d5a53;hp=0dbec9f311488824bb1210d5c2486b6f18a9db78;hpb=8af90ac15d8ba8ec464e5ad402ed2d27b95f81e3;p=m6w6%2Flibmemcached

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 0dbec9f3..244c80d3 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,38 +1,69 @@
-INCLUDES = -I$(top_builddir)
-LDADDS = $(top_builddir)/libmemcached/libmemcached.la
+LDADDS = $(top_builddir)/libmemcached/libmemcached.la libutilities.la
 
-bin_PROGRAMS = memcat memcp memstat memrm memflush memslap memerror
+bin_PROGRAMS = memcat memdump memcp memstat memrm memflush memslap memerror
 
 noinst_HEADERS = client_options.h \
 		utilities.h \
 		generator.h \
 		execute.h 
 
-memcat_SOURCES = memcat.c utilities.c
+noinst_LTLIBRARIES= libutilities.la libgenexec.la
+
+libutilities_la_SOURCES= utilities.c
+libgenexec_la_SOURCES= generator.c execute.c
+
+memcat_SOURCES = memcat.c
 memcat_LDADD = $(LDADDS)
 memcat_LDFLAGS = -rpath $(pkglibdir)
 
-memcp_SOURCES = memcp.c utilities.c
+memcp_SOURCES = memcp.c
 memcp_LDADD = $(LDADDS)
 memcp_LDFLAGS = -rpath $(pkglibdir)
 
-memstat_SOURCES = memstat.c utilities.c
+memdump_SOURCES = memdump.c
+memdump_LDADD = $(LDADDS)
+memdump_LDFLAGS = -rpath $(pkglibdir)
+
+memstat_SOURCES = memstat.c
 memstat_LDADD = $(LDADDS)
 memstat_LDFLAGS = -rpath $(pkglibdir)
 
-memrm_SOURCES = memrm.c utilities.c
+memrm_SOURCES = memrm.c
 memrm_LDADD = $(LDADDS)
 memrm_LDFLAGS = -rpath $(pkglibdir)
 
-memflush_SOURCES = memflush.c utilities.c
+memflush_SOURCES = memflush.c
 memflush_LDADD = $(LDADDS)
 memflush_LDFLAGS = -rpath $(pkglibdir)
 
-
-memerror_SOURCES = memerror.c utilities.c
+memerror_SOURCES = memerror.c
 memerror_LDADD = $(LDADDS)
 memerror_LDFLAGS = -rpath $(pkglibdir)
 
-memslap_SOURCES = memslap.c utilities.c generator.c execute.c
-memslap_LDADD = $(LDADDS) -lpthread
-memslap_LDFLAGS = -rpath $(pkglibdir)
+memslap_SOURCES = memslap.c
+memslap_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+memslap_LDADD = $(LDADDS) $(PTHREAD_LIBS) libgenexec.la
+memslap_LDFLAGS = $(AM_LDFLAGS) -rpath $(pkglibdir)
+
+test-start-server:
+	memflush --servers=localhost
+	memcp --servers=localhost /etc/services
+	memcat --servers=localhost /etc/services
+	memrm --servers=localhost /etc/services
+	memstat --servers=localhost
+	memslap --servers=localhost
+	memslap --servers=localhost --concurrency=10
+	memslap --servers=localhost --concurrency=10 --initial-load=1000
+	memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
+	memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
+	memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
+	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  memslap --servers=localhost
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=get
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set
+	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  memslap --servers=localhost --concurrency=10 --initial-load=1000 --execute-number=10 --test=set --non-blocking