Browse Source

Merge pull request #4395

f3967bc build: fix build weirdness after 54372482. (Cory Fields)
try
Wladimir J. van der Laan 10 years ago
parent
commit
36db6633c3
No known key found for this signature in database GPG Key ID: 74810B012346C9A6
  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

@ -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
src/clientversion.h

@ -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

2
src/compat/glibc_compat.cpp

@ -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>

2
src/compat/glibc_sanity.cpp

@ -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>

2
src/init.cpp

@ -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"

2
src/main.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"

2
src/net.cpp

@ -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"

2
src/netbase.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"

2
src/qt/addressbookpage.cpp

@ -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"

2
src/qt/bitcoin.cpp

@ -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"

2
src/qt/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>

2
src/qt/notificator.h

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

2
src/qt/optionsdialog.cpp

@ -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"

2
src/qt/optionsmodel.cpp

@ -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"

2
src/qt/receiverequestdialog.cpp

@ -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

2
src/qt/test/test_main.cpp

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

2
src/util.h

@ -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…
Cancel
Save