Merge Stewart

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 8adde9f033fefcd6ddfd1edf6ccfe566e4ea9699..41c5c5972f3e2edb034da68886d5bae25c95be86 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -9,14 +9,14 @@ EXTRA_DIST+= \
 
 noinst_HEADERS+= \
                 libmemcached/byteorder.h \
-                libmemcached/libmemcached_probes.h \
-                libmemcached/io.h \
-                libmemcached/internal.h \
                 libmemcached/common.h \
-                libmemcached/memcached/protocol_binary.h \
-                libmemcached/protocol/common.h \
+                libmemcached/internal.h \
+                libmemcached/io.h \
+                libmemcached/libmemcached_probes.h \
                 libmemcached/protocol/ascii_handler.h \
-                libmemcached/protocol/binary_handler.h
+                libmemcached/protocol/binary_handler.h \
+                libmemcached/protocol/common.h \
+                libmemcached/response.h
 
 nobase_include_HEADERS+= \
                         libmemcached/analyze.h \
@@ -30,6 +30,7 @@ nobase_include_HEADERS+= \
                         libmemcached/get.h \
                         libmemcached/memcached.h \
                         libmemcached/memcached.hpp \
+                        libmemcached/memcached/protocol_binary.h \
                         libmemcached/protocol/cache.h \
                         libmemcached/protocol/callback.h \
                         libmemcached/protocol_handler.h \
@@ -108,7 +109,7 @@ endif
 
 libmemcached_libmemcached_la_DEPENDENCIES= libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
 libmemcached_libmemcached_la_LIBADD= $(LIBM) libmemcached/libmemcachedcallbacks.la libmemcached/libmemcachedinternal.la
-libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 if BUILD_LIBMEMCACHEDUTIL
 nobase_include_HEADERS+= \