bitcoin-cli: remove unneeded dependencies (only code movement)
Remove unnecessary dependencies for bitcoin-cli (leveldb, berkelydb, wallet, RPC server) Build system changes: - split libbitcoin.a into libbitcoin_common.a, libbitcoin_server.a and libbitcoin_cli.a Code changes (movement only): - split up HelpMessage into HelpMessage in init.cpp and HelpMessageCli in rpcclient.cpp - move uiInterface from init.cpp to util.cpp
This commit is contained in:
@@ -3,7 +3,7 @@ include Makefile.include
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
|
||||
-I$(builddir)
|
||||
|
||||
noinst_LIBRARIES = libbitcoin.a
|
||||
noinst_LIBRARIES = libbitcoin_server.a libbitcoin_common.a libbitcoin_cli.a
|
||||
|
||||
bin_PROGRAMS = bitcoind bitcoin-cli
|
||||
|
||||
@@ -33,23 +33,40 @@ obj/build.h: FORCE
|
||||
$(abs_top_srcdir)
|
||||
version.o: obj/build.h
|
||||
|
||||
libbitcoin_a_SOURCES = addrman.cpp alert.cpp allocators.cpp \
|
||||
rpcclient.cpp \
|
||||
rpcprotocol.cpp \
|
||||
libbitcoin_server_a_SOURCES = addrman.cpp alert.cpp \
|
||||
rpcserver.cpp \
|
||||
bloom.cpp \
|
||||
chainparams.cpp checkpoints.cpp core.cpp coins.cpp crypter.cpp db.cpp hash.cpp \
|
||||
init.cpp key.cpp keystore.cpp leveldbwrapper.cpp main.cpp miner.cpp \
|
||||
netbase.cpp net.cpp noui.cpp protocol.cpp rpcblockchain.cpp rpcdump.cpp \
|
||||
rpcmining.cpp rpcnet.cpp rpcrawtransaction.cpp rpcwallet.cpp script.cpp \
|
||||
sync.cpp txdb.cpp txmempool.cpp util.cpp version.cpp wallet.cpp walletdb.cpp $(JSON_H) \
|
||||
chainparams.cpp checkpoints.cpp coins.cpp crypter.cpp db.cpp \
|
||||
init.cpp keystore.cpp leveldbwrapper.cpp main.cpp miner.cpp \
|
||||
net.cpp noui.cpp rpcblockchain.cpp rpcdump.cpp \
|
||||
rpcmining.cpp rpcnet.cpp rpcrawtransaction.cpp rpcwallet.cpp \
|
||||
txdb.cpp txmempool.cpp wallet.cpp walletdb.cpp $(JSON_H) \
|
||||
$(BITCOIN_CORE_H)
|
||||
|
||||
nodist_libbitcoin_a_SOURCES = $(top_srcdir)/src/obj/build.h
|
||||
libbitcoin_common_a_SOURCES = \
|
||||
allocators.cpp \
|
||||
chainparams.cpp \
|
||||
core.cpp \
|
||||
hash.cpp \
|
||||
key.cpp \
|
||||
netbase.cpp \
|
||||
protocol.cpp \
|
||||
rpcprotocol.cpp \
|
||||
script.cpp \
|
||||
sync.cpp \
|
||||
util.cpp \
|
||||
version.cpp \
|
||||
$(BITCOIN_CORE_H)
|
||||
|
||||
libbitcoin_cli_a_SOURCES = \
|
||||
rpcclient.cpp \
|
||||
$(BITCOIN_CORE_H)
|
||||
|
||||
nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
|
||||
#
|
||||
|
||||
# bitcoind binary #
|
||||
bitcoind_LDADD = libbitcoin.a leveldb/libleveldb.a leveldb/libmemenv.a \
|
||||
bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a \
|
||||
$(BOOST_LIBS)
|
||||
bitcoind_SOURCES = bitcoind.cpp
|
||||
#
|
||||
@@ -62,15 +79,13 @@ AM_CPPFLAGS += $(BDB_CPPFLAGS)
|
||||
bitcoind_LDADD += $(BDB_LIBS)
|
||||
|
||||
# bitcoin-cli binary #
|
||||
bitcoin_cli_LDADD = libbitcoin.a leveldb/libleveldb.a leveldb/libmemenv.a \
|
||||
$(BOOST_LIBS)
|
||||
bitcoin_cli_LDADD = libbitcoin_cli.a libbitcoin_common.a $(BOOST_LIBS)
|
||||
bitcoin_cli_SOURCES = bitcoin-cli.cpp
|
||||
#
|
||||
|
||||
if TARGET_WINDOWS
|
||||
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
|
||||
endif
|
||||
bitcoin_cli_LDADD += $(BDB_LIBS)
|
||||
|
||||
leveldb/libleveldb.a: leveldb/libmemenv.a
|
||||
|
||||
@@ -79,7 +94,7 @@ leveldb/%.a:
|
||||
CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
|
||||
OPT="$(CXXFLAGS) $(CPPFLAGS)"
|
||||
|
||||
qt/bitcoinstrings.cpp: $(libbitcoin_a_SOURCES)
|
||||
qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_cli_a_SOURCES)
|
||||
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
|
||||
@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py
|
||||
|
||||
|
||||
Reference in New Issue
Block a user