build: fix build weirdness after 54372482
.
bitcoin-config.h moved, but the old file is likely to still exist when reconfiguring or switching branches. This would've caused files to not rebuild correctly, and other strange problems. Make the path explicit so that the old one cannot be found. Core libs use config/bitcoin-config.h. Libs (like crypto) which don't want access to bitcoin's headers continue to use -Iconfig and #include bitcoin-config.h.
This commit is contained in:
parent
6d875669aa
commit
f3967bcc50
17 changed files with 17 additions and 17 deletions
|
@ -18,7 +18,7 @@ $(LIBLEVELDB) $(LIBMEMENV):
|
|||
endif
|
||||
|
||||
BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
|
||||
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BITCOIN_CONFIG_INCLUDES) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
|
||||
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
|
||||
|
||||
noinst_LIBRARIES = \
|
||||
libbitcoin_server.a \
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define CLIENTVERSION_H
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#else
|
||||
//
|
||||
// client versioning and copyright year
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include <cstddef>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include <cstddef>
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "init.h"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#define BITCOIN_MAIN_H
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "chainparams.h"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "net.h"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#define BITCOIN_NETBASE_H
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "compat.h"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "addressbookpage.h"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "bitcoingui.h"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#define BITCOINGUI_H
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include <QMainWindow>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#define NOTIFICATOR_H
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include <QIcon>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "optionsdialog.h"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "optionsmodel.h"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h" /* for USE_QRCODE */
|
||||
#include "config/bitcoin-config.h" /* for USE_QRCODE */
|
||||
#endif
|
||||
|
||||
#ifdef USE_QRCODE
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#define BITCOIN_UTIL_H
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include "bitcoin-config.h"
|
||||
#include "config/bitcoin-config.h"
|
||||
#endif
|
||||
|
||||
#include "compat.h"
|
||||
|
|
Loading…
Reference in a new issue