@ -1,6 +1,8 @@
@@ -1,6 +1,8 @@
DIST_SUBDIRS = secp256k1 univalue
AM_LDFLAGS = $( PTHREAD_CFLAGS) $( LIBTOOL_LDFLAGS)
AM_LDFLAGS = $( PTHREAD_CFLAGS) $( LIBTOOL_LDFLAGS) $( HARDENED_LDFLAGS)
AM_CXXFLAGS = $( HARDENED_CXXFLAGS)
AM_CPPFLAGS = $( HARDENED_CPPFLAGS)
i f E M B E D D E D _ L E V E L D B
LEVELDB_CPPFLAGS += -I$( srcdir) /leveldb/include
@ -14,7 +16,7 @@ $(LIBLEVELDB): $(LIBMEMENV)
@@ -14,7 +16,7 @@ $(LIBLEVELDB): $(LIBMEMENV)
$(LIBLEVELDB) $(LIBMEMENV) :
@echo "Building LevelDB ..." && $( MAKE) -C $( @D) $( @F) CXX = " $( CXX) " \
CC = " $( CC) " PLATFORM = $( TARGET_OS) AR = " $( AR) " $( LEVELDB_TARGET_FLAGS) \
OPT = " $( CXXFLAGS) $( CPPFLAGS) -D__STDC_LIMIT_MACROS "
OPT = " $( AM_ CXXFLAGS) $( PIE_FLAGS) $( CXXFLAGS) $( AM_CPP FLAGS) $( CPPFLAGS) -D__STDC_LIMIT_MACROS "
e n d i f
BITCOIN_CONFIG_INCLUDES = -I$( builddir) /config
@ -178,7 +180,8 @@ obj/build.h: FORCE
@@ -178,7 +180,8 @@ obj/build.h: FORCE
libbitcoin_util_a-clientversion.$(OBJEXT) : obj /build .h
# server: shared between bitcoind and bitcoin-qt
libbitcoin_server_a_CPPFLAGS = $( BITCOIN_INCLUDES) $( MINIUPNPC_CPPFLAGS) $( EVENT_CFLAGS) $( EVENT_PTHREADS_CFLAGS)
libbitcoin_server_a_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES) $( MINIUPNPC_CPPFLAGS) $( EVENT_CFLAGS) $( EVENT_PTHREADS_CFLAGS)
libbitcoin_server_a_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
libbitcoin_server_a_SOURCES = \
addrman.cpp \
alert.cpp \
@ -215,6 +218,7 @@ if ENABLE_ZMQ
@@ -215,6 +218,7 @@ if ENABLE_ZMQ
LIBBITCOIN_ZMQ = libbitcoin_zmq.a
libbitcoin_zmq_a_CPPFLAGS = $( BITCOIN_INCLUDES) $( ZMQ_CFLAGS)
libbitcoin_zmq_a_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
libbitcoin_zmq_a_SOURCES = \
zmq/zmqabstractnotifier.cpp \
zmq/zmqnotificationinterface.cpp \
@ -224,7 +228,8 @@ endif
@@ -224,7 +228,8 @@ endif
# wallet: shared between bitcoind and bitcoin-qt, but only linked
# when wallet enabled
libbitcoin_wallet_a_CPPFLAGS = $( BITCOIN_INCLUDES)
libbitcoin_wallet_a_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES)
libbitcoin_wallet_a_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
libbitcoin_wallet_a_SOURCES = \
wallet/crypter.cpp \
wallet/db.cpp \
@ -236,7 +241,8 @@ libbitcoin_wallet_a_SOURCES = \
@@ -236,7 +241,8 @@ libbitcoin_wallet_a_SOURCES = \
$( BITCOIN_CORE_H)
# crypto primitives library
crypto_libbitcoin_crypto_a_CPPFLAGS = $( BITCOIN_CONFIG_INCLUDES)
crypto_libbitcoin_crypto_a_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_CONFIG_INCLUDES)
crypto_libbitcoin_crypto_a_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
crypto_libbitcoin_crypto_a_SOURCES = \
crypto/common.h \
crypto/hmac_sha256.cpp \
@ -253,7 +259,8 @@ crypto_libbitcoin_crypto_a_SOURCES = \
@@ -253,7 +259,8 @@ crypto_libbitcoin_crypto_a_SOURCES = \
crypto/sha512.h
# common: shared between bitcoind, and bitcoin-qt and non-server tools
libbitcoin_common_a_CPPFLAGS = $( BITCOIN_INCLUDES)
libbitcoin_common_a_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES)
libbitcoin_common_a_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
libbitcoin_common_a_SOURCES = \
amount.cpp \
arith_uint256.cpp \
@ -284,7 +291,8 @@ libbitcoin_common_a_SOURCES = \
@@ -284,7 +291,8 @@ libbitcoin_common_a_SOURCES = \
# util: shared between all executables.
# This library *must* be included to make sure that the glibc
# backward-compatibility objects and their sanity checks are linked.
libbitcoin_util_a_CPPFLAGS = $( BITCOIN_INCLUDES)
libbitcoin_util_a_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES)
libbitcoin_util_a_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
libbitcoin_util_a_SOURCES = \
support/pagelocker.cpp \
chainparamsbase.cpp \
@ -308,7 +316,8 @@ libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
@@ -308,7 +316,8 @@ libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
e n d i f
# cli: shared between bitcoin-cli and bitcoin-qt
libbitcoin_cli_a_CPPFLAGS = $( BITCOIN_INCLUDES)
libbitcoin_cli_a_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES)
libbitcoin_cli_a_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
libbitcoin_cli_a_SOURCES = \
rpcclient.cpp \
$( BITCOIN_CORE_H)
@ -318,7 +327,8 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
@@ -318,7 +327,8 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
# bitcoind binary #
bitcoind_SOURCES = bitcoind.cpp
bitcoind_CPPFLAGS = $( BITCOIN_INCLUDES)
bitcoind_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES)
bitcoind_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
bitcoind_LDFLAGS = $( RELDFLAGS) $( AM_LDFLAGS) $( LIBTOOL_APP_LDFLAGS)
i f T A R G E T _ W I N D O W S
@ -347,7 +357,8 @@ bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPN
@@ -347,7 +357,8 @@ bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPN
# bitcoin-cli binary #
bitcoin_cli_SOURCES = bitcoin-cli.cpp
bitcoin_cli_CPPFLAGS = $( BITCOIN_INCLUDES) $( EVENT_CFLAGS)
bitcoin_cli_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES) $( EVENT_CFLAGS)
bitcoin_cli_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
bitcoin_cli_LDFLAGS = $( RELDFLAGS) $( AM_LDFLAGS) $( LIBTOOL_APP_LDFLAGS)
i f T A R G E T _ W I N D O W S
@ -364,7 +375,8 @@ bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
@@ -364,7 +375,8 @@ bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
# bitcoin-tx binary #
bitcoin_tx_SOURCES = bitcoin-tx.cpp
bitcoin_tx_CPPFLAGS = $( BITCOIN_INCLUDES)
bitcoin_tx_CPPFLAGS = $( AM_CPPFLAGS) $( BITCOIN_INCLUDES)
bitcoin_tx_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
bitcoin_tx_LDFLAGS = $( RELDFLAGS) $( AM_LDFLAGS) $( LIBTOOL_APP_LDFLAGS)
i f T A R G E T _ W I N D O W S
@ -405,9 +417,10 @@ if GLIBC_BACK_COMPAT
@@ -405,9 +417,10 @@ if GLIBC_BACK_COMPAT
libbitcoinconsensus_la_SOURCES += compat/glibc_compat.cpp
e n d i f
libbitcoinconsensus_la_LDFLAGS = -no-undefined $( RELDFLAGS)
libbitcoinconsensus_la_LDFLAGS = $( AM_LDFLAGS) -no-undefined $( RELDFLAGS)
libbitcoinconsensus_la_LIBADD = $( CRYPTO_LIBS)
libbitcoinconsensus_la_CPPFLAGS = $( CRYPTO_CFLAGS) -I$( builddir) /obj -DBUILD_BITCOIN_INTERNAL
libbitcoinconsensus_la_CPPFLAGS = $( AM_CPPFLAGS) $( CRYPTO_CFLAGS) -I$( builddir) /obj -DBUILD_BITCOIN_INTERNAL
libbitcoinconsensus_la_CXXFLAGS = $( AM_CXXFLAGS) $( PIE_FLAGS)
e n d i f
#
@ -443,7 +456,7 @@ clean-local:
@@ -443,7 +456,7 @@ clean-local:
.mm.o :
$( AM_V_CXX) $( OBJCXX) $( DEFS) $( DEFAULT_INCLUDES) $( INCLUDES) $( AM_CPPFLAGS) \
$( CPPFLAGS) $( AM_CXXFLAGS) $( QT_INCLUDES) $( CXXFLAGS) -c -o $@ $<
$( CPPFLAGS) $( AM_CXXFLAGS) $( QT_INCLUDES) $( AM_ CXXFLAGS) $( PIE_FLAGS) $( CXXFLAGS) -c -o $@ $<
%.pb.cc %.pb.h : %.proto
@test -f $( PROTOC)