build: move bitcoin-config.h to its own directory
This allows us to include its path without making other header includes valid.
This commit is contained in:
parent
3820e01eb9
commit
54372482a8
3 changed files with 4 additions and 2 deletions
|
@ -111,7 +111,7 @@ AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[spec
|
||||||
|
|
||||||
|
|
||||||
AC_CONFIG_SRCDIR([src])
|
AC_CONFIG_SRCDIR([src])
|
||||||
AC_CONFIG_HEADERS([src/bitcoin-config.h])
|
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
|
|
@ -17,7 +17,8 @@ $(LIBLEVELDB) $(LIBMEMENV):
|
||||||
OPT="$(CXXFLAGS) $(CPPFLAGS)"
|
OPT="$(CXXFLAGS) $(CPPFLAGS)"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
|
BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
|
||||||
|
BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BITCOIN_CONFIG_INCLUDES) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = \
|
noinst_LIBRARIES = \
|
||||||
libbitcoin_server.a \
|
libbitcoin_server.a \
|
||||||
|
@ -219,6 +220,7 @@ EXTRA_DIST = leveldb
|
||||||
clean-local:
|
clean-local:
|
||||||
-$(MAKE) -C leveldb clean
|
-$(MAKE) -C leveldb clean
|
||||||
rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno
|
rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno
|
||||||
|
-rm -f config.h
|
||||||
|
|
||||||
.rc.o:
|
.rc.o:
|
||||||
@test -f $(WINDRES)
|
@test -f $(WINDRES)
|
||||||
|
|
0
src/config/.empty
Normal file
0
src/config/.empty
Normal file
Loading…
Reference in a new issue