From: Trond Norbye <trond.norbye@gmail.com>
Date: Tue, 14 Sep 2010 07:55:39 +0000 (+0200)
Subject: Fixed dtrace enabled compilations
X-Git-Tag: 0.44~2^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e17d20233058cc5a918c134669df0e81ee56640e;p=m6w6%2Flibmemcached

Fixed dtrace enabled compilations
---

diff --git a/.bzrignore b/.bzrignore
index 0579973b..d7c41d0e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -72,6 +72,7 @@ libmemcached-0.37-1.x86_64.rpm
 libmemcached-?.??/
 libmemcached.pop
 libmemcached/configure.h
+libmemcached/dtrace_probes.h
 libmemcached/memcached_configure.h
 libmemcached_examples.pop
 libmemcachedutil.pop
diff --git a/libmemcached/include.am b/libmemcached/include.am
index fccced99..c348cb3d 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -172,5 +172,5 @@ libmemcached/dtrace_probes.h: libmemcached/libmemcached_probes.d
 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 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}\/libmemcached\//"`
 
diff --git a/tests/include.am b/tests/include.am
index 7a9c2062..6c77927d 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -47,7 +47,11 @@ tests_testapp_DEPENDENCIES= \
 			    tests/libtest.la \
 			    libmemcached/libmemcachedinternal.la \
 			    $(TESTS_LDADDS)
-tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
+tests_testapp_LDADD= clients/libgenexec.la \
+		     tests/libserver.la \
+		     tests/libtest.la \
+		     libmemcached/libmemcachedinternal.la \
+		     $(TESTS_LDADDS) $(LIBSASL)
 
 tests_testplus_SOURCES= tests/plus.cpp
 tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)