X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=f8e20d582662f0f3a4b3783fc19814699746bedc;hb=f92f0f9bcb54167331067b6891ee33e5f27d691c;hp=5c0e66387034f3db11a08281b413f29edc1191fc;hpb=a6c3e3a3d04f379b1480c8c88a8eae17e54b1449;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 5c0e6638..f8e20d58 100644
--- 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,9 +12,11 @@ EXTRA_DIST+= \
 	     libmemcached/memcached/README.txt
 
 noinst_HEADERS+= \
+		 libmemcached/assert.hpp \
+		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
 		 libmemcached/common.h \
-		 libmemcached/do.h \
+		 libmemcached/do.hpp \
 		 libmemcached/error.hpp \
 		 libmemcached/initialize_query.h \
 		 libmemcached/internal.h \
@@ -22,6 +24,7 @@ noinst_HEADERS+= \
 		 libmemcached/is.h \
 		 libmemcached/libmemcached_probes.h \
 		 libmemcached/memory.h \
+		 libmemcached/options.hpp \
 		 libmemcached/protocol/ascii_handler.h \
 		 libmemcached/protocol/binary_handler.h \
 		 libmemcached/protocol/common.h \
@@ -53,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 \
@@ -80,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= \
@@ -109,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 \
@@ -129,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 \
@@ -144,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=