Skip to content

Commit 4fe7cf1

Browse files
committed
build: Drop unneeded dependencies for bitcoin-wallet tool
1 parent 5cc083c commit 4fe7cf1

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,18 @@
1818
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
1919
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
2020
</ProjectReference>
21-
<ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj">
22-
<Project>{0667528c-d734-4009-adf9-c0d6c4a5a5a6}</Project>
23-
</ProjectReference>
2421
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">
2522
<Project>{7c87e378-df58-482e-aa2f-1bc129bc19ce}</Project>
2623
</ProjectReference>
2724
<ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj">
2825
<Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project>
2926
</ProjectReference>
30-
<ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj">
31-
<Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project>
32-
</ProjectReference>
3327
<ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj">
3428
<Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project>
3529
</ProjectReference>
3630
<ProjectReference Include="..\libbitcoin_wallet\libbitcoin_wallet.vcxproj">
3731
<Project>{93b86837-b543-48a5-a89b-7c87abb77df2}</Project>
3832
</ProjectReference>
39-
<ProjectReference Include="..\libbitcoin_zmq\libbitcoin_zmq.vcxproj">
40-
<Project>{792d487f-f14c-49fc-a9de-3fc150f31c3f}</Project>
41-
</ProjectReference>
4233
<ProjectReference Include="..\libunivalue\libunivalue.vcxproj">
4334
<Project>{5724ba7d-a09a-4ba8-800b-c4c1561b3d69}</Project>
4435
</ProjectReference>
@@ -48,9 +39,6 @@
4839
<ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
4940
<Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
5041
</ProjectReference>
51-
<ProjectReference Include="..\libleveldb\libleveldb.vcxproj">
52-
<Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project>
53-
</ProjectReference>
5442
</ItemGroup>
5543
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5644
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

configure.ac

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,12 @@ if test x$use_ebpf != xno; then
13521352
)
13531353
fi
13541354

1355+
if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests = xnonononononono; then
1356+
use_upnp=no
1357+
use_natpmp=no
1358+
use_zmq=no
1359+
fi
1360+
13551361
dnl Check for libminiupnpc (optional)
13561362
if test x$use_upnp != xno; then
13571363
AC_CHECK_HEADERS(

src/Makefile.am

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,18 @@ bitcoin_wallet_SOURCES += init/bitcoin-wallet.cpp
709709
bitcoin_wallet_CPPFLAGS = $(bitcoin_bin_cppflags)
710710
bitcoin_wallet_CXXFLAGS = $(bitcoin_bin_cxxflags)
711711
bitcoin_wallet_LDFLAGS = $(bitcoin_bin_ldflags)
712-
bitcoin_wallet_LDADD = $(LIBBITCOIN_WALLET_TOOL) $(bitcoin_bin_ldadd)
712+
bitcoin_wallet_LDADD = \
713+
$(LIBBITCOIN_WALLET_TOOL) \
714+
$(LIBBITCOIN_WALLET) \
715+
$(LIBBITCOIN_COMMON) \
716+
$(LIBBITCOIN_UTIL) \
717+
$(LIBUNIVALUE) \
718+
$(LIBBITCOIN_CONSENSUS) \
719+
$(LIBBITCOIN_CRYPTO) \
720+
$(LIBSECP256K1) \
721+
$(BOOST_LIBS) \
722+
$(BDB_LIBS) \
723+
$(SQLITE_LIBS)
713724

714725
if TARGET_WINDOWS
715726
bitcoin_wallet_SOURCES += bitcoin-wallet-res.rc

0 commit comments

Comments
 (0)