X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=2e827f55331f007bcf6565748ee3e64ea7a80ace;hb=4effcb18b27e2d84a8b29bc311b5edbee3c004b6;hp=737c5e12e5c312d4c7b17c84e0fbf5dc96c09d84;hpb=77fe608489d91a0271efe8170ba97c44d51e346b;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 737c5e12..2e827f55 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -44,6 +44,7 @@ nobase_include_HEADERS+= \
 			 libmemcached/protocol_handler.h \
 			 libmemcached/quit.h \
 			 libmemcached/result.h \
+                         libmemcached/sasl.h \
 			 libmemcached/server.h \
 			 libmemcached/server_list.h \
 			 libmemcached/stats.h \
@@ -64,7 +65,7 @@ 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_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
 
 noinst_LTLIBRARIES+= \
 		     libmemcached/libmemcachedcallbacks.la
@@ -120,11 +121,15 @@ libmemcached_libmemcached_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_LI
 if BUILD_LIBMEMCACHEDUTIL
 nobase_include_HEADERS+= \
 			 libmemcached/memcached_util.h \
+			 libmemcached/util.h \
+			 libmemcached/util/ping.h \
 			 libmemcached/util/pool.h
 lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
 endif
 
-libmemcached_libmemcachedutil_la_SOURCES= libmemcached/util/pool.c
+libmemcached_libmemcachedutil_la_SOURCES= \
+					  libmemcached/util/ping.c \
+					  libmemcached/util/pool.c
 libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
 libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info 0:0:0
 libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
@@ -138,21 +143,29 @@ libmemcached_libmemcachedprotocol_la_LIBADD=libmemcached/libbyteorder.la
 libmemcached_libmemcachedprotocol_la_DEPENDENCIES=libmemcached/libbyteorder.la
 endif
 
+if HAVE_SASL
+libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL)
+libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
+endif
+
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h
-libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
+CLEANFILES+= libmemcached/dtrace_probes.h
 endif
 
 if DTRACE_NEEDS_OBJECTS
+libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+CLEANFILES+= libmemcached/libmemcached_probes.o
 endif
 
 SUFFIXES+= .d
 
 libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
-	$(DTRACE) $(DTRACEFLAGS) -h -o libmemcached/dtrace_probes.h -s 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)
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/.libs/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep '^pic_object' *.lo | cut -f 2 -d\'`
-	$(DTRACE) $(DTRACEFLAGS) -o libmemcached/libmemcached_probes.o -G -s libmemcached/libmemcached_probes.d `grep non_pic_object *.lo | cut -f 2 -d\' `
+.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}\//"`