Skip to content

Commit 43e2a19

Browse files
committed
merge bitcoin#23345: Drop unneeded dependencies for bitcoin-wallet tool
1 parent f7dad69 commit 43e2a19

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

configure.ac

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,6 +1503,12 @@ if test "$use_usdt" != "no"; then
15031503
fi
15041504
AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"])
15051505

1506+
if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then
1507+
use_upnp=no
1508+
use_natpmp=no
1509+
use_zmq=no
1510+
fi
1511+
15061512
dnl Check for libminiupnpc (optional)
15071513
if test "$use_upnp" != "no"; then
15081514
TEMP_CPPFLAGS="$CPPFLAGS"

src/Makefile.am

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,21 @@ dash_wallet_SOURCES = bitcoin-wallet.cpp
10871087
dash_wallet_CPPFLAGS = $(bitcoin_bin_cppflags)
10881088
dash_wallet_CXXFLAGS = $(bitcoin_bin_cxxflags)
10891089
dash_wallet_LDFLAGS = $(bitcoin_bin_ldflags)
1090-
dash_wallet_LDADD = $(LIBBITCOIN_WALLET_TOOL) $(bitcoin_bin_ldadd)
1090+
dash_wallet_LDADD = \
1091+
$(LIBBITCOIN_WALLET_TOOL) \
1092+
$(LIBBITCOIN_WALLET) \
1093+
$(LIBBITCOIN_COMMON) \
1094+
$(LIBBITCOIN_UTIL) \
1095+
$(LIBUNIVALUE) \
1096+
$(LIBBITCOIN_CONSENSUS) \
1097+
$(LIBBITCOIN_CRYPTO) \
1098+
$(LIBDASHBLS) \
1099+
$(LIBSECP256K1) \
1100+
$(BACKTRACE_LIB) \
1101+
$(BOOST_LIBS) \
1102+
$(BDB_LIBS) \
1103+
$(SQLITE_LIBS) \
1104+
$(GMP_LIBS)
10911105

10921106
if TARGET_WINDOWS
10931107
dash_wallet_SOURCES += dash-wallet-res.rc

0 commit comments

Comments
 (0)