Merge lp:~mordred/libmemcached/internal-abi-privacy into lp:~tangent-org/libmemcached/trunk

[Monty Taylor]

[Monty Taylor (mordred)]

Hides the memcached_string functions, but also demonstrates the mechanism we can use for hiding things that we need in executables in the tree. Namely:

- Mark the API entries as _LOCAL, so that they are hidden via the hidden attribute
- Move the implementation files from the main lib to a noinst convenience lib
- Link the conv lib into the main lib, but also link it with the in-tree programs that need the symbols
- WIN

=== modified file 'libmemcached/include.am'
--- libmemcached/include.am	2009-12-22 06:58:44 +0000
+++ libmemcached/include.am	2009-12-29 19:27:12 +0000
@@ -55,10 +55,19 @@
 
 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 +101,6 @@
 	libmemcached/stats.c \
 	libmemcached/storage.c \
 	libmemcached/strerror.c \
-	libmemcached/string.c \
 	libmemcached/verbosity.c \
 	libmemcached/version.c
 
@@ -101,8 +109,8 @@
 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

=== modified file 'libmemcached/string.h'
--- libmemcached/string.h	2009-12-16 23:01:10 +0000
+++ libmemcached/string.h	2009-12-29 19:27:12 +0000
@@ -16,6 +16,7 @@
 extern "C" {
 #endif
 
+LIBMEMCACHED_LOCAL
 struct memcached_string_st {
   memcached_st *root;
   char *end;
@@ -33,26 +34,26 @@
 #define memcached_string_size(A) (A)->current_size
 #define memcached_string_value(A) (A)->string
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_string_st *memcached_string_create(memcached_st *ptr,
                                              memcached_string_st *string,
                                              size_t initial_size);
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_check(memcached_string_st *string, size_t need);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 char *memcached_string_c_copy(memcached_string_st *string);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_append_character(memcached_string_st *string,
                                                      char character);
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_append(memcached_string_st *string,
                                            const char *value, size_t length);
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_return_t memcached_string_reset(memcached_string_st *string);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 void memcached_string_free(memcached_string_st *string);
 
 #ifdef __cplusplus

=== modified file 'tests/include.am'
--- tests/include.am	2009-12-19 01:28:01 +0000
+++ tests/include.am	2009-12-29 19:27:12 +0000
@@ -48,6 +48,7 @@
 	clients/libgenexec.la \
 	tests/libserver.la \
 	tests/libtest.la \
+	libmemcached/libmemcachedinternal.la \
 	$(TESTS_LDADDS)
 tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)