Merge up trunk

[awesomized/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index db612892245d430561b369b43b978547048741e8..f8e20d582662f0f3a4b3783fc19814699746bedc 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 \
@@ -13,6 +13,7 @@ EXTRA_DIST+= \
 
 noinst_HEADERS+= \
                 libmemcached/assert.hpp \
+                libmemcached/backtrace.hpp \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
                 libmemcached/do.hpp \
@@ -82,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= \
@@ -111,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 \
@@ -146,7 +149,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=