X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=50fcea692fdf98f0915d7439905c7939d07f6566;hb=e7561db4b56f2e78948710a0f360f65f5703a8e6;hp=ca20cd9b6ffafda1142d0120a41ebe450be72200;hpb=aa6c27c9b67a335f24a45bd9c100227eb2845d24;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index ca20cd9b..50fcea69 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -3,10 +3,9 @@
 # All paths should be given relative to the root
 
 EXTRA_DIST+= \
+	     libmemcached/configure.h.in \
 	     libmemcached/libmemcached_probes.d \
-	     libmemcached/memcached/README.txt \
-	     libmemcached/memcached_configure.h.in
-
+	     libmemcached/memcached/README.txt
 
 noinst_HEADERS+= \
 		 libmemcached/byteorder.h \
@@ -14,36 +13,34 @@ noinst_HEADERS+= \
 		 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
-
-
+nobase_include_HEADERS+= \
+			 libmemcached/analyze.h \
+			 libmemcached/auto.h \
+			 libmemcached/behavior.h \
+			 libmemcached/callback.h \
+			 libmemcached/configure.h \
+			 libmemcached/constants.h \
+			 libmemcached/dump.h \
+			 libmemcached/exception.hpp \
+			 libmemcached/get.h \
+			 libmemcached/memcached.h \
+			 libmemcached/memcached.hpp \
+			 libmemcached/memcached/protocol_binary.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 =  \
@@ -55,10 +52,19 @@ libmemcached_libmemcachedprotocol_la_SOURCES =  \
 
 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 = \
@@ -92,7 +98,6 @@ libmemcached_libmemcached_la_SOURCES = \
 				       libmemcached/stats.c \
 				       libmemcached/storage.c \
 				       libmemcached/strerror.c \
-				       libmemcached/string.c \
 				       libmemcached/verbosity.c \
 				       libmemcached/version.c
 
@@ -101,12 +106,14 @@ 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
-pkginclude_HEADERS+= libmemcached/memcached_util.h libmemcached/util/pool.h
+nobase_include_HEADERS+= \
+			 libmemcached/memcached_util.h \
+			 libmemcached/util/pool.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif