X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=28456b59129422146442be9038fa22320b39ebba;hb=3e87de62b0b39279bdec62a07b45e42fe798fd41;hp=db612892245d430561b369b43b978547048741e8;hpb=9cd57ce737375540f6c3b5e2e3684160e5c4bfce;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index db612892..28456b59 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 \
@@ -13,13 +13,16 @@ EXTRA_DIST+= \
 
 noinst_HEADERS+= \
 		 libmemcached/assert.hpp \
+		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
 		 libmemcached/common.h \
+		 libmemcached/continuum.hpp \
 		 libmemcached/do.hpp \
 		 libmemcached/error.hpp \
 		 libmemcached/initialize_query.h \
 		 libmemcached/internal.h \
 		 libmemcached/io.h \
+		 libmemcached/io.hpp \
 		 libmemcached/is.h \
 		 libmemcached/libmemcached_probes.h \
 		 libmemcached/memory.h \
@@ -28,6 +31,9 @@ noinst_HEADERS+= \
 		 libmemcached/protocol/binary_handler.h \
 		 libmemcached/protocol/common.h \
 		 libmemcached/response.h \
+		 libmemcached/server.hpp \
+		 libmemcached/server_instance.h \
+		 libmemcached/string.hpp \
 		 libmemcached/virtual_bucket.h
 
 nobase_include_HEADERS+= \
@@ -76,34 +82,10 @@ nobase_include_HEADERS+= \
 			 libmemcached/visibility.h \
 			 libmemcached/watchpoint.h
 
-# This noinst lib contains things we want to be ABI private but still want to
-# either use in client programs or be able to test in test cases
-# These symbols will not be exposed in the shipped .so
-noinst_LTLIBRARIES+= libmemcached/libmemcachedinternal.la
-libmemcached_libmemcachedinternal_la_SOURCES= \
-					      libmemcached/array.c \
-					      libmemcached/error.cc \
-					      libmemcached/string.cc
-libmemcached_libmemcachedinternal_la_CFLAGS= \
-				     ${AM_CFLAGS} \
-				     ${NO_CONVERSION} \
-				     -DBUILDING_LIBMEMCACHED
-
-libmemcached_libmemcachedinternal_la_CXXFLAGS= \
-				       ${AM_CXXFLAGS} \
-				       ${NO_CONVERSION} \
-				       -DBUILDING_LIBMEMCACHED
-
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_CFLAGS= \
-				     ${AM_CFLAGS} \
-				     ${NO_CONVERSION} \
-				     -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
 
-libmemcached_libmemcached_la_CXXFLAGS= \
-				       ${AM_CXXFLAGS} \
-				       ${NO_CONVERSION} \
-				       -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
 
 libmemcached_libmemcached_la_SOURCES+= \
 				       ${libhashkit_libhashkit_la_SOURCES} \
@@ -111,6 +93,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,37 +129,36 @@ 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=
 libmemcached_libmemcached_la_LIBADD= $(LIBM)
-libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
+libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
 
+libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)
+libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.cc
 if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2)
-libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
+libmemcached_libmemcached_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcached_la_LIBADD+= ${PTHREAD_LIBS}
 endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/dtrace_probes.h
-endif
+CLEANFILES+= libmemcached/libmemcached_probes.o
 
-if DTRACE_NEEDS_OBJECTS
-libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
-CLEANFILES+= libmemcached/libmemcached_probes.o
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 endif
 
 SUFFIXES+= .d
 
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
-	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
+	$(DTRACE) $(DTRACEFLAGS) -h -o ${top_srcdir}/libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
 
 libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
 
 .d.o:
-	$(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"`
-
+	$(DTRACE) $(DTRACEFLAGS) -o $@ -G -s libmemcached/libmemcached_probes.d