aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.qttest.include
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2014-06-05 15:24:48 -0400
committerCory Fields <cory-nospam-@coryfields.com>2014-06-05 16:05:57 -0400
commitf4d81129f0858685c33e79f74084f2931b8c21b4 (patch)
tree80beab8a412b27756c5058af238593e25b645997 /src/Makefile.qttest.include
parent56c157d5e087e3976ae05cad2dc08a1fcd9a2400 (diff)
downloadbitcoin-f4d81129f0858685c33e79f74084f2931b8c21b4.tar.xz
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.
Diffstat (limited to 'src/Makefile.qttest.include')
-rw-r--r--src/Makefile.qttest.include8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index 09e61cf57c..e0b49d0240 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -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 \