X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=30095b14405b0dd12c80fd8f67417bad5eb25742;hb=7f192e3ce089fb207186dd4079cc377c90631976;hp=d8549d69e68a884e46bb4023e1c5c0bf15922f0d;hpb=8f36e509f6130022162abf7cde7e6c8acbbe224c;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index d8549d69..30095b14 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -10,6 +10,7 @@ EXTRA_DIST+= \
 noinst_HEADERS+= \
 		 libmemcached/byteorder.h \
 		 libmemcached/common.h \
+		 libmemcached/do.h \
 		 libmemcached/internal.h \
 		 libmemcached/io.h \
 		 libmemcached/libmemcached_probes.h \
@@ -43,7 +44,9 @@ nobase_include_HEADERS+= \
 			 libmemcached/protocol_handler.h \
 			 libmemcached/quit.h \
 			 libmemcached/result.h \
+                         libmemcached/sasl.h \
 			 libmemcached/server.h \
+			 libmemcached/server_list.h \
 			 libmemcached/stats.h \
 			 libmemcached/storage.h \
 			 libmemcached/strerror.h \
@@ -62,7 +65,7 @@ libmemcached_libmemcachedprotocol_la_SOURCES =  \
 						libmemcached/protocol/pedantic.c \
 						libmemcached/protocol/protocol_handler.c
 
-libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
+libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
 
 noinst_LTLIBRARIES+= \
 		     libmemcached/libmemcachedcallbacks.la
@@ -73,9 +76,9 @@ libmemcached_libmemcachedcallbacks_la_SOURCES = libmemcached/callback.c
 # This noinst lib contains things we want to be ABI private but still want to
 # either use in client programs or be able to test in test cases
 # These symbols will not be exposed in the shipped .so
-noinst_LTLIBRARIES+= \
-		     libmemcached/libmemcachedinternal.la
-libmemcached_libmemcachedinternal_la_SOURCES = libmemcached/string.c
+noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
+libmemcached_libmemcachedinternal_la_SOURCES= \
+					      libmemcached/string.c
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
@@ -85,7 +88,6 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/auto.c \
 				       libmemcached/behavior.c \
 				       libmemcached/connect.c \
-				       libmemcached/crc.c \
 				       libmemcached/delete.c \
 				       libmemcached/do.c \
 				       libmemcached/dump.c \
@@ -96,17 +98,15 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/hash.c \
 				       libmemcached/hosts.c \
 				       libmemcached/io.c \
-				       libmemcached/jenkins_hash.c \
 				       libmemcached/key.c \
-				       libmemcached/md5.c \
 				       libmemcached/memcached.c \
-				       libmemcached/murmur_hash.c \
 				       libmemcached/parse.c \
 				       libmemcached/purge.c \
 				       libmemcached/quit.c \
 				       libmemcached/response.c \
 				       libmemcached/result.c \
 				       libmemcached/server.c \
+				       libmemcached/server_list.c \
 				       libmemcached/stats.c \
 				       libmemcached/storage.c \
 				       libmemcached/strerror.c \
@@ -114,22 +114,21 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/version.c
 
 
-if INCLUDE_HSIEH_SRC
-libmemcached_libmemcached_la_SOURCES += libmemcached/hsieh_hash.c
-endif
-
-libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
-libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
+libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
+libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la libhashkit/libhashkitinc.la
 libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 if BUILD_LIBMEMCACHEDUTIL
 nobase_include_HEADERS+= \
 			 libmemcached/memcached_util.h \
+			 libmemcached/util/ping.h \
 			 libmemcached/util/pool.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif
 
-libmemcached_libmemcachedutil_la_SOURCES= libmemcached/util/pool.c
+libmemcached_libmemcachedutil_la_SOURCES= \
+					  libmemcached/util/ping.c \
+					  libmemcached/util/pool.c
 libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
 libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
 libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
@@ -143,6 +142,11 @@ libmemcached_libmemcachedprotocol_la_LIBADD=libmemcached/libbyteorder.la
 libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
 endif
 
+if HAVE_SASL
+libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL)
+libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
+endif
+
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h
 libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d