Merge pull request #5234
72ac792
Format build flags in src/Makefile.am. (randy-waterhouse)
This commit is contained in:
commit
d781d4725c
1 changed files with 28 additions and 26 deletions
|
@ -291,6 +291,14 @@ nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
|
||||||
#
|
#
|
||||||
|
|
||||||
# bitcoind binary #
|
# bitcoind binary #
|
||||||
|
bitcoind_SOURCES = bitcoind.cpp
|
||||||
|
bitcoind_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||||
|
bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||||
|
|
||||||
|
if TARGET_WINDOWS
|
||||||
|
bitcoind_SOURCES += bitcoind-res.rc
|
||||||
|
endif
|
||||||
|
|
||||||
bitcoind_LDADD = \
|
bitcoind_LDADD = \
|
||||||
$(LIBBITCOIN_SERVER) \
|
$(LIBBITCOIN_SERVER) \
|
||||||
$(LIBBITCOIN_COMMON) \
|
$(LIBBITCOIN_COMMON) \
|
||||||
|
@ -304,51 +312,43 @@ bitcoind_LDADD = \
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
bitcoind_LDADD += libbitcoin_wallet.a
|
bitcoind_LDADD += libbitcoin_wallet.a
|
||||||
endif
|
endif
|
||||||
bitcoind_SOURCES = bitcoind.cpp
|
|
||||||
#
|
|
||||||
|
|
||||||
if TARGET_WINDOWS
|
|
||||||
bitcoind_SOURCES += bitcoind-res.rc
|
|
||||||
endif
|
|
||||||
|
|
||||||
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
|
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
|
||||||
bitcoind_CPPFLAGS = $(BITCOIN_INCLUDES)
|
#
|
||||||
bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
|
||||||
|
|
||||||
# bitcoin-cli binary #
|
# bitcoin-cli binary #
|
||||||
|
bitcoin_cli_SOURCES = bitcoin-cli.cpp
|
||||||
|
bitcoin_cli_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||||
|
bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||||
|
|
||||||
|
if TARGET_WINDOWS
|
||||||
|
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
|
||||||
|
endif
|
||||||
|
|
||||||
bitcoin_cli_LDADD = \
|
bitcoin_cli_LDADD = \
|
||||||
$(LIBBITCOIN_CLI) \
|
$(LIBBITCOIN_CLI) \
|
||||||
$(LIBBITCOIN_UTIL) \
|
$(LIBBITCOIN_UTIL) \
|
||||||
$(BOOST_LIBS) \
|
$(LIBSECP256K1)
|
||||||
$(SSL_LIBS) \
|
|
||||||
$(CRYPTO_LIBS)
|
|
||||||
|
|
||||||
bitcoin_cli_SOURCES = \
|
bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS)
|
||||||
bitcoin-cli.cpp
|
|
||||||
|
|
||||||
bitcoin_cli_CPPFLAGS = $(BITCOIN_INCLUDES)
|
|
||||||
#
|
#
|
||||||
|
|
||||||
# bitcoin-tx binary #
|
# bitcoin-tx binary #
|
||||||
|
bitcoin_tx_SOURCES = bitcoin-tx.cpp
|
||||||
|
bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||||
|
bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
||||||
|
|
||||||
bitcoin_tx_LDADD = \
|
bitcoin_tx_LDADD = \
|
||||||
$(LIBBITCOIN_UNIVALUE) \
|
$(LIBBITCOIN_UNIVALUE) \
|
||||||
$(LIBBITCOIN_COMMON) \
|
$(LIBBITCOIN_COMMON) \
|
||||||
$(LIBBITCOIN_UTIL) \
|
$(LIBBITCOIN_UTIL) \
|
||||||
$(LIBBITCOIN_CRYPTO) \
|
$(LIBBITCOIN_CRYPTO) \
|
||||||
$(LIBSECP256K1) \
|
$(LIBSECP256K1)
|
||||||
$(BOOST_LIBS) \
|
|
||||||
$(CRYPTO_LIBS)
|
|
||||||
|
|
||||||
bitcoin_tx_SOURCES = bitcoin-tx.cpp
|
bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
|
||||||
bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
|
|
||||||
#
|
#
|
||||||
bitcoin_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
|
||||||
|
|
||||||
if TARGET_WINDOWS
|
|
||||||
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
|
|
||||||
endif
|
|
||||||
bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
|
|
||||||
|
|
||||||
|
# bitcoinconsensus library #
|
||||||
if BUILD_BITCOIN_LIBS
|
if BUILD_BITCOIN_LIBS
|
||||||
include_HEADERS = script/bitcoinconsensus.h
|
include_HEADERS = script/bitcoinconsensus.h
|
||||||
libbitcoinconsensus_la_SOURCES = \
|
libbitcoinconsensus_la_SOURCES = \
|
||||||
|
@ -376,10 +376,12 @@ endif
|
||||||
libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
|
libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS)
|
||||||
libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
|
libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS)
|
||||||
libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL
|
libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL
|
||||||
|
|
||||||
if USE_LIBSECP256K1
|
if USE_LIBSECP256K1
|
||||||
libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
|
libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
#
|
||||||
|
|
||||||
CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno
|
CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue