Skip to content

Commit 46a8909

Browse files
committed
build: pass bdb cppflags only where needed
Move bdb cppflags out of the catch-all BITCOIN_INCLUDES, and pass them only where they are needed, which is in libbitcoin_node/wallet and the tests.
1 parent b9ef5a1 commit 46a8909

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ noinst_PROGRAMS =
2323
TESTS =
2424
BENCHMARKS =
2525

26-
BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
26+
BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
2727

2828
LIBBITCOIN_NODE=libbitcoin_node.a
2929
LIBBITCOIN_COMMON=libbitcoin_common.a
@@ -406,6 +406,7 @@ libbitcoin_node_a_SOURCES = \
406406

407407
if ENABLE_WALLET
408408
libbitcoin_node_a_SOURCES += wallet/init.cpp
409+
libbitcoin_node_a_CPPFLAGS += $(BDB_CPPFLAGS)
409410
endif
410411
if !ENABLE_WALLET
411412
libbitcoin_node_a_SOURCES += dummywallet.cpp
@@ -425,7 +426,7 @@ endif
425426

426427
# wallet: shared between bitcoind and bitcoin-qt, but only linked
427428
# when wallet enabled
428-
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(SQLITE_CFLAGS)
429+
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BDB_CPPFLAGS) $(SQLITE_CFLAGS)
429430
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
430431
libbitcoin_wallet_a_SOURCES = \
431432
wallet/coincontrol.cpp \

src/Makefile.test.include

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(EV
201201
test_test_bitcoin_LDADD = $(LIBTEST_UTIL)
202202
if ENABLE_WALLET
203203
test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
204+
test_test_bitcoin_CPPFLAGS += $(BDB_CPPFLAGS)
204205
endif
205206

206207
test_test_bitcoin_LDADD += $(LIBBITCOIN_NODE) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \

0 commit comments

Comments
 (0)