Merge

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index a1e47ab9fac483795afc8cd4846e2446ee2d9cdf..24d9598215ce303ab4bf10a0e1353a231013540e 100644 (file)
--- 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 \
@@ -41,6 +40,7 @@ noinst_HEADERS+= \
                 libmemcached/response.h \
                 libmemcached/server.hpp \
                 libmemcached/server_instance.h \
+                libmemcached/socket.hpp \
                 libmemcached/string.hpp \
                 libmemcached/udp.hpp \
                 libmemcached/virtual_bucket.h \
@@ -108,9 +108,6 @@ 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)