Merge in updates for the pool library.

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 42e251d62e38399d070aaa56f3aeefbc8c3e7c5a..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 \
@@ -91,7 +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.c \
+                                             libmemcached/error.cc \
                                              libmemcached/string.c
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
@@ -112,6 +113,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/get.c \
                                       libmemcached/hash.c \
                                       libmemcached/hosts.c \
+                                      libmemcached/initialize_query.cc \
                                       libmemcached/io.c \
                                       libmemcached/key.c \
                                       libmemcached/memcached.c \
@@ -149,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}