aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCory Fields <[email protected]>2013-12-18 14:08:24 -0500
committerCory Fields <[email protected]>2014-01-10 16:30:33 -0500
commit328bdb1cd63a46af3bcc1431ffa24dd8fe3125e7 (patch)
tree10771e9953c288ace4b653801d0345b932da3462 /src
parentMerge pull request #3506 (diff)
downloaddiscoin-328bdb1cd63a46af3bcc1431ffa24dd8fe3125e7.tar.xz
discoin-328bdb1cd63a46af3bcc1431ffa24dd8fe3125e7.zip
qt5: Ensure correct link order
If optional libs don't appear in QT_LIBS, they need to be listed first for proper static linking.
Diffstat (limited to 'src')
-rw-r--r--src/qt/test/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am
index cb6874700..015052433 100644
--- a/src/qt/test/Makefile.am
+++ b/src/qt/test/Makefile.am
@@ -18,7 +18,7 @@ test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp paymentservertests.cpp $(TEST_QT_H)
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
- $(LIBMEMENV) $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
+ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno