Refactor DEPENDENCIES

10 files changed, 29 insertions, 64 deletions

diff --git a/libmemcached-1.0/t/include.am b/libmemcached-1.0/t/include.am
index 82136cd8..2a6c512b 100644
--- a/libmemcached-1.0/t/include.am
+++ b/libmemcached-1.0/t/include.am
@@ -14,14 +14,12 @@ if SHARED_ENABLED
 # Test linking with C application
 libmemcached_1_0_t_c_test_SOURCES= libmemcached-1.0/t/c_test.c
 libmemcached_1_0_t_c_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_c_test_DEPENDENCIES= libmemcached/libmemcached.la
 check_PROGRAMS+= libmemcached-1.0/t/c_test
 noinst_PROGRAMS+= libmemcached-1.0/t/c_test
 
 # Test linking with C application/SASL include
 libmemcached_1_0_t_c_sasl_test_SOURCES= libmemcached-1.0/t/c_sasl_test.c
 libmemcached_1_0_t_c_sasl_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_c_sasl_test_DEPENDENCIES= libmemcached/libmemcached.la
 check_PROGRAMS+= libmemcached-1.0/t/c_sasl_test
 noinst_PROGRAMS+= libmemcached-1.0/t/c_sasl_test
 else
@@ -30,6 +28,5 @@ endif
 # Test linking with C++ application
 libmemcached_1_0_t_cc_test_SOURCES= libmemcached-1.0/t/cc_test.cc
 libmemcached_1_0_t_cc_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_cc_test_DEPENDENCIES= libmemcached/libmemcached.la
 check_PROGRAMS+= libmemcached-1.0/t/cc_test
 noinst_PROGRAMS+= libmemcached-1.0/t/cc_test
diff --git a/libmemcached/include.am b/libmemcached/include.am
index 6dbcb167..74da20f0 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -51,7 +51,7 @@ noinst_HEADERS+= libmemcached/virtual_bucket.h
 noinst_HEADERS+= libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_DEPENDENCIES=
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
 libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
@@ -127,7 +127,7 @@ BUILT_SOURCES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/dtrace_probes.h
 CLEANFILES+= libmemcached/libmemcached_probes.o
 
-libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
 libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
 endif
diff --git a/libmemcachedinternal/include.am b/libmemcachedinternal/include.am
index fafef9a3..f71472e3 100644
--- a/libmemcachedinternal/include.am
+++ b/libmemcachedinternal/include.am
@@ -23,5 +23,5 @@ libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS= \
 						       ${NO_CONVERSION} \
 						       -DBUILDING_LIBMEMCACHEDINTERNAL
 libmemcachedinternal_libmemcachedinternal_la_LIBADD= $(libmemcached_libmemcached_la_LIBADD)
-libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(libmemcached_libmemcached_la_DEPENDENCIES)
+EXTRA_libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(EXTRA_libmemcached_libmemcached_la_DEPENDENCIES)
 endif
diff --git a/libmemcachedinternal/util/include.am b/libmemcachedinternal/util/include.am
index 7b5e8007..f5ac3cb0 100644
--- a/libmemcachedinternal/util/include.am
+++ b/libmemcachedinternal/util/include.am
@@ -12,8 +12,6 @@ libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS= \
 							   ${AM_CXXFLAGS} \
 							   ${NO_CONVERSION} \
 							   -DBUILDING_LIBMEMCACHEDINTERNAL
-libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
-libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la ${PTHREAD_LIBS}
-libmemcachedinternal_libmemcachedutilinternal_la_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la
-
-
+libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= @PTHREAD_CFLAGS@
+libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la
+libmemcachedinternal_libmemcachedutilinternal_la_LIBADD+= @PTHREAD_LIBS@
diff --git a/libmemcachedutil/include.am b/libmemcachedutil/include.am
index e0b1fe95..c105ee6e 100644
--- a/libmemcachedutil/include.am
+++ b/libmemcachedutil/include.am
@@ -16,7 +16,6 @@ libmemcached_libmemcachedutil_la_SOURCES= \
 libmemcached_libmemcachedutil_la_LIBADD=
 libmemcached_libmemcachedutil_la_LDFLAGS=
 libmemcached_libmemcachedutil_la_CXXFLAGS=
