aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-12-03 03:47:44 -0800
committerGavin Andresen <gavinandresen@gmail.com>2013-12-03 03:47:44 -0800
commitcf74e8cb5eed90cbb14ed40d834c30ef9d37c443 (patch)
tree115a15599169cb7fbcaa0a76c38c3c444dbaf068 /src/test
parent0563ee952c299c7b796b787c8b5251beef8bf6ee (diff)
parent0b47fe6bdc14e942bc886a08a55cc183c6820636 (diff)
downloadbitcoin-cf74e8cb5eed90cbb14ed40d834c30ef9d37c443.tar.xz
Merge pull request #3320 from laanwj/2013_11_cli_split
bitcoin-cli: remove unneeded dependencies (only minor code movement)
Diffstat (limited to 'src/test')
-rw-r--r--src/test/Makefile.am2
-rw-r--r--src/test/test_bitcoin.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 180fd7effa..39f2c6a385 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -20,7 +20,7 @@ BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
# test_bitcoin binary #
test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)
-test_bitcoin_LDADD = $(LIBBITCOIN) $(LIBLEVELDB) $(LIBMEMENV) \
+test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(BDB_LIBS)
test_bitcoin_SOURCES = accounting_tests.cpp alert_tests.cpp \
allocator_tests.cpp base32_tests.cpp base58_tests.cpp base64_tests.cpp \
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index f947167597..443e7735d7 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -14,7 +14,6 @@
CWallet* pwalletMain;
-CClientUIInterface uiInterface;
extern bool fPrintToConsole;
extern void noui_connect();