Cleanup LevelDB library dependencies
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
include Makefile.include
|
||||
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
|
||||
-I$(builddir)
|
||||
AM_CPPFLAGS += -I$(builddir)
|
||||
|
||||
noinst_LIBRARIES = \
|
||||
libbitcoin_server.a \
|
||||
@@ -140,8 +139,8 @@ bitcoind_LDADD = \
|
||||
libbitcoin_server.a \
|
||||
libbitcoin_cli.a \
|
||||
libbitcoin_common.a \
|
||||
leveldb/libleveldb.a \
|
||||
leveldb/libmemenv.a
|
||||
$(LIBLEVELDB) \
|
||||
$(LIBMEMENV)
|
||||
if ENABLE_WALLET
|
||||
bitcoind_LDADD += libbitcoin_wallet.a
|
||||
endif
|
||||
@@ -167,6 +166,7 @@ if TARGET_WINDOWS
|
||||
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
|
||||
endif
|
||||
|
||||
# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
|
||||
leveldb/libleveldb.a: leveldb/libmemenv.a
|
||||
|
||||
leveldb/%.a:
|
||||
|
||||
Reference in New Issue
Block a user