Skip to content

Commit

Permalink
Complete previous commit by moving mn stuff out of libbitcoin_wallet
Browse files Browse the repository at this point in the history
and into libbitcoin_common
  • Loading branch information
random-zebra committed Jun 2, 2021
1 parent b0fe92f commit 5683a9c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
28 changes: 14 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -251,24 +251,10 @@ if(ZMQ_FOUND)
endif()

set(WALLET_SOURCES
./src/activemasternode.cpp
./src/bip38.cpp
./src/wallet/db.cpp
./src/addressbook.cpp
./src/crypter.cpp
./src/budget/budgetdb.cpp
./src/budget/budgetmanager.cpp
./src/budget/budgetproposal.cpp
./src/budget/budgetvote.cpp
./src/budget/finalizedbudget.cpp
./src/budget/finalizedbudgetvote.cpp
./src/masternode.cpp
./src/masternode-payments.cpp
./src/masternode-sync.cpp
./src/tiertwo_networksync.cpp
./src/masternodeconfig.cpp
./src/masternodeman.cpp
./src/messagesigner.cpp
./src/zpiv/mintpool.cpp
./src/wallet/hdchain.cpp
./src/wallet/rpcdump.cpp
Expand Down Expand Up @@ -353,8 +339,15 @@ add_library(ZEROCOIN_A STATIC ${ZEROCOIN_SOURCES})
target_include_directories(ZEROCOIN_A PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)

set(COMMON_SOURCES
./src/activemasternode.cpp
./src/base58.cpp
./src/bip38.cpp
./src/budget/budgetdb.cpp
./src/budget/budgetmanager.cpp
./src/budget/budgetproposal.cpp
./src/budget/budgetvote.cpp
./src/budget/finalizedbudget.cpp
./src/budget/finalizedbudgetvote.cpp
./src/consensus/params.cpp
./src/consensus/upgrades.cpp
./src/chainparams.cpp
Expand All @@ -377,6 +370,12 @@ set(COMMON_SOURCES
./src/invalid.cpp
./src/key.cpp
./src/keystore.cpp
./src/masternode.cpp
./src/masternode-payments.cpp
./src/masternode-sync.cpp
./src/masternodeconfig.cpp
./src/masternodeman.cpp
./src/messagesigner.cpp
./src/netaddress.cpp
./src/netbase.cpp
./src/policy/feerate.cpp
Expand All @@ -391,6 +390,7 @@ set(COMMON_SOURCES
./src/script/script_error.cpp
./src/spork.cpp
./src/sporkdb.cpp
./src/tiertwo_networksync.cpp
./src/warnings.cpp
)
add_library(COMMON_A STATIC ${BitcoinHeaders} ${COMMON_SOURCES})
Expand Down
28 changes: 14 additions & 14 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -387,25 +387,11 @@ endif
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_wallet_a_SOURCES = \
activemasternode.cpp \
bip38.cpp \
interfaces/wallet.cpp \
addressbook.cpp \
crypter.cpp \
key_io.cpp \
budget/budgetdb.cpp \
budget/budgetmanager.cpp \
budget/budgetproposal.cpp \
budget/budgetvote.cpp \
budget/finalizedbudget.cpp \
budget/finalizedbudgetvote.cpp \
masternode.cpp \
masternode-payments.cpp \
tiertwo_networksync.cpp \
masternode-sync.cpp \
masternodeconfig.cpp \
masternodeman.cpp \
messagesigner.cpp \
legacy/stakemodifier.cpp \
kernel.cpp \
wallet/db.cpp \
Expand Down Expand Up @@ -491,8 +477,15 @@ libzerocoin_libbitcoin_zerocoin_a_SOURCES = \
libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_common_a_SOURCES = \
activemasternode.cpp \
base58.cpp \
bip38.cpp \
budget/budgetdb.cpp \
budget/budgetmanager.cpp \
budget/budgetproposal.cpp \
budget/budgetvote.cpp \
budget/finalizedbudget.cpp \
budget/finalizedbudgetvote.cpp \
chainparams.cpp \
consensus/upgrades.cpp \
coins.cpp \
Expand All @@ -507,6 +500,12 @@ libbitcoin_common_a_SOURCES = \
invalid.cpp \
key.cpp \
keystore.cpp \
masternode.cpp \
masternode-payments.cpp \
masternode-sync.cpp \
masternodeconfig.cpp \
masternodeman.cpp \
messagesigner.cpp \
netaddress.cpp \
netbase.cpp \
policy/feerate.cpp \
Expand All @@ -518,6 +517,7 @@ libbitcoin_common_a_SOURCES = \
script/script.cpp \
script/sign.cpp \
script/standard.cpp \
tiertwo_networksync.cpp \
warnings.cpp \
script/script_error.cpp \
spork.cpp \
Expand Down

0 comments on commit 5683a9c

Please sign in to comment.