X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=aa15f8e3b63890b61c7fe75b666b6a76ea15e221;hb=0ae14bed70947882f5ee9423dfcb20eeda7acdd9;hp=3a0a0ac4336723a3ff2edf670f1901640f063f98;hpb=647f5b82467172c55e456b6833d4c2f0bdc0bc5a;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 3a0a0ac4..aa15f8e3 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -16,6 +16,7 @@ noinst_HEADERS+= \
 		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
 		 libmemcached/common.h \
+		 libmemcached/continuum.hpp \
 		 libmemcached/do.hpp \
 		 libmemcached/error.hpp \
 		 libmemcached/initialize_query.h \
@@ -30,6 +31,8 @@ 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
 
@@ -79,25 +82,6 @@ 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/backtrace.cc \
-					      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} \
@@ -156,32 +140,27 @@ 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+= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
 
-if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2)
-libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
-endif
+libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)
+libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.cc
 
 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