Bool fix.

[awesomized/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index ca20cd9b6ffafda1142d0120a41ebe450be72200..aa96d923e34544c598be0733b48e566d3c4e7c4a 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -3,47 +3,57 @@
 # 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 \
-                libmemcached/libmemcached_probes.h \
-                libmemcached/io.h \
-                libmemcached/internal.h \
                 libmemcached/common.h \
-                libmemcached/memcached/protocol_binary.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
-
-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/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/server.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 =  \
@@ -55,10 +65,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 = \
@@ -67,7 +86,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 \
@@ -78,11 +96,8 @@ 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 \
@@ -92,21 +107,18 @@ libmemcached_libmemcached_la_SOURCES = \
                                       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_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/pool.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif