X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Finclude.am;h=6db1187fc5f2d4f900a497820b5f7c3cd4b325e1;hb=76bf27c007d5015d3dcf2981c942d8afb2e97302;hp=9b023a5ad2bc074ef49aace00ee03c21153b415e;hpb=f006a1e25c398dd131668233b842b6be0b8200dd;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index 9b023a5a..6db1187f 100644
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -38,9 +38,10 @@ noinst_HEADERS+= tests/string.h
 noinst_HEADERS+= tests/touch.h
 noinst_HEADERS+= tests/virtual_buckets.h
 
+if HAVE_DTRACE
+else
 # Test internals
 tests_libmemcached_1_0_internals_CXXFLAGS=
-tests_libmemcached_1_0_internals_DEPENDENCIES=
 tests_libmemcached_1_0_internals_LDADD=
 tests_libmemcached_1_0_internals_SOURCES=
 
@@ -48,9 +49,6 @@ tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/internals.cc
 tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc
 tests_libmemcached_1_0_internals_CXXFLAGS+= $(AM_CXXFLAGS)
 tests_libmemcached_1_0_internals_CXXFLAGS+= @PTHREAD_CFLAGS@
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedinternal.la
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedutilinternal.la
 tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedinternal.la
 tests_libmemcached_1_0_internals_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
@@ -58,11 +56,14 @@ tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la
 check_PROGRAMS+= tests/libmemcached-1.0/internals
 noinst_PROGRAMS+= tests/libmemcached-1.0/internals
 
+test-internal: tests/libmemcached-1.0/internals
+	@tests/testplus
+
+endif
 
 tests_libmemcached_1_0_testapp_CXXFLAGS=
 tests_libmemcached_1_0_testapp_CFLAGS=
 tests_libmemcached_1_0_testapp_SOURCES=
-tests_libmemcached_1_0_testapp_DEPENDENCIES=
 tests_libmemcached_1_0_testapp_LDADD=
 
 tests_libmemcached_1_0_testapp_CXXFLAGS+= $(AM_CXXFLAGS)
@@ -97,12 +98,8 @@ tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/setup_and_teardo
 tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/stat.cc
 tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/touch.cc
 tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libhashkit/libhashkit.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcachedutil.la
 
-tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LDFLAGS@
+tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LIB@
 tests_libmemcached_1_0_testapp_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la
 tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la
@@ -115,7 +112,6 @@ noinst_PROGRAMS+= tests/libmemcached-1.0/testapp
 tests_libmemcached_1_0_testsocket_CXXFLAGS=
 tests_libmemcached_1_0_testsocket_CFLAGS=
 tests_libmemcached_1_0_testsocket_SOURCES=
-tests_libmemcached_1_0_testsocket_DEPENDENCIES=
 tests_libmemcached_1_0_testsocket_LDADD=
 
 tests_libmemcached_1_0_testsocket_CXXFLAGS+= @PTHREAD_CFLAGS@
@@ -153,12 +149,7 @@ tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/stat.cc
 tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/touch.cc
 tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
 
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libhashkit/libhashkit.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcachedutil.la
-
-tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LDFLAGS@
+tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LIB@
 tests_libmemcached_1_0_testsocket_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
 tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la
@@ -172,10 +163,9 @@ test-socket: tests/libmemcached-1.0/testsocket
 	@tests/libmemcached-1.0/testsocket
 
 gdb-socket: tests/libmemcached-1.0/testsocket
-	@$(DEBUG_COMMAND) tests/libmemcached-1.0/testsocket
+	@$(GDB_COMMAND) tests/libmemcached-1.0/testsocket
 
 tests_libmemcached_1_0_sasl_SOURCES=
-tests_libmemcached_1_0_sasl_DEPENDENCIES=
 tests_libmemcached_1_0_sasl_LDADD=
 tests_libmemcached_1_0_sasl_CXXFLAGS=
 tests_libmemcached_1_0_sasl_CFLAGS=
@@ -203,9 +193,6 @@ tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
 tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
 tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/generate.cc
 
-tests_libmemcached_1_0_sasl_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_sasl_DEPENDENCIES+= libtest/libtest.la
-
 tests_libmemcached_1_0_sasl_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la
 tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la
@@ -219,14 +206,12 @@ test-sasl: tests/libmemcached-1.0/sasl
 	@tests/libmemcached-1.0/sasl
 
 gdb-sasl: tests/libmemcached-1.0/sasl
-	@$(DEBUG_COMMAND)  tests/libmemcached-1.0/sasl
+	@$(GDB_COMMAND)  tests/libmemcached-1.0/sasl
 
 tests_atomsmasher_SOURCES=
-tests_atomsmasher_DEPENDENCIES=
 tests_atomsmasher_LDADD=
 
-tests_atomsmasher_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_atomsmasher_LDADD+= $(tests_atomsmasher_DEPENDENCIES)
+tests_atomsmasher_LDADD+= $(TESTS_LDADDS)
 tests_atomsmasher_SOURCES+= clients/execute.cc
 tests_atomsmasher_SOURCES+= clients/generator.cc
 tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/atomsmasher.cc
@@ -239,7 +224,6 @@ noinst_PROGRAMS+= tests/atomsmasher
 
 tests_testudp_CFLAGS=
 tests_testudp_SOURCES=
-tests_testudp_DEPENDENCIES=
 tests_testudp_LDADD=
 
 tests_testudp_CFLAGS+= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -250,8 +234,7 @@ tests_testudp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
 tests_testudp_SOURCES+= tests/libmemcached-1.0/generate.cc
 tests_testudp_SOURCES+= tests/libmemcached-1.0/print.cc
 tests_testudp_SOURCES+= tests/mem_udp.cc
-tests_testudp_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_testudp_LDADD+= $(tests_testudp_DEPENDENCIES)
+tests_testudp_LDADD+= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testudp
 noinst_PROGRAMS+= tests/testudp
 
@@ -260,7 +243,6 @@ test-udp: tests/testudp
 
 tests_testplus_SOURCES=
 tests_testplus_CXXFLAGS=
-tests_testplus_DEPENDENCIES=
 tests_testplus_LDADD=
 
 tests_testplus_SOURCES+= clients/execute.cc
@@ -272,8 +254,7 @@ tests_testplus_SOURCES+= tests/libmemcached-1.0/plus.cpp
 tests_testplus_SOURCES+= tests/libmemcached-1.0/print.cc
 
 tests_testplus_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_testplus_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_testplus_LDADD+= $(tests_testplus_DEPENDENCIES)
+tests_testplus_LDADD+= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testplus
 noinst_PROGRAMS+= tests/testplus
 
@@ -281,7 +262,7 @@ test-plus: tests/testplus
 	@tests/testplus
 
 gdb-plus: tests/testplus
-	$(DEBUG_COMMAND) tests/testplus
+	$(GDB_COMMAND) tests/testplus
 
 valgrind-plus: tests/testplus
 	@$(VALGRIND_COMMAND) tests/testplus