Merge up for version.

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index e799093fa60c3cdfaa64f6a02b366ad5e909620e..1c2036bf1b05fd909f15719ebac4fbe5d877352c 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -12,6 +12,8 @@ EXTRA_DIST+= \
             libmemcached/memcached/README.txt
 
 noinst_HEADERS+= \
+                libmemcached/assert.hpp \
+                libmemcached/backtrace.hpp \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
                 libmemcached/do.hpp \
@@ -54,7 +56,7 @@ nobase_include_HEADERS+= \
                         libmemcached/memcached/vbucket.h \
                         libmemcached/options.h \
                         libmemcached/parse.h \
-                        libmemcached/prefix_key.h \
+                        libmemcached/namespace.h \
                         libmemcached/protocol/cache.h \
                         libmemcached/protocol/callback.h \
                         libmemcached/protocol_handler.h \
@@ -81,6 +83,7 @@ nobase_include_HEADERS+= \
 noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
 libmemcached_libmemcachedinternal_la_SOURCES= \
                                              libmemcached/array.c \
+                                             libmemcached/backtrace.cc \
                                              libmemcached/error.cc \
                                              libmemcached/string.cc
 libmemcached_libmemcachedinternal_la_CFLAGS= \
@@ -110,6 +113,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/analyze.cc \
                                       libmemcached/array.c \
                                       libmemcached/auto.cc \
+                                      libmemcached/backtrace.cc \
                                       libmemcached/behavior.cc \
                                       libmemcached/byteorder.cc \
                                       libmemcached/callback.cc \
@@ -130,7 +134,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/memcached.cc \
                                       libmemcached/options.cc \
                                       libmemcached/parse.cc \
-                                      libmemcached/prefix_key.cc \
+                                      libmemcached/namespace.cc \
                                       libmemcached/purge.cc \
                                       libmemcached/quit.cc \
                                       libmemcached/response.cc \