kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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.
0.10
Cory Fields 11 years ago
parent
6d875669aa
commit
f3967bcc50
17 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Makefile.am
  2. 2
      src/clientversion.h
  3. 2
      src/compat/glibc_compat.cpp
  4. 2
      src/compat/glibc_sanity.cpp
  5. 2
      src/init.cpp
  6. 2
      src/main.h
  7. 2
      src/net.cpp
  8. 2
      src/netbase.h
  9. 2
      src/qt/addressbookpage.cpp
  10. 2
      src/qt/bitcoin.cpp
  11. 2
      src/qt/bitcoingui.h
  12. 2
      src/qt/notificator.h
  13. 2
      src/qt/optionsdialog.cpp
  14. 2
      src/qt/optionsmodel.cpp
  15. 2
      src/qt/receiverequestdialog.cpp
  16. 2
      src/qt/test/test_main.cpp
  17. 2
      src/util.h

2
src/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ $(LIBLEVELDB) $(LIBMEMENV):
endif endif
BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config 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 = \ noinst_LIBRARIES = \
libbitcoin_server.a \ libbitcoin_server.a \

2
src/clientversion.h
Unescape View File

@ -2,7 +2,7 @@
#define CLIENTVERSION_H #define CLIENTVERSION_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#else #else
// //
// client versioning and copyright year // client versioning and copyright year

2
src/compat/glibc_compat.cpp
Unescape View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include <cstddef> #include <cstddef>

2
src/compat/glibc_sanity.cpp
Unescape View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include <cstddef> #include <cstddef>

2
src/init.cpp
Unescape View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "init.h" #include "init.h"

2
src/main.h
Unescape View File

@ -7,7 +7,7 @@
#define BITCOIN_MAIN_H #define BITCOIN_MAIN_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "chainparams.h" #include "chainparams.h"

2
src/net.cpp
Unescape View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "net.h" #include "net.h"

2
src/netbase.h
Unescape View File

@ -6,7 +6,7 @@
#define BITCOIN_NETBASE_H #define BITCOIN_NETBASE_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "compat.h" #include "compat.h"

2
src/qt/addressbookpage.cpp
Unescape View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "addressbookpage.h" #include "addressbookpage.h"

2
src/qt/bitcoin.cpp
Unescape View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "bitcoingui.h" #include "bitcoingui.h"

2
src/qt/bitcoingui.h
Unescape View File

@ -6,7 +6,7 @@
#define BITCOINGUI_H #define BITCOINGUI_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include <QMainWindow> #include <QMainWindow>

2
src/qt/notificator.h
Unescape View File

@ -6,7 +6,7 @@
#define NOTIFICATOR_H #define NOTIFICATOR_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include <QIcon> #include <QIcon>

2
src/qt/optionsdialog.cpp
Unescape View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "optionsdialog.h" #include "optionsdialog.h"

2
src/qt/optionsmodel.cpp
Unescape View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "optionsmodel.h" #include "optionsmodel.h"

2
src/qt/receiverequestdialog.cpp
Unescape View File

@ -22,7 +22,7 @@
#endif #endif
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" /* for USE_QRCODE */ #include "config/bitcoin-config.h" /* for USE_QRCODE */
#endif #endif
#ifdef USE_QRCODE #ifdef USE_QRCODE

2
src/qt/test/test_main.cpp
Unescape View File

@ -1,5 +1,5 @@
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET

2
src/util.h
Unescape View File

@ -7,7 +7,7 @@
#define BITCOIN_UTIL_H #define BITCOIN_UTIL_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "config/bitcoin-config.h"
#endif #endif
#include "compat.h" #include "compat.h"

Write Preview
Loading…
Cancel
Save