Merge working tree with build tree.

[m6w6/libmemcached] / clients / include.am

diff --git a/clients/include.am b/clients/include.am
index 98511366033a56f474dca4efdaddc7d4430381d0..bb35bdf5f27e44c1dd3d6029054f67002b4ed0b7 100644 (file)
--- a/clients/include.am
+++ b/clients/include.am
@@ -3,7 +3,6 @@
 # All paths should be given relative to the root
 
 CLIENTS_LDADDS= \
-               $(LIBM) \
                clients/libutilities.la \
                libmemcached/libmemcached.la
 
@@ -17,8 +16,11 @@ bin_PROGRAMS+= \
        clients/memcp \
        clients/memdump \
        clients/memerror \
+       clients/memexist \
+       clients/memtouch \
        clients/memflush \
        clients/memparse \
+       clients/memping \
        clients/memrm \
        clients/memslap \
        clients/memstat
@@ -66,16 +68,26 @@ 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_SOURCES+= clients/generator.cc clients/execute.cc
 clients_memslap_CXXFLAGS = ${PTHREAD_CFLAGS}
-clients_memslap_LDADD = $(PTHREAD_LIBS) $(CLIENTS_LDADDS)
+clients_memslap_LDADD= $(CLIENTS_LDADDS)
+clients_memslap_LDADD+= $(PTHREAD_LIBS)
 
 clients_memaslap_SOURCES= \
                          clients/memaslap.c \