-libmemcached_libmemcachedutil_la_DEPENDENCIES=
 libmemcached_libmemcachedutil_la_CXXFLAGS+= \
 					   ${AM_CXXFLAGS} \
 					   ${NO_CONVERSION} \
@@ -25,5 +24,3 @@ libmemcached_libmemcachedutil_la_CXXFLAGS+= @PTHREAD_CFLAGS@
 libmemcached_libmemcachedutil_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
 libmemcached_libmemcachedutil_la_LIBADD+= libmemcached/libmemcached.la
 libmemcached_libmemcachedutil_la_LIBADD+= @PTHREAD_LIBS@
-libmemcached_libmemcachedutil_la_DEPENDENCIES+= libmemcached/libmemcached.la
-
diff --git a/libtest/include.am b/libtest/include.am
index 6d33a694..17ec255c 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -140,8 +140,8 @@ libtest_libtest_la_LIBADD+= $(CURL_LIBS)
 libtest_libtest_la_LIBADD+= @RT_LIB@
 
 EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
-EXTRA_libtest_libtest_la_DEPENDENCIES+=libtest/abort
-EXTRA_libtest_libtest_la_DEPENDENCIES+=libtest/wait
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait
 
 # Declare unittest so that we can append to it
 libtest_unittest_CXXFLAGS=
@@ -236,7 +236,7 @@ noinst_PROGRAMS+= libtest/abort
 libtest_backtrace_SOURCES=
 libtest_backtrace_LDADD=
 libtest_backtrace_SOURCES+= libtest/backtrace_test.cc
-libtest_backtrace_SOURCES+= libgearman/backtrace.cc
+libtest_backtrace_SOURCES+= libmemcached/backtrace.cc
 libtest_backtrace_LDADD+= @DL_LIB@
 noinst_PROGRAMS+= libtest/backtrace
 test-backtrace: libtest/backtrace
diff --git a/tests/cli.am b/tests/cli.am
index b42d394f..2847de90 100644
--- a/tests/cli.am
+++ b/tests/cli.am
@@ -11,77 +11,77 @@
 
 tests_memcapable_SOURCES= tests/memcapable.cc
 tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcapable_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcapable
+EXTRA_tests_memcapable_DEPENDENCIES= clients/memcapable
 tests_memcapable_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memcapable
 noinst_PROGRAMS+= tests/memcapable
 
 tests_memstat_SOURCES= tests/memstat.cc
 tests_memstat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memstat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memstat
+EXTRA_tests_memstat_DEPENDENCIES= clients/memstat
 tests_memstat_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memstat
 noinst_PROGRAMS+= tests/memstat
 
 tests_memcp_SOURCES= tests/memcp.cc
 tests_memcp_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcp_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcp
+EXTRA_tests_memcp_DEPENDENCIES= clients/memcp
 tests_memcp_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memcp
 noinst_PROGRAMS+= tests/memcp
 
 tests_memflush_SOURCES= tests/memflush.cc
 tests_memflush_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memflush_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memflush
+EXTRA_tests_memflush_DEPENDENCIES= clients/memflush
 tests_memflush_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memflush
 noinst_PROGRAMS+= tests/memflush
 
 tests_memrm_SOURCES= tests/memrm.cc
 tests_memrm_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memrm_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memrm
+EXTRA_tests_memrm_DEPENDENCIES= clients/memrm
 tests_memrm_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memrm
 noinst_PROGRAMS+= tests/memrm
 
 tests_memexist_SOURCES= tests/memexist.cc
 tests_memexist_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memexist_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memexist
+EXTRA_tests_memexist_DEPENDENCIES= clients/memexist
 tests_memexist_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memexist
 noinst_PROGRAMS+= tests/memexist
 
 tests_memtouch_SOURCES= tests/memtouch.cc
 tests_memtouch_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memtouch_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memtouch
+EXTRA_tests_memtouch_DEPENDENCIES= clients/memtouch
 tests_memtouch_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memtouch
 noinst_PROGRAMS+= tests/memtouch
 
 tests_memcat_SOURCES= tests/memcat.cc
 tests_memcat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcat
