diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-06-05 15:24:48 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-06-05 16:05:57 -0400 |
| commit | f4d81129f0858685c33e79f74084f2931b8c21b4 (patch) | |
| tree | 80beab8a412b27756c5058af238593e25b645997 /src/Makefile.test.include | |
| parent | 56c157d5e087e3976ae05cad2dc08a1fcd9a2400 (diff) | |
| download | bitcoin-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.test.include')
| -rw-r--r-- | src/Makefile.test.include | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 1e4bd4ca8c..988830260c 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -1,5 +1,3 @@ -AM_CPPFLAGS += -I$(builddir)/test/ - TESTS += test/test_bitcoin bin_PROGRAMS += test/test_bitcoin TEST_SRCDIR = test @@ -62,7 +60,7 @@ BITCOIN_TESTS += \ endif test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) -test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS) +test_test_bitcoin_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) if ENABLE_WALLET |