X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=dc125bd70680aa35f06b3321e292f1d24bcee5d9;hb=475f477dab6dfc5e4f018d1ecfb128c37e2c44a0;hp=1a00204d8eddb4910e3ba4893841eb2159c9c1f8;hpb=46b28da059e5f3a0f7260a5df2c1cf98602b017b;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 1a00204d..dc125bd7 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -9,36 +9,51 @@ EXTRA_DIST+= \
 
 noinst_HEADERS+= \
 		 libmemcached/byteorder.h \
-		 libmemcached/libmemcached_probes.h \
-		 libmemcached/io.h \
-		 libmemcached/internal.h \
 		 libmemcached/common.h \
-		 libmemcached/protocol/common.h \
+		 libmemcached/do.h \
+		 libmemcached/internal.h \
+		 libmemcached/io.h \
+		 libmemcached/libmemcached_probes.h \
 		 libmemcached/protocol/ascii_handler.h \
-		 libmemcached/protocol/binary_handler.h
+		 libmemcached/protocol/binary_handler.h \
+		 libmemcached/protocol/common.h \
+		 libmemcached/response.h
 
 nobase_include_HEADERS+= \
+			 libmemcached/allocators.h \
 			 libmemcached/analyze.h \
 			 libmemcached/auto.h \
 			 libmemcached/behavior.h \
 			 libmemcached/callback.h \
 			 libmemcached/configure.h \
 			 libmemcached/constants.h \
+			 libmemcached/delete.h \
 			 libmemcached/dump.h \
 			 libmemcached/exception.hpp \
+			 libmemcached/fetch.h \
+			 libmemcached/flush.h \
+			 libmemcached/flush_buffers.h \
 			 libmemcached/get.h \
+			 libmemcached/hash.h \
 			 libmemcached/memcached.h \
 			 libmemcached/memcached.hpp \
 			 libmemcached/memcached/protocol_binary.h \
+			 libmemcached/parse.h \
 			 libmemcached/protocol/cache.h \
 			 libmemcached/protocol/callback.h \
 			 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 \
 			 libmemcached/string.h \
 			 libmemcached/types.h \
+			 libmemcached/verbosity.h \
+			 libmemcached/version.h \
 			 libmemcached/visibility.h \
 			 libmemcached/watchpoint.h
 
@@ -50,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
@@ -61,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}
@@ -73,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 \
@@ -84,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 \
@@ -102,12 +114,8 @@ 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
@@ -131,6 +139,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