diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-01 16:23:59 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-01 16:36:15 +0200 |
commit | f297042cae572753e6c25d25caf92091e88b76df (patch) | |
tree | 59a0827f7d3500f1b145e4f5653f1f8b94c1e037 /src/Makefile.qt.include | |
parent | 17d0e638b66b9dd51370335c9b0a7039de3f81fa (diff) | |
parent | 95acf3cc6d90d9406030ce897efdee8be0550a53 (diff) |
Merge pull request #6637
95acf3c remove $(@F) and subdirs from univalue make (Jonas Schnelli)
9623e93 [Univalue] add univalue over subtree (Jonas Schnelli)
2f9f082 Squashed 'src/univalue/' content from commit 87d9045 (Jonas Schnelli)
0917306 remove univalue, prepare for subtree (Jonas Schnelli)
Diffstat (limited to 'src/Makefile.qt.include')
-rw-r--r-- | src/Makefile.qt.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 3330ed2890..67fd7c1076 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -367,7 +367,7 @@ endif if ENABLE_ZMQ qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) |