diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2013-11-12 20:09:55 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2014-01-18 19:47:21 +0000 |
| commit | 4a290b526cb064fd698ddb339f6da820d5a60d86 (patch) | |
| tree | 42daea18ef3f286f8bfd8858ecd52aabcb784613 /src/Makefile.am | |
| parent | 9b4e03b27b04f6dc687409a13859d59bb7909d8f (diff) | |
| download | bitcoin-4a290b526cb064fd698ddb339f6da820d5a60d86.tar.xz | |
Cleanup LevelDB library dependencies
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9917be2481..846de05d10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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: |