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

diff --git a/libmemcached/include.am b/libmemcached/include.am
index fe3c5fcd..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,14 +12,19 @@ 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 \
 		 libmemcached/io.h \
 		 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 \
@@ -31,6 +36,7 @@ nobase_include_HEADERS+= \
 			 libmemcached/analyze.h \
 			 libmemcached/array.h \
 			 libmemcached/auto.h \
+			 libmemcached/basic_string.h \
 			 libmemcached/behavior.h \
 			 libmemcached/callback.h \
 			 libmemcached/configure.h \
@@ -50,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 \
@@ -76,6 +82,8 @@ nobase_include_HEADERS+= \
 # These symbols will not be exposed in the shipped .so
 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= \
@@ -105,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 \
@@ -113,7 +122,7 @@ libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/do.cc \
 				       libmemcached/dump.cc \
 				       libmemcached/error.cc \
-				       libmemcached/fetch.c \
+				       libmemcached/fetch.cc \
 				       libmemcached/flush.cc \
 				       libmemcached/flush_buffers.cc \
 				       libmemcached/get.cc \
@@ -125,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 \
@@ -140,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=