build: quit abusing AM_CPPFLAGS

Now that the build is non-recursive, adding to AM_CPPFLAGS means adding to
_all_ cppflags.

Logical groups of includes have been added instead, and are used individually
by various targets.
This commit is contained in:
Cory Fields
2014-06-05 15:24:48 -04:00
parent 56c157d5e0
commit f4d81129f0
4 changed files with 21 additions and 25 deletions

View File

@@ -1,8 +1,3 @@
AM_CPPFLAGS += -I$(srcdir) \
-I$(srcdir)/qt \
-I$(builddir)/qt \
$(PROTOBUF_CFLAGS) \
$(QR_CFLAGS)
bin_PROGRAMS += qt/test/test_bitcoin-qt
TESTS += qt/test/test_bitcoin-qt
@@ -17,7 +12,8 @@ TEST_QT_H = \
qt/test/paymentrequestdata.h \
qt/test/paymentservertests.h
qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
qt_test_test_bitcoin_qt_CPPFLAGS = $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
$(QT_INCLUDES) $(QT_TEST_INCLUDES)
qt_test_test_bitcoin_qt_SOURCES = \
qt/test/test_main.cpp \