+EXTRA_tests_memcat_DEPENDENCIES= clients/memcat
 tests_memcat_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memcat
 noinst_PROGRAMS+= tests/memcat
 
 tests_memerror_SOURCES= tests/memerror.cc
 tests_memerror_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memerror_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memerror
+EXTRA_tests_memerror_DEPENDENCIES= clients/memerror
 tests_memerror_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memerror
 noinst_PROGRAMS+= tests/memerror
 
 tests_memslap_SOURCES= tests/memslap.cc
 tests_memslap_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memslap
+EXTRA_tests_memslap_DEPENDENCIES= clients/memslap
 tests_memslap_LDADD= libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memslap
 noinst_PROGRAMS+= tests/memslap
 
 tests_memdump_SOURCES= tests/memdump.cc
 tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memdump_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memdump
+EXTRA_tests_memdump_DEPENDENCIES= clients/memdump
 tests_memdump_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memdump
 noinst_PROGRAMS+= tests/memdump
diff --git a/tests/include.am b/tests/include.am
index 7e924604..0ac1d898 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -29,8 +29,7 @@ tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_cycle_CXXFLAGS= $(AM_CXXFLAGS)
 tests_cycle_CXXFLAGS+= ${PTHREAD_CFLAGS}
 tests_cycle_SOURCES= tests/cycle.cc
-tests_cycle_DEPENDENCIES= $(TESTS_LDADDS)
-tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES)
+tests_cycle_LDADD= $(TESTS_LDADDS)
 tests_cycle_LDADD+= ${PTHREAD_LIBS}
 check_PROGRAMS+= tests/cycle
 noinst_PROGRAMS+= tests/cycle
@@ -49,8 +48,7 @@ tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc
 tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc
 
 tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
-tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
-tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
+tests_failure_LDADD= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/failure
 noinst_PROGRAMS+= tests/failure
 
@@ -62,8 +60,7 @@ gdb-failure: tests/failure
 
 
 tests_testhashkit_SOURCES= tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
-tests_testhashkit_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_testhashkit_LDADD= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testhashkit
 noinst_PROGRAMS+= tests/testhashkit
 
@@ -73,8 +70,7 @@ test-hash: tests/testhashkit
 
 tests_hash_plus_SOURCES= tests/hash_plus.cc
 tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
-tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD= $(tests_testhashkit_LDADD)
 check_PROGRAMS+= tests/hash_plus
 noinst_PROGRAMS+= tests/hash_plus
 
diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index a9077c81..6db1187f 100644
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -42,7 +42,6 @@ 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=
 
@@ -50,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
@@ -68,7 +64,6 @@ 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)
@@ -103,10 +98,6 @@ 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_LIB@
 tests_libmemcached_1_0_testapp_LDADD+= @PTHREAD_LIBS@
@@ -121,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@
@@ -159,11 +149,6 @@ 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_LIB@
 tests_libmemcached_1_0_testsocket_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
@@ -224,11 +209,9 @@ gdb-sasl: 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
@@ -241,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)
@@ -252,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
 
@@ -262,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
@@ -274,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
 
diff --git a/tests/parser.am b/tests/parser.am
index 25ab3db4..e0e19987 100644
--- a/tests/parser.am
+++ b/tests/parser.am
@@ -12,14 +12,12 @@ noinst_HEADERS+= tests/libmemcached-1.0/parser.h
 
 tests_parser_SOURCES=
 tests_parser_CXXFLAGS=
-tests_parser_DEPENDENCIES=
 tests_parser_LDADD=
 
 tests_parser_SOURCES+= tests/parser.cc
 
 tests_parser_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_parser_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_parser_LDADD+= $(tests_parser_DEPENDENCIES)
+tests_parser_LDADD+= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/parser
 noinst_PROGRAMS+= tests/parser
 
@@ -27,4 +25,4 @@ test-parser: tests/parser
 	@tests/parser
 
 valgrind-parser: tests/parser
-	$(VALGRIND_COMMAND) tests/parser
+	@$(VALGRIND_COMMAND) tests/parser