Merge pull request #5223

bfe029f Reduce bitcoin-tx dependencies (Pieter Wuille)
This commit is contained in:
Pieter Wuille 2014-11-06 01:58:26 -08:00
commit 2f7601590b
No known key found for this signature in database
GPG key ID: 57896D2FF8F0B657

View file

@ -171,6 +171,7 @@ libbitcoin_server_a_SOURCES = \
rpcnet.cpp \ rpcnet.cpp \
rpcrawtransaction.cpp \ rpcrawtransaction.cpp \
rpcserver.cpp \ rpcserver.cpp \
script/sigcache.cpp \
timedata.cpp \ timedata.cpp \
txdb.cpp \ txdb.cpp \
txmempool.cpp \ txmempool.cpp \
@ -232,7 +233,6 @@ libbitcoin_common_a_SOURCES = \
pubkey.cpp \ pubkey.cpp \
script/interpreter.cpp \ script/interpreter.cpp \
script/script.cpp \ script/script.cpp \
script/sigcache.cpp \
script/sign.cpp \ script/sign.cpp \
script/standard.cpp \ script/standard.cpp \
$(BITCOIN_CORE_H) $(BITCOIN_CORE_H)
@ -327,9 +327,7 @@ if USE_LIBSECP256K1
endif endif
bitcoin_tx_LDADD += $(BOOST_LIBS) \ bitcoin_tx_LDADD += $(BOOST_LIBS) \
$(SSL_LIBS) \ $(CRYPTO_LIBS)
$(CRYPTO_LIBS) \
$(MINIUPNPC_LIBS)
bitcoin_tx_SOURCES = bitcoin-tx.cpp bitcoin_tx_SOURCES = bitcoin-tx.cpp
bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES) bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES)