X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Finclude.am;h=bb35bdf5f27e44c1dd3d6029054f67002b4ed0b7;hb=5caec883b96337590adb447438ff7be1e552bf30;hp=07d49a709b4b0d8b434aa45c682a48661d9882b8;hpb=4fe35ea1372eda035618c6e961f421187d3ae837;p=m6w6%2Flibmemcached diff --git a/clients/include.am b/clients/include.am index 07d49a70..bb35bdf5 100644 --- a/clients/include.am +++ b/clients/include.am @@ -2,10 +2,9 @@ # included from Top Level Makefile.am # All paths should be given relative to the root -CLIENTS_LDADDS = \ - $(LIBM) \ - clients/libutilities.la \ - libmemcached/libmemcached.la +CLIENTS_LDADDS= \ + clients/libutilities.la \ + libmemcached/libmemcached.la if HAVE_SASL CLIENTS_LDADDS+= $(LIBSASL) @@ -17,17 +16,22 @@ bin_PROGRAMS+= \ 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 \ @@ -44,53 +48,62 @@ noinst_HEADERS+= \ 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_memparse_SOURCES= clients/memparse.cc clients_memparse_LDADD= $(CLIENTS_LDADDS) -clients_memcp_SOURCES= clients/memcp.c +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_memslap_LDADD = $(PTHREAD_LIBS) clients/libgenexec.la $(CLIENTS_LDADDS) +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_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS) - -clients_memcapable_SOURCES= clients/memcapable.c + 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) -if BUILD_BYTEORDER -clients_memcapable_LDADD+= libmemcached/libbyteorder.la -endif test-start-server: clients/memflush --servers=localhost @@ -98,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