projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for release.
[awesomized/libmemcached]
/
clients
/
include.am
diff --git
a/clients/include.am
b/clients/include.am
index 98319e1e528bc5ab86e7c9002826fda2770c2b77..bd38ef0420132ee9656b56bf93c34262c1527e64 100644
(file)
--- a/
clients/include.am
+++ b/
clients/include.am
@@
-6,10
+6,6
@@
CLIENTS_LDADDS=
CLIENTS_LDADDS+= clients/libutilities.la
CLIENTS_LDADDS+= libmemcached/libmemcached.la
CLIENTS_LDADDS+= clients/libutilities.la
CLIENTS_LDADDS+= libmemcached/libmemcached.la
-if HAVE_SASL
-CLIENTS_LDADDS+= $(LIBSASL)
-endif
-
bin_PROGRAMS+= clients/memcapable
bin_PROGRAMS+= clients/memcat
bin_PROGRAMS+= clients/memcp
bin_PROGRAMS+= clients/memcapable
bin_PROGRAMS+= clients/memcat
bin_PROGRAMS+= clients/memcp
@@
-83,9
+79,9
@@
clients_memerror_LDADD= $(CLIENTS_LDADDS)
clients_memslap_SOURCES = clients/memslap.cc
clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
clients_memslap_SOURCES = clients/memslap.cc
clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memslap_CXXFLAGS
= ${PTHREAD_CFLAGS}
+clients_memslap_CXXFLAGS
= @PTHREAD_CFLAGS@
clients_memslap_LDADD= $(CLIENTS_LDADDS)
clients_memslap_LDADD= $(CLIENTS_LDADDS)
-clients_memslap_LDADD+=
$(PTHREAD_LIBS)
+clients_memslap_LDADD+=
@PTHREAD_LIBS@
clients_memaslap_SOURCES=
clients_memaslap_SOURCES+= clients/memaslap.c
clients_memaslap_SOURCES=
clients_memaslap_SOURCES+= clients/memaslap.c
@@
-97,7
+93,9
@@
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_SOURCES+= clients/ms_thread.c
clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memaslap_LDADD= $(LTLIBEVENT) $(CLIENTS_LDADDS)
+clients_memaslap_LDADD=
+clients_memaslap_LDADD+= @LIBEVENT_LIB@
+clients_memaslap_LDADD+= $(CLIENTS_LDADDS)
clients_memcapable_SOURCES=
clients_memcapable_SOURCES+= clients/memcapable.cc
clients_memcapable_SOURCES=
clients_memcapable_SOURCES+= clients/memcapable.cc