From f4d81129f0858685c33e79f74084f2931b8c21b4 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Thu, 5 Jun 2014 15:24:48 -0400 Subject: 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. --- src/Makefile.qttest.include | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Makefile.qttest.include') 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 \ -- cgit v1.2.3