Merge in all of build.
[m6w6/libmemcached] / libmemcached / include.am
index 035725a30b559568a3a04f3d4cdca75ae83c18ea..5a4b8b09ed0fd9cdb8e073af0f12272b69b024d5 100644 (file)
@@ -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 \
@@ -43,7 +44,6 @@ nobase_include_HEADERS+= \
                         libmemcached/flush_buffers.h \
                         libmemcached/get.h \
                         libmemcached/hash.h \
-                        libmemcached/initialize_query.h \
                         libmemcached/memcached.h \
                         libmemcached/memcached.hpp \
                         libmemcached/memcached/protocol_binary.h \
@@ -92,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