diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:12:28 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-09-27 11:13:51 -0400 |
| commit | b88dd7c2dbf8daca58306afd1744c4f88049b6df (patch) | |
| tree | 8c3149f03580ee8561e48da24b7e355464890297 /src/Makefile.am | |
| parent | edcf29c9da02c26ce8cae9bf2a68628c7543351e (diff) | |
| parent | a2a04a5abb347d52b3ef473f7c80c3c0ffc67a2f (diff) | |
Merge #12246: Bugfix: Only run bitcoin-tx tests when bitcoin-tx is enabled
a2a04a5abb Bugfix: Only run bitcoin-tx tests when bitcoin-tx is enabled (Luke Dashjr)
92af71cea9 configure: Make it possible to build only one of bitcoin-cli or bitcoin-tx (Luke Dashjr)
Pull request description:
Includes #5618 (which the reasons for rejecting no longer hold true)
Tree-SHA512: f30a8e4a2f70166b7cabef77c4674163b3a9da14c6a547d34f00d1056a19bf4d23e22851eea726fad2afc8735d5473ae91122c770b65ac3886663dc20e2c5b70
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a1b9b4cb82..7a2e9fa5e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -83,8 +83,11 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif -if BUILD_BITCOIN_UTILS - bin_PROGRAMS += bitcoin-cli bitcoin-tx +if BUILD_BITCOIN_CLI + bin_PROGRAMS += bitcoin-cli +endif +if BUILD_BITCOIN_TX + bin_PROGRAMS += bitcoin-tx endif .PHONY: FORCE check-symbols check-security |