X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=123b1af3f4660c7720d3b7690c4cb64b766aa14d;hb=7202efa0916ab09b135ad93083e63ed01c854330;hp=481329e6f78507be055364de9f4ed1256ec45d68;hpb=95fd67da4903671adb5731b710798843938e8536;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 481329e6..123b1af3 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -3,114 +3,135 @@
 # All paths should be given relative to the root
 
 EXTRA_DIST+= \
-	libmemcached/libmemcached_probes.d \
-	libmemcached/memcached/README.txt \
-	libmemcached/memcached_configure.h.in
-
+	     libmemcached/configure.h.in \
+	     libmemcached/libmemcached_probes.d \
+	     libmemcached/memcached/README.txt
 
 noinst_HEADERS+= \
-	libmemcached/byteorder.h \
-	libmemcached/libmemcached_probes.h \
-	libmemcached/io.h \
-	libmemcached/internal.h \
-	libmemcached/common.h \
-	libmemcached/memcached/protocol_binary.h \
-	libmemcached/protocol/common.h \
-	libmemcached/protocol/ascii_handler.h \
-	libmemcached/protocol/binary_handler.h
-
-nobase_pkginclude_HEADERS+= \
-	libmemcached/analyze.h \
-	libmemcached/auto.h \
-	libmemcached/behavior.h \
-	libmemcached/callback.h \
-	libmemcached/constants.h \
-	libmemcached/dump.h \
-	libmemcached/exception.hpp \
-	libmemcached/get.h \
-	libmemcached/memcached.h \
-	libmemcached/memcached.hpp \
-	libmemcached/memcached_configure.h \
-	libmemcached/protocol/cache.h \
-	libmemcached/protocol/callback.h \
-	libmemcached/protocol_handler.h \
-	libmemcached/result.h \
-	libmemcached/server.h \
-	libmemcached/stats.h \
-	libmemcached/storage.h \
-	libmemcached/string.h \
-	libmemcached/types.h \
-	libmemcached/visibility.h \
-	libmemcached/watchpoint.h
-
-
+		 libmemcached/byteorder.h \
+		 libmemcached/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/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
 
 lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
 libmemcached_libmemcachedprotocol_la_SOURCES =  \
-	libmemcached/protocol/ascii_handler.c \
-	libmemcached/protocol/binary_handler.c \
-	libmemcached/protocol/cache.c \
-	libmemcached/protocol/pedantic.c \
-	libmemcached/protocol/protocol_handler.c
+						libmemcached/protocol/ascii_handler.c \
+						libmemcached/protocol/binary_handler.c \
+						libmemcached/protocol/cache.c \
+						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
 
-noinst_LTLIBRARIES+= libmemcached/libmemcachedcallbacks.la
 libmemcached_libmemcachedcallbacks_la_CFLAGS = ${AM_CFLAGS} ${NO_STRICT_ALIASING}
 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
+
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
 libmemcached_libmemcached_la_SOURCES = \
-	libmemcached/allocators.c \
-	libmemcached/analyze.c \
-	libmemcached/auto.c \
-	libmemcached/behavior.c \
-	libmemcached/connect.c \
-	libmemcached/crc.c \
-	libmemcached/delete.c \
-	libmemcached/do.c \
-	libmemcached/dump.c \
-	libmemcached/fetch.c \
-	libmemcached/flush.c \
-	libmemcached/flush_buffers.c \
-	libmemcached/get.c \
-	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/stats.c \
-	libmemcached/storage.c \
-	libmemcached/strerror.c \
-	libmemcached/string.c \
-	libmemcached/verbosity.c \
-	libmemcached/version.c
-
-
-if INCLUDE_HSIEH_SRC
-libmemcached_libmemcached_la_SOURCES += libmemcached/hsieh_hash.c
-endif
-
-libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la
-libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la
-libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+				       libmemcached/allocators.c \
+				       libmemcached/analyze.c \
+				       libmemcached/auto.c \
+				       libmemcached/behavior.c \
+				       libmemcached/connect.c \
+				       libmemcached/delete.c \
+				       libmemcached/do.c \
+				       libmemcached/dump.c \
+				       libmemcached/fetch.c \
+				       libmemcached/flush.c \
+				       libmemcached/flush_buffers.c \
+				       libmemcached/get.c \
+				       libmemcached/hash.c \
+				       libmemcached/hosts.c \
+				       libmemcached/io.c \
+				       libmemcached/key.c \
+				       libmemcached/memcached.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 \
+				       libmemcached/verbosity.c \
+				       libmemcached/version.c
+
+
+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
-pkginclude_HEADERS+= libmemcached/memcached_util.h libmemcached/util/pool.h
+nobase_include_HEADERS+= \
+			 libmemcached/memcached_util.h \
+			 libmemcached/util.h \
+			 libmemcached/util/ping.h \
+			 libmemcached/util/pool.h \
+			 libmemcached/util/version.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/util/version.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
@@ -124,21 +145,29 @@ 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
+CLEANFILES+= libmemcached/dtrace_probes.h
 endif
 
 if DTRACE_NEEDS_OBJECTS
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+CLEANFILES+= libmemcached/libmemcached_probes.o
 endif
 
 SUFFIXES+= .d
 
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
-	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s libmemcached/libmemcached_probes.d
+	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
+
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d $(libmemcached_libmemcached_la_OBJECTS)
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/.libs/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
+.d.o:
+	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s ${top_srcdir}/libmemcached/libmemcached_probes.d `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\//"`