diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-27 13:37:25 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-27 13:47:25 +0100 |
| commit | f35d71ed22c3d63d296587caf9426126b9ed40bf (patch) | |
| tree | 96aa02e20a815bd8dd11f78dc5cf9e5cbfe912c6 | |
| parent | 1bd8a7b2b969f0077882550692505d55724ff867 (diff) | |
| parent | 071473c55c11c267fe1dec898faf4e3286a3916e (diff) | |
| download | bitcoin-f35d71ed22c3d63d296587caf9426126b9ed40bf.tar.xz | |
Merge pull request #5112
071473c Build util and common before building server (jtimon)
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 42f325e09d..dbefa71fc6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,13 +36,15 @@ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a LIBBITCOINQT=qt/libbitcoinqt.a +# Make is not made aware of per-object dependencies to avoid limiting building parallelization +# But to build the less dependent modules first, we manually select their order here: noinst_LIBRARIES = \ - libbitcoin_server.a \ - libbitcoin_common.a \ - libbitcoin_cli.a \ + crypto/libbitcoin_crypto.a \ libbitcoin_util.a \ + libbitcoin_common.a \ univalue/libbitcoin_univalue.a \ - crypto/libbitcoin_crypto.a + libbitcoin_server.a \ + libbitcoin_cli.a if ENABLE_WALLET BITCOIN_INCLUDES += $(BDB_CPPFLAGS) noinst_LIBRARIES += libbitcoin_wallet.a |