X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=448a2e2041973459457999d7e1e992bfda0c792b;hb=9c93ec2ff2db02a85ec808947cb10b674c512d0c;hp=af49d2d54c1481b2f4898312cd21ba50427cca4c;hpb=fddf0928bfebaa0ff1535c0973cfabf5e001e72d;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index af49d2d5..448a2e20 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -10,6 +10,7 @@ EXTRA_DIST+= \
 	     libmemcached/libmemcached_probes.d \
 	     libmemcached/memcached/README.txt
 
+nobase_include_HEADERS+= libmemcached/result.h
 nobase_include_HEADERS+= \
 			 libmemcached/memcached.h \
 			 libmemcached/memcached.hpp \
@@ -20,11 +21,11 @@ noinst_HEADERS+= \
 		 libmemcached/assert.hpp \
 		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
-		 libmemcached/close_socket.hpp \
 		 libmemcached/common.h \
 		 libmemcached/connect.hpp \
 		 libmemcached/continuum.hpp \
 		 libmemcached/do.hpp \
+		 libmemcached/encoding_key.h \
 		 libmemcached/error.hpp \
 		 libmemcached/initialize_query.h \
 		 libmemcached/internal.h \
@@ -39,9 +40,12 @@ noinst_HEADERS+= \
 		 libmemcached/namespace.h \
 		 libmemcached/options.hpp \
 		 libmemcached/response.h \
+		 libmemcached/sasl.hpp \
 		 libmemcached/server.hpp \
 		 libmemcached/server_instance.h \
+		 libmemcached/socket.hpp \
 		 libmemcached/string.hpp \
+		 libmemcached/udp.hpp \
 		 libmemcached/virtual_bucket.h \
 		 libmemcached/watchpoint.h
 
@@ -79,6 +83,7 @@ libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/io.cc \
 				       libmemcached/key.cc \
 				       libmemcached/memcached.cc \
+				       libmemcached/encoding_key.cc \
 				       libmemcached/namespace.cc \
 				       libmemcached/options.cc \
 				       libmemcached/parse.cc \
@@ -87,7 +92,7 @@ libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/quit.hpp \
 				       libmemcached/response.cc \
 				       libmemcached/result.cc \
-				       libmemcached/sasl.hpp \
+				       libmemcached/sasl.cc \
 				       libmemcached/server.cc \
 				       libmemcached/server_list.cc \
 				       libmemcached/server_list.hpp \
@@ -98,6 +103,7 @@ libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/touch.cc \
 				       libmemcached/verbosity.cc \
 				       libmemcached/version.cc \
+				       libmemcached/udp.cc \
 				       libmemcached/virtual_bucket.c
 
 libmemcached/options.cc: libmemcached/csl/parser.h
@@ -106,16 +112,13 @@ libmemcached/options.cc: libmemcached/csl/parser.h
 libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
-if TARGET_LINUX
-libmemcached_libmemcached_la_LIBADD+= -lm
-endif
 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_CXXFLAGS+= ${PTHREAD_CFLAGS}
-libmemcached_libmemcached_la_LIBADD+= ${PTHREAD_LIBS}
+libmemcached_libmemcached_la_CXXFLAGS+= $(LIBSASL_CPPFLAGS)
+libmemcached_libmemcached_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+libmemcached_libmemcached_la_LIBADD+= $(PTHREAD_LIBS)
+libmemcached_libmemcached_la_LIBADD+= $(LIBSASL_LDFLAGS)
 endif
 
 if HAVE_DTRACE
@@ -133,7 +136,7 @@ SUFFIXES+= .d
 libmemcached/dtrace_probes.h: 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
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS}
 
 .d.o:
 	$(DTRACE) $(DTRACEFLAGS) -o $@ -G -s libmemcached/libmemcached_probes.d