diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-15 12:55:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-15 12:55:25 +0200 |
| commit | d78a880900c15c7a28ae81e6632090f25fea7fce (patch) | |
| tree | f40bd5e37cbec02730e9d7689bfee1dabd914347 | |
| parent | 8ce992063510b38fe7de89bec7af1d33aeeb5c93 (diff) | |
| parent | 60af755e56dc08f54c993ce0c044f3ff203b3f59 (diff) | |
| download | bitcoin-d78a880900c15c7a28ae81e6632090f25fea7fce.tar.xz | |
Merge pull request #6820
60af755 build: univalue subdir build fixups (Cory Fields)
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 605031eb43..0a16a863eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,8 +36,8 @@ LIBUNIVALUE=univalue/libunivalue.la $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -$(LIBUNIVALUE): $(wildcard univalue/lib/*) - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/ +$(LIBUNIVALUE): $(wildcard univalue/lib/*) $(wildcard univalue/include/*) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) # 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: @@ -421,6 +421,7 @@ EXTRA_DIST = leveldb clean-local: -$(MAKE) -C leveldb clean -$(MAKE) -C secp256k1 clean + -$(MAKE) -C univalue clean rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno -rm -f config.h |