Merge Thomason's cork patch.

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 29a77538fc8421bca888ef86e1b8649e4fe7ee04..41c5c5972f3e2edb034da68886d5bae25c95be86 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -3,47 +3,45 @@
 # All paths should be given relative to the root
 
 EXTRA_DIST+= \
+            libmemcached/configure.h.in \
             libmemcached/libmemcached_probes.d \
-            libmemcached/memcached/README.txt \
-            libmemcached/memcached_configure.h.in
-
+            libmemcached/memcached/README.txt
 
 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
-
-nobase_pkginclude_HEADERS+= \
-                           libmemcached/analyze.h \
-                           libmemcached/auto.h \
-                           libmemcached/behavior.h \
-                           libmemcached/callback.h \
-                           libmemcached/constants.h \
-                           libmemcached/dump.h \
-                           libmemcached/exception.hpp \
-                           libmemcached/get.h \
-                           libmemcached/memcached.h \
-                           libmemcached/memcached.hpp \
-                           libmemcached/memcached_configure.h \
-                           libmemcached/protocol/cache.h \
-                           libmemcached/protocol/callback.h \
-                           libmemcached/protocol_handler.h \
-                           libmemcached/result.h \
-                           libmemcached/server.h \
-                           libmemcached/stats.h \
-                           libmemcached/storage.h \
-                           libmemcached/string.h \
-                           libmemcached/types.h \
-                           libmemcached/visibility.h \
-                           libmemcached/watchpoint.h
-
-
+                libmemcached/protocol/binary_handler.h \
+                libmemcached/protocol/common.h \
+                libmemcached/response.h
+
+nobase_include_HEADERS+= \
+                        libmemcached/analyze.h \
+                        libmemcached/auto.h \
+                        libmemcached/behavior.h \
+                        libmemcached/callback.h \
+                        libmemcached/configure.h \
+                        libmemcached/constants.h \
+                        libmemcached/dump.h \
+                        libmemcached/exception.hpp \
+                        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 \
+                        libmemcached/result.h \
+                        libmemcached/server.h \
+                        libmemcached/stats.h \
+                        libmemcached/storage.h \
+                        libmemcached/string.h \
+                        libmemcached/types.h \
+                        libmemcached/visibility.h \
+                        libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcachedprotocol.la
 libmemcached_libmemcachedprotocol_la_SOURCES =  \
@@ -111,10 +109,12 @@ 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
-pkginclude_HEADERS+= libmemcached/memcached_util.h libmemcached/util/pool.h
+nobase_include_HEADERS+= \
+                        libmemcached/memcached_util.h \
+                        libmemcached/util/pool.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif