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

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 481329e6..29a77538 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -3,106 +3,114 @@
 # 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/libmemcached_probes.d \
+	     libmemcached/memcached/README.txt \
+	     libmemcached/memcached_configure.h.in
 
 
 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
+		 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/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
 
 
 
 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 
 
-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
+				       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/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_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
+libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
 libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
 
 if BUILD_LIBMEMCACHEDUTIL