X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Finclude.am;h=d5b2fc76de1d33847d272b0f5503b3a655cf5e57;hb=7773f76bd15be71f7d1a5579006b786584d3fe26;hp=e09b8a67348ee9711777688f26277f44b5989635;hpb=1825425e12755baebb754a9c4a4df69e3cea0bc9;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index e09b8a67..d5b2fc76 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -21,6 +21,7 @@ noinst_HEADERS+= \
 		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
 		 libmemcached/common.h \
+		 libmemcached/connect.hpp \
 		 libmemcached/continuum.hpp \
 		 libmemcached/do.hpp \
 		 libmemcached/error.hpp \
@@ -37,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
 
@@ -51,11 +55,13 @@ libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
 libmemcached_libmemcached_la_SOURCES+= \
 				       ${libhashkit_libhashkit_la_SOURCES} \
 				       libmemcached/allocators.cc \
+				       libmemcached/allocators.hpp \
 				       libmemcached/analyze.cc \
 				       libmemcached/array.c \
 				       libmemcached/auto.cc \
 				       libmemcached/backtrace.cc \
 				       libmemcached/behavior.cc \
+				       libmemcached/behavior.hpp \
 				       libmemcached/byteorder.cc \
 				       libmemcached/callback.cc \
 				       libmemcached/connect.cc \
@@ -68,28 +74,33 @@ libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/flush.cc \
 				       libmemcached/flush_buffers.cc \
 				       libmemcached/get.cc \
-				       libmemcached/touch.cc \
 				       libmemcached/hash.cc \
+				       libmemcached/hash.hpp \
 				       libmemcached/hosts.cc \
 				       libmemcached/initialize_query.cc \
 				       libmemcached/io.cc \
 				       libmemcached/key.cc \
 				       libmemcached/memcached.cc \
+				       libmemcached/namespace.cc \
 				       libmemcached/options.cc \
 				       libmemcached/parse.cc \
-				       libmemcached/namespace.cc \
 				       libmemcached/purge.cc \
 				       libmemcached/quit.cc \
+				       libmemcached/quit.hpp \
 				       libmemcached/response.cc \
 				       libmemcached/result.cc \
+				       libmemcached/sasl.cc \
 				       libmemcached/server.cc \
 				       libmemcached/server_list.cc \
+				       libmemcached/server_list.hpp \
 				       libmemcached/stats.cc \
 				       libmemcached/storage.cc \
 				       libmemcached/strerror.cc \
 				       libmemcached/string.cc \
+				       libmemcached/touch.cc \
 				       libmemcached/verbosity.cc \
 				       libmemcached/version.cc \
+				       libmemcached/udp.cc \
 				       libmemcached/virtual_bucket.c
 
 libmemcached/options.cc: libmemcached/csl/parser.h
@@ -98,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