From ef3bc3084a03bb3ac448c86901e929dc1a218e1f Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Sun, 13 Dec 2020 17:38:38 +0000 Subject: [PATCH] build: move dynafed and pak to server rather than libelementsconsensus This was causing build failures on win64, and since we (currently) do not expose any dynafed or PAK stuff in libelementsconsensus, there is no reason to be trying to link these. --- src/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1021081212..94e189eb65 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -189,6 +189,7 @@ BITCOIN_CORE_H = \ policy/rbf.h \ policy/settings.h \ pow.h \ + primitives/pak.h \ protocol.h \ psbt.h \ random.h \ @@ -306,6 +307,7 @@ libbitcoin_server_a_SOURCES = \ chain.cpp \ confidential_validation.cpp \ consensus/tx_verify.cpp \ + dynafed.cpp \ dbwrapper.cpp \ flatfile.cpp \ httprpc.cpp \ @@ -332,6 +334,7 @@ libbitcoin_server_a_SOURCES = \ policy/rbf.cpp \ policy/settings.cpp \ pow.cpp \ + primitives/pak.cpp \ rest.cpp \ rpc/blockchain.cpp \ rpc/mining.cpp \ @@ -472,14 +475,11 @@ libelements_consensus_a_SOURCES = \ arith_uint256.cpp \ arith_uint256.h \ asset.cpp \ - chain.h \ - chain.cpp \ consensus/merkle.cpp \ consensus/merkle.h \ consensus/params.h \ consensus/tx_check.cpp \ consensus/validation.h \ - dynafed.cpp \ hash.cpp \ hash.h \ prevector.h \ @@ -491,8 +491,6 @@ libelements_consensus_a_SOURCES = \ primitives/txwitness.h \ primitives/transaction.cpp \ primitives/transaction.h \ - primitives/pak.cpp \ - primitives/pak.h \ primitives/bitcoin/block.cpp \ primitives/bitcoin/block.h \ primitives/bitcoin/merkleblock.cpp \