Fixed dtrace enabled compilations

diff --git a/.bzrignore b/.bzrignore
index 0579973b5a51dab19ceb5bba9c5fb5460061b21e..d7c41d0e32f7cb6052689318e3bbf20bda014f40 100644 (file)
--- 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 fccced999dcdbdd90751c5516c1c6399618f5cd5..c348cb3d14484b4349729c445d140e55e7d95e9d 100644 (file)
--- 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 7a9c206284d6824531cac8fde75c01c29cd5691e..6c77927d5aff16d3359c31ac528c7ef957604cc2 100644 (file)
--- 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)