X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=7d4841f8fb03a8273727b5eb97a4158ae863bb48;hb=29251f6f205e2323a473c181aaee98786fc90dca;hp=2e827f55331f007bcf6565748ee3e64ea7a80ace;hpb=4effcb18b27e2d84a8b29bc311b5edbee3c004b6;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 2e827f55..7d4841f8 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -39,6 +39,7 @@ nobase_include_HEADERS+= \
 			 libmemcached/memcached.hpp \
 			 libmemcached/memcached/protocol_binary.h \
 			 libmemcached/parse.h \
+                         libmemcached/platform.h \
 			 libmemcached/protocol/cache.h \
 			 libmemcached/protocol/callback.h \
 			 libmemcached/protocol_handler.h \
@@ -65,7 +66,8 @@ libmemcached_libmemcachedprotocol_la_SOURCES =  \
 						libmemcached/protocol/pedantic.c \
 						libmemcached/protocol/protocol_handler.c
 
-libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcached_libmemcachedprotocol_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}
 
 noinst_LTLIBRARIES+= \
 		     libmemcached/libmemcachedcallbacks.la
@@ -123,15 +125,18 @@ nobase_include_HEADERS+= \
 			 libmemcached/memcached_util.h \
 			 libmemcached/util.h \
 			 libmemcached/util/ping.h \
-			 libmemcached/util/pool.h
+			 libmemcached/util/pool.h \
+			 libmemcached/util/version.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif
 
 libmemcached_libmemcachedutil_la_SOURCES= \
 					  libmemcached/util/ping.c \
-					  libmemcached/util/pool.c
+					  libmemcached/util/pool.c \
+					  libmemcached/util/version.c
+libmemcached_libmemcachedutil_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} ${PTHREAD_CFLAGS}
 libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
+libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} ${PTHREAD_LIBS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
 libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
 
 if BUILD_BYTEORDER
@@ -144,7 +149,7 @@ libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
 endif
 
 if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL)
+libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2)
 libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
 endif
 
@@ -156,6 +161,7 @@ endif
 if DTRACE_NEEDS_OBJECTS
 libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
 CLEANFILES+= libmemcached/libmemcached_probes.o
 endif
 
@@ -164,8 +170,8 @@ SUFFIXES+= .d
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
 	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s ${top_srcdir}/libmemcached/libmemcached_probes.d
 
-libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_OBJECTS} config.h
+libmemcached/libmemcached_probes.o: libmemcached/libmemcached_probes.d ${libmemcached_libmemcached_la_OBJECTS} config.h
 
 .d.o:
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s ${top_srcdir}/libmemcached/libmemcached_probes.d `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\//"`
+	$(DTRACE) $(DTRACEFLAGS) -o $@ -G -s $< `grep '^pic_object' ${top_builddir}/libmemcached/*.lo | cut -f 2 -d\' | sed "s/^/${top_builddir}\/libmemcached\//"`