Skip to content

Commit 0c71521

Browse files
laanwjmeshcollider
authored andcommitted
build: Remove -I for everything but project root
Remove -I from build system for everything but the project root, and built-in dependencies.
1 parent 5b56ec9 commit 0c71521

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
LIBUNIVALUE = $(UNIVALUE_LIBS)
1919
endif
2020

21-
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
21+
BITCOIN_INCLUDES=-I$(builddir) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
2222

2323
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
2424
BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)

src/Makefile.qt.include

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,7 @@ RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
362362

363363
BITCOIN_RC = qt/res/bitcoin-qt-res.rc
364364

365-
BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
366-
-I$(builddir)/qt/forms -DQT_NO_KEYWORDS
365+
BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS
367366

368367
qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
369368
$(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)

src/Makefile.test.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ BITCOIN_TESTS += \
9696
endif
9797

9898
test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
99-
test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS)
99+
test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(EVENT_CFLAGS)
100100
test_test_bitcoin_LDADD =
101101
if ENABLE_WALLET
102102
test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)

0 commit comments

Comments
 (0)