X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=d5b2fc76de1d33847d272b0f5503b3a655cf5e57;hb=73e62c470da9bb5f0b0e4a2ecf195c7259e33cf1;hp=af49d2d54c1481b2f4898312cd21ba50427cca4c;hpb=d4f9faac5b2532375157aac90c36ace0261c867e;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index af49d2d5..d5b2fc76 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -20,7 +20,6 @@ noinst_HEADERS+= \
 		 libmemcached/assert.hpp \
 		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
-		 libmemcached/close_socket.hpp \
 		 libmemcached/common.h \
 		 libmemcached/connect.hpp \
 		 libmemcached/continuum.hpp \
@@ -39,9 +38,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
 
@@ -87,7 +89,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 +100,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 +109,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