Merge in updates for the pool library.

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index c290989ec56ee6b2cd519a5a9f7a2baf557687f8..496b7a9b2da8929067f8257a8a53fd0b7e4cb16a 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -15,6 +15,7 @@ noinst_HEADERS+= \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
                 libmemcached/do.h \
+                libmemcached/initialize_query.h \
                 libmemcached/internal.h \
                 libmemcached/io.h \
                 libmemcached/is.h \
@@ -22,7 +23,8 @@ noinst_HEADERS+= \
                 libmemcached/protocol/ascii_handler.h \
                 libmemcached/protocol/binary_handler.h \
                 libmemcached/protocol/common.h \
-                libmemcached/response.h
+                libmemcached/response.h \
+                libmemcached/virtual_bucket.h
 
 nobase_include_HEADERS+= \
                         libmemcached/allocators.h \
@@ -45,6 +47,7 @@ nobase_include_HEADERS+= \
                         libmemcached/memcached.h \
                         libmemcached/memcached.hpp \
                         libmemcached/memcached/protocol_binary.h \
+                        libmemcached/memcached/vbucket.h \
                         libmemcached/options.h \
                         libmemcached/parse.h \
                         libmemcached/prefix_key.h \
@@ -89,6 +92,7 @@ libmemcached_libmemcachedcallbacks_la_SOURCES = libmemcached/callback.c
 # These symbols will not be exposed in the shipped .so
 noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
 libmemcached_libmemcachedinternal_la_SOURCES= \
+                                             libmemcached/error.cc \
                                              libmemcached/string.c
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
@@ -103,13 +107,13 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/delete.c \
                                       libmemcached/do.c \
                                       libmemcached/dump.c \
-                                      libmemcached/error.c \
                                       libmemcached/fetch.c \
                                       libmemcached/flush.c \
                                       libmemcached/flush_buffers.c \
                                       libmemcached/get.c \
                                       libmemcached/hash.c \
                                       libmemcached/hosts.c \
+                                      libmemcached/initialize_query.cc \
                                       libmemcached/io.c \
                                       libmemcached/key.c \
                                       libmemcached/memcached.c \
@@ -126,7 +130,8 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/storage.c \
                                       libmemcached/strerror.c \
                                       libmemcached/verbosity.c \
-                                      libmemcached/version.c
+                                      libmemcached/version.c \
+                                      libmemcached/virtual_bucket.c
 
 libmemcached/options.cc: libmemcached/options/parser.h
 
@@ -146,9 +151,9 @@ lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif
 
 libmemcached_libmemcachedutil_la_SOURCES= \
-                                         libmemcached/util/ping.c \
-                                         libmemcached/util/pool.c \
-                                         libmemcached/util/version.c
+                                         libmemcached/util/ping.cc \
+                                         libmemcached/util/pool.cc \
+                                         libmemcached/util/version.cc
 libmemcached_libmemcachedutil_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
 libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
 libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}