X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Finclude.am;h=98319e1e528bc5ab86e7c9002826fda2770c2b77;hb=2569efffe16042f47dc5d2c34528a9ec22fc18b0;hp=05b1ed7e32e1574238a92888a8400286a32f8069;hpb=67456d74f5bd4f354a360d70da503dc58cbe5971;p=awesomized%2Flibmemcached diff --git a/clients/include.am b/clients/include.am index 05b1ed7e..98319e1e 100644 --- a/clients/include.am +++ b/clients/include.am @@ -2,53 +2,52 @@ # 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_LDADDS+= clients/libutilities.la +CLIENTS_LDADDS+= libmemcached/libmemcached.la if HAVE_SASL 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 - +bin_PROGRAMS+= clients/memcapable +bin_PROGRAMS+= clients/memcat +bin_PROGRAMS+= clients/memcp +bin_PROGRAMS+= clients/memdump +bin_PROGRAMS+= clients/memerror +bin_PROGRAMS+= clients/memexist +bin_PROGRAMS+= clients/memtouch +bin_PROGRAMS+= clients/memflush +bin_PROGRAMS+= clients/memparse +bin_PROGRAMS+= clients/memping +bin_PROGRAMS+= clients/memrm +bin_PROGRAMS+= clients/memslap +bin_PROGRAMS+= 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 +noinst_HEADERS+= clients/client_options.h +noinst_HEADERS+= clients/execute.h +noinst_HEADERS+= clients/generator.h +noinst_HEADERS+= clients/ms_atomic.h +noinst_HEADERS+= clients/ms_conn.h +noinst_HEADERS+= clients/ms_memslap.h +noinst_HEADERS+= clients/ms_setting.h +noinst_HEADERS+= clients/ms_sigsegv.h +noinst_HEADERS+= clients/ms_stats.h +noinst_HEADERS+= clients/ms_task.h +noinst_HEADERS+= clients/ms_thread.h +noinst_HEADERS+= clients/utilities.h noinst_LTLIBRARIES+= clients/libutilities.la clients_libutilities_la_SOURCES= clients/utilities.cc -noinst_LTLIBRARIES+= clients/libgenexec.la -clients_libgenexec_la_SOURCES= clients/generator.cc clients/execute.cc - clients_memcat_SOURCES= clients/memcat.cc clients_memcat_LDADD= $(CLIENTS_LDADDS) @@ -67,28 +66,42 @@ 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_LDADD = $(PTHREAD_LIBS) clients/libgenexec.la $(CLIENTS_LDADDS) - -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.cc \ - libmemcached/byteorder.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_SOURCES+= clients/memaslap.c +clients_memaslap_SOURCES+= clients/ms_conn.c +clients_memaslap_SOURCES+= clients/ms_setting.c +clients_memaslap_SOURCES+= clients/ms_sigsegv.c +clients_memaslap_SOURCES+= clients/ms_stats.c +clients_memaslap_SOURCES+= clients/ms_task.c +clients_memaslap_SOURCES+= clients/ms_thread.c + +clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc +clients_memaslap_LDADD= $(LTLIBEVENT) $(CLIENTS_LDADDS) + +clients_memcapable_SOURCES= +clients_memcapable_SOURCES+= clients/memcapable.cc +clients_memcapable_SOURCES+= libmemcached/byteorder.cc clients_memcapable_LDADD= $(CLIENTS_LDADDS) test-start-server: @@ -97,19 +110,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