diff options
| author | danra <danra@users.noreply.github.com> | 2017-08-25 20:27:38 +0300 |
|---|---|---|
| committer | Dan Raviv <dan@soundradix.com> | 2017-08-31 21:30:41 +0300 |
| commit | 5abb93f0eefffb5bb31e75a7dd258534cff4b0a0 (patch) | |
| tree | c239cfcd6dccf8aa978a39e4847c6cd1090563cc | |
| parent | d81dccf191a48a6b59c3747d7b4ccbe3535dde40 (diff) | |
| download | bitcoin-5abb93f0eefffb5bb31e75a7dd258534cff4b0a0.tar.xz | |
Fix include path for bitcoin-config.h in crypto/common.h
All the other files in the repo which include bitcoin-config.h do so with the appropriate subfolder prefixed: config/bitcoin-config.h
The header should be included with the appropriate subfolder here as well.
This canonicalization also allows getting rid of a bit of extra configuration in Makefile.am.
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/crypto/common.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dea656869d..5df2791abd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,6 @@ else LIBUNIVALUE = $(UNIVALUE_LIBS) endif -BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include @@ -250,7 +249,7 @@ libbitcoin_wallet_a_SOURCES = \ $(BITCOIN_CORE_H) # crypto primitives library -crypto_libbitcoin_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES) +crypto_libbitcoin_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) crypto_libbitcoin_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) crypto_libbitcoin_crypto_a_SOURCES = \ crypto/aes.cpp \ diff --git a/src/crypto/common.h b/src/crypto/common.h index bcca3d30ea..bd9bc9420b 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -6,7 +6,7 @@ #define BITCOIN_CRYPTO_COMMON_H #if defined(HAVE_CONFIG_H) -#include "bitcoin-config.h" +#include "config/bitcoin-config.h" #endif #include <stdint.h> |