Merge in simple extrace for strings, style issues in io

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index e1bed44fa07c423fbb659d717efb01de67401bb5..3a0a0ac4336723a3ff2edf670f1901640f063f98 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -4,7 +4,7 @@
 
 libmemcached_libmemcached_la_SOURCES =
 
-include libmemcached/options/include.am
+include libmemcached/csl/include.am
 
 EXTRA_DIST+= \
             libmemcached/configure.h.in \
@@ -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 \
@@ -19,6 +21,7 @@ noinst_HEADERS+= \
                 libmemcached/initialize_query.h \
                 libmemcached/internal.h \
                 libmemcached/io.h \
+                libmemcached/io.hpp \
                 libmemcached/is.h \
                 libmemcached/libmemcached_probes.h \
                 libmemcached/memory.h \
@@ -27,6 +30,7 @@ noinst_HEADERS+= \
                 libmemcached/protocol/binary_handler.h \
                 libmemcached/protocol/common.h \
                 libmemcached/response.h \
+                libmemcached/string.hpp \
                 libmemcached/virtual_bucket.h
 
 nobase_include_HEADERS+= \
@@ -81,6 +85,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 +115,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 \
@@ -145,7 +151,7 @@ libmemcached_libmemcached_la_SOURCES+= \
                                       libmemcached/version.cc \
                                       libmemcached/virtual_bucket.c
 
-libmemcached/options.cc: libmemcached/options/parser.h
+libmemcached/options.cc: libmemcached/csl/parser.h
 
 
 libmemcached_libmemcached_la_DEPENDENCIES=