X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2FMakefile.am;h=360739c5335aab5b9ec7bbc257cfb3a01c7310f1;hb=1a92818ec19dd3e9ca4b6765a5765ca1a97dcfdc;hp=ef9d0cd81bbf7b25241bb05df2210ae1e6747fed;hpb=a148d541d261c9c867c412e773920f5a1973bbae;p=m6w6%2Flibmemcached

diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index ef9d0cd8..360739c5 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,5 +1,9 @@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
-             memcached_configure.h.in protocol/libmemcachedprotocol.ver
+EXTRA_DIST = libmemcached.ver \
+             libmemcached_probes.d \
+             memcached/README.txt \
+             memcached_configure.h.in \
+             protocol/libmemcachedprotocol.ver \
+             util/libmemcachedutil.ver
 
 
 EXTRA_HEADERS =
@@ -33,17 +37,13 @@ nobase_pkginclude_HEADERS=protocol/cache.h \
                           protocol/callback.h
 
 
-if BUILD_LIBMEMCACHEDUTIL
-pkginclude_HEADERS+= memcached_util.h memcached_pool.h
-endif
-
 libmemcachedprotocol_la_SOURCES= protocol/ascii_handler.c \
                                  protocol/binary_handler.c \
                                  protocol/cache.c \
                                  protocol/pedantic.c \
                                  protocol/protocol_handler.c
 
-libmemcachedprotocol_la_LDFLAGS= -version-info $(MEMCACHEDPROTOCOL_LIBRARY_VERSION) $(LD_PROTOCOL_VERSION_SCRIPT)
+libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0 
 
 lib_LTLIBRARIES = libmemcached.la libmemcachedprotocol.la
 noinst_LTLIBRARIES = libmemcachedcallbacks.la
@@ -92,7 +92,17 @@ endif
 
 libmemcached_la_DEPENDENCIES= libmemcachedcallbacks.la
 libmemcached_la_LIBADD= $(LIBM) libmemcachedcallbacks.la
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
+libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info 3:0:0
+
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= memcached_util.h memcached_pool.h
+lib_LTLIBRARIES+= libmemcachedutil.la
+endif
+
+libmemcachedutil_la_SOURCES= util/memcached_pool.c
+libmemcachedutil_la_LIBADD= libmemcached.la
+libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcachedutil_la_DEPENDENCIES=libmemcached.la
 
 if BUILD_BYTEORDER
 noinst_LTLIBRARIES += libbyteorder.la