From: Brian Aker <brian@tangent.org>
Date: Mon, 17 Dec 2012 08:43:11 +0000 (-0500)
Subject: Update libtest.
X-Git-Tag: 1.0.15^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=91835aac219196d116555e7e0a83fde7393d1d8d;p=awesomized%2Flibmemcached

Update libtest.
---

diff --git a/libtest/include.am b/libtest/include.am
index fe43701f..6d33a694 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -94,7 +94,7 @@ noinst_HEADERS+= libtest/wait.h
 noinst_LTLIBRARIES+= libtest/libtest.la
 
 libtest_libtest_la_CXXFLAGS=
-libtest_libtest_la_DEPENDENCIES=
+EXTRA_libtest_libtest_la_DEPENDENCIES=
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
 
@@ -139,23 +139,25 @@ libtest_libtest_la_LIBADD+= @PTHREAD_LIBS@
 libtest_libtest_la_LIBADD+= $(CURL_LIBS)
 libtest_libtest_la_LIBADD+= @RT_LIB@
 
-libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
-libtest_libtest_la_DEPENDENCIES+=libtest/abort
-libtest_libtest_la_DEPENDENCIES+=libtest/wait
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
+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=
 libtest_unittest_LDADD=
-libtest_unittest_DEPENDENCIES=
 
 # We are either building in tree, or with
 if BUILDING_LIBMEMCACHED
+libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED
 
 libtest_unittest_CXXFLAGS+= -DHAVE_LIBMEMCACHED
+libtest_unittest_LDADD+= libmemcached/libmemcached.la
 else
 if HAVE_LIBMEMCACHED
+libtest_libtest_la_LIBADD+= $(LIBMEMCACHED_UTIL_LDFLAGS)
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 else
 libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
@@ -175,7 +177,8 @@ libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
 libtest_libtest_la_SOURCES+= libtest/gearmand.cc
 libtest_libtest_la_SOURCES+= util/instance.cc
 libtest_libtest_la_SOURCES+= util/operation.cc
-libtest_unittest_DEPENDENCIES+= gearmand/gearmand
+
+libtest_unittest_LDADD+= libgearman/libgearman.la
 else
 if HAVE_LIBGEARMAN
 libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
@@ -193,7 +196,6 @@ libtest_tmp_dir: | $(TMP_DIR)
 $(TMP_DIR):
 	@$(mkdir_p) $(TMP_DIR)
 
-libtest_unittest_DEPENDENCIES+= libtest/libtest.la
 libtest_unittest_LDADD+= libtest/libtest.la
 libtest_unittest_SOURCES= libtest/unittest.cc
 check_PROGRAMS+= libtest/unittest
@@ -234,7 +236,7 @@ noinst_PROGRAMS+= libtest/abort
 libtest_backtrace_SOURCES=
 libtest_backtrace_LDADD=
 libtest_backtrace_SOURCES+= libtest/backtrace_test.cc
-libtest_backtrace_SOURCES+= libmemcached/backtrace.cc
+libtest_backtrace_SOURCES+= libgearman/backtrace.cc
 libtest_backtrace_LDADD+= @DL_LIB@
 noinst_PROGRAMS+= libtest/backtrace
 test-backtrace: libtest/backtrace