From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 28 Oct 2014 12:22:34 +0000 (-0700)
Subject: Merge pull request #5100
X-Git-Tag: v0.11.2.z0~617
X-Git-Url: https://repo.jachan.dev/VerusCoin.git/commitdiff_plain/723c7526368badda15df8ac1ffc047a0ab2e384a

Merge pull request #5100

99f41b9 MOVEONLY: core.o -> core/block.o (jtimon)
561e9e9 MOVEONLY: Move script/compressor out of script and put CTxOutCompressor (from core) with it (jtimon)
999a2ab MOVEONLY: separate CTxUndo out of core (jtimon)
4a3587d MOVEONLY: Separate CTransaction and dependencies from core (jtimon)
eda3733 MOVEONLY: Move CFeeRate and Amount constants to amount.o (jtimon)
---

723c7526368badda15df8ac1ffc047a0ab2e384a
diff --cc src/Makefile.am
index 1f8f9aabd,4ca75d6a7..91cc1b96e
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -212,10 -214,11 +215,12 @@@ libbitcoin_common_a_SOURCES = 
    base58.cpp \
    chainparams.cpp \
    coins.cpp \
-   core.cpp \
+   compressor.cpp \
+   core/block.cpp \
+   core/transaction.cpp \
    core_read.cpp \
    core_write.cpp \
 +  ecwrapper.cpp \
    hash.cpp \
    key.cpp \
    keystore.cpp \