mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
crypto: create a separate lib for crypto functions
This lib has no dependencies on other bitcoin functionality. Attempting to use bitcoin headers will result in a failure to compile.
This commit is contained in:
parent
f2647cc0e9
commit
4791b99e2d
@ -23,7 +23,8 @@ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BITCOIN_CONFIG_INCLUDES) $(BO
|
|||||||
noinst_LIBRARIES = \
|
noinst_LIBRARIES = \
|
||||||
libbitcoin_server.a \
|
libbitcoin_server.a \
|
||||||
libbitcoin_common.a \
|
libbitcoin_common.a \
|
||||||
libbitcoin_cli.a
|
libbitcoin_cli.a \
|
||||||
|
crypto/libbitcoin_crypto.a
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
|
BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
|
||||||
noinst_LIBRARIES += libbitcoin_wallet.a
|
noinst_LIBRARIES += libbitcoin_wallet.a
|
||||||
@ -76,10 +77,6 @@ BITCOIN_CORE_H = \
|
|||||||
rpcserver.h \
|
rpcserver.h \
|
||||||
script.h \
|
script.h \
|
||||||
serialize.h \
|
serialize.h \
|
||||||
crypto/common.h \
|
|
||||||
crypto/sha2.h \
|
|
||||||
crypto/sha1.h \
|
|
||||||
crypto/ripemd160.h \
|
|
||||||
sync.h \
|
sync.h \
|
||||||
threadsafety.h \
|
threadsafety.h \
|
||||||
tinyformat.h \
|
tinyformat.h \
|
||||||
@ -145,6 +142,16 @@ libbitcoin_wallet_a_SOURCES = \
|
|||||||
walletdb.cpp \
|
walletdb.cpp \
|
||||||
$(BITCOIN_CORE_H)
|
$(BITCOIN_CORE_H)
|
||||||
|
|
||||||
|
crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES)
|
||||||
|
crypto_libbitcoin_crypto_a_SOURCES = \
|
||||||
|
crypto/sha1.cpp \
|
||||||
|
crypto/sha2.cpp \
|
||||||
|
crypto/ripemd160.cpp \
|
||||||
|
crypto/common.h \
|
||||||
|
crypto/sha2.h \
|
||||||
|
crypto/sha1.h \
|
||||||
|
crypto/ripemd160.h
|
||||||
|
|
||||||
libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
|
libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||||
libbitcoin_common_a_SOURCES = \
|
libbitcoin_common_a_SOURCES = \
|
||||||
base58.cpp \
|
base58.cpp \
|
||||||
@ -157,9 +164,6 @@ libbitcoin_common_a_SOURCES = \
|
|||||||
protocol.cpp \
|
protocol.cpp \
|
||||||
rpcprotocol.cpp \
|
rpcprotocol.cpp \
|
||||||
script.cpp \
|
script.cpp \
|
||||||
crypto/sha1.cpp \
|
|
||||||
crypto/sha2.cpp \
|
|
||||||
crypto/ripemd160.cpp \
|
|
||||||
sync.cpp \
|
sync.cpp \
|
||||||
util.cpp \
|
util.cpp \
|
||||||
version.cpp \
|
version.cpp \
|
||||||
@ -183,6 +187,7 @@ nodist_libbitcoin_common_a_SOURCES = $(srcdir)/obj/build.h
|
|||||||
bitcoind_LDADD = \
|
bitcoind_LDADD = \
|
||||||
libbitcoin_server.a \
|
libbitcoin_server.a \
|
||||||
libbitcoin_common.a \
|
libbitcoin_common.a \
|
||||||
|
crypto/libbitcoin_crypto.a \
|
||||||
$(LIBLEVELDB) \
|
$(LIBLEVELDB) \
|
||||||
$(LIBMEMENV)
|
$(LIBMEMENV)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
@ -202,6 +207,7 @@ bitcoind_CPPFLAGS = $(BITCOIN_INCLUDES)
|
|||||||
bitcoin_cli_LDADD = \
|
bitcoin_cli_LDADD = \
|
||||||
libbitcoin_cli.a \
|
libbitcoin_cli.a \
|
||||||
libbitcoin_common.a \
|
libbitcoin_common.a \
|
||||||
|
crypto/libbitcoin_crypto.a \
|
||||||
$(BOOST_LIBS)
|
$(BOOST_LIBS)
|
||||||
bitcoin_cli_SOURCES = bitcoin-cli.cpp
|
bitcoin_cli_SOURCES = bitcoin-cli.cpp
|
||||||
bitcoin_cli_CPPFLAGS = $(BITCOIN_INCLUDES)
|
bitcoin_cli_CPPFLAGS = $(BITCOIN_INCLUDES)
|
||||||
@ -238,6 +244,7 @@ LIBBITCOIN_SERVER=libbitcoin_server.a
|
|||||||
LIBBITCOIN_WALLET=libbitcoin_wallet.a
|
LIBBITCOIN_WALLET=libbitcoin_wallet.a
|
||||||
LIBBITCOIN_COMMON=libbitcoin_common.a
|
LIBBITCOIN_COMMON=libbitcoin_common.a
|
||||||
LIBBITCOIN_CLI=libbitcoin_cli.a
|
LIBBITCOIN_CLI=libbitcoin_cli.a
|
||||||
|
LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
|
||||||
LIBBITCOINQT=qt/libbitcoinqt.a
|
LIBBITCOINQT=qt/libbitcoinqt.a
|
||||||
|
|
||||||
if ENABLE_TESTS
|
if ENABLE_TESTS
|
||||||
|
@ -355,7 +355,7 @@ qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
|
|||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||||
endif
|
endif
|
||||||
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_CRYPTO) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||||
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||||
qt_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
qt_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ qt_test_test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
|
|||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||||
endif
|
endif
|
||||||
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
|
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_CRYPTO) $(LIBLEVELDB) \
|
||||||
$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
|
$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
|
||||||
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||||
qt_test_test_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
qt_test_test_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
||||||
|
@ -63,7 +63,7 @@ endif
|
|||||||
|
|
||||||
test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
|
test_test_bitcoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
|
||||||
test_test_bitcoin_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
|
test_test_bitcoin_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
|
||||||
test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
test_test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_CRYPTO) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||||
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
|
test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
|
||||||
|
Loading…
Reference in New Issue
Block a user