From 1785bdb98a4255df4e13d04af4f1e8a2c374bb15 Mon Sep 17 00:00:00 2001 From: Alfie John Date: Tue, 24 May 2016 08:36:48 +1000 Subject: [PATCH] Rename libzerocash to libzcash --- configure.ac | 4 ++-- src/Makefile.am | 36 ++++++++++++++++++------------------ src/Makefile.gtest.include | 2 +- src/Makefile.qt.include | 2 +- src/Makefile.qttest.include | 2 +- src/Makefile.test.include | 2 +- src/Makefile.zcash.include | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index 94d185431..1c8f5e168 100644 --- a/configure.ac +++ b/configure.ac @@ -716,7 +716,7 @@ CPPFLAGS="-I$LIBSNARK_INCDIR $CPPFLAGS" AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) -LIBZEROCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium" +LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium" AC_CHECK_LIB([crypto],[RAND_egd],[],[ AC_ARG_WITH([libressl], @@ -928,7 +928,7 @@ AC_SUBST(MINIUPNPC_LIBS) AC_SUBST(GMP_LIBS) AC_SUBST(GMPXX_LIBS) AC_SUBST(LIBSNARK_LIBS) -AC_SUBST(LIBZEROCASH_LIBS) +AC_SUBST(LIBZCASH_LIBS) AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py]) AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh]) AC_CONFIG_FILES([qa/pull-tester/tests-config.sh],[chmod +x qa/pull-tester/tests-config.sh]) diff --git a/src/Makefile.am b/src/Makefile.am index d137131bf..6cb0f89b3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a LIBBITCOINQT=qt/libbitcoinqt.a LIBSECP256K1=secp256k1/libsecp256k1.la -LIBZEROCASH=libzerocash.a +LIBZCASH=libzcash.a $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @@ -45,7 +45,7 @@ EXTRA_LIBRARIES = \ univalue/libbitcoin_univalue.a \ libbitcoin_server.a \ libbitcoin_cli.a \ - libzerocash.a + libzcash.a if ENABLE_WALLET BITCOIN_INCLUDES += $(BDB_CPPFLAGS) EXTRA_LIBRARIES += libbitcoin_wallet.a @@ -70,7 +70,7 @@ if BUILD_BITCOIN_UTILS endif # TODO: rename to libzcash -LIBZEROCASH_H = \ +LIBZCASH_H = \ zcash/IncrementalMerkleTree.h \ zerocash/utils/util.h \ zcash/NoteEncryption.hpp \ @@ -216,7 +216,7 @@ libbitcoin_server_a_SOURCES = \ validationinterface.cpp \ $(JSON_H) \ $(BITCOIN_CORE_H) \ - $(LIBZEROCASH_H) + $(LIBZCASH_H) # wallet: shared between bitcoind and bitcoin-qt, but only linked # when wallet enabled @@ -231,7 +231,7 @@ libbitcoin_wallet_a_SOURCES = \ wallet/wallet_ismine.cpp \ wallet/walletdb.cpp \ $(BITCOIN_CORE_H) \ - $(LIBZEROCASH_H) + $(LIBZCASH_H) # crypto primitives library crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES) @@ -288,7 +288,7 @@ libbitcoin_common_a_SOURCES = \ script/sign.cpp \ script/standard.cpp \ $(BITCOIN_CORE_H) \ - $(LIBZEROCASH_H) + $(LIBZCASH_H) # util: shared between all executables. # This library *must* be included to make sure that the glibc @@ -311,7 +311,7 @@ libbitcoin_util_a_SOURCES = \ utilstrencodings.cpp \ utiltime.cpp \ $(BITCOIN_CORE_H) \ - $(LIBZEROCASH_H) + $(LIBZCASH_H) if GLIBC_BACK_COMPAT libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp @@ -322,7 +322,7 @@ libbitcoin_cli_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_cli_a_SOURCES = \ rpcclient.cpp \ $(BITCOIN_CORE_H) \ - $(LIBZEROCASH_H) + $(LIBZCASH_H) nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h # @@ -342,7 +342,7 @@ zcashd_LDADD = \ $(LIBBITCOIN_UNIVALUE) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBZEROCASH) \ + $(LIBZCASH) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ $(LIBSECP256K1) @@ -357,9 +357,9 @@ zcashd_LDADD += \ $(SSL_LIBS) \ $(CRYPTO_LIBS) \ $(MINIUPNPC_LIBS) \ - $(LIBZEROCASH) \ + $(LIBZCASH) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBZEROCASH_LIBS) + $(LIBZCASH_LIBS) # # bitcoin-cli binary # @@ -377,9 +377,9 @@ zcash_cli_LDADD = \ $(BOOST_LIBS) \ $(SSL_LIBS) \ $(CRYPTO_LIBS) \ - $(LIBZEROCASH) \ + $(LIBZCASH) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBZEROCASH_LIBS) + $(LIBZCASH_LIBS) # # bitcoin-tx binary # @@ -391,21 +391,21 @@ if TARGET_WINDOWS bitcoin_tx_SOURCES += bitcoin-tx-res.rc endif -# FIXME: Is libzerocash needed for bitcoin_tx? +# FIXME: Is libzcash needed for bitcoin_tx? bitcoin_tx_LDADD = \ $(LIBBITCOIN_UNIVALUE) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ $(LIBSECP256K1) \ - $(LIBZEROCASH) \ + $(LIBZCASH) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBZEROCASH_LIBS) + $(LIBZCASH_LIBS) bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) # # zerocash protocol primitives # -libzerocash_a_SOURCES = \ +libzcash_a_SOURCES = \ zcash/IncrementalMerkleTree.cpp \ zerocash/utils/util.cpp \ zcash/NoteEncryption.cpp \ @@ -415,7 +415,7 @@ libzerocash_a_SOURCES = \ zcash/prf.cpp \ zcash/util.cpp -libzerocash_a_CPPFLAGS = -fPIC -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) -std=c++11 -pipe -O2 -O0 -g -Wstack-protector -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) +libzcash_a_CPPFLAGS = -fPIC -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) -std=c++11 -pipe -O2 -O0 -g -Wstack-protector -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES) # bitcoinconsensus library # if BUILD_BITCOIN_LIBS diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include index 81e3f5744..041a2fb83 100644 --- a/src/Makefile.gtest.include +++ b/src/Makefile.gtest.include @@ -17,7 +17,7 @@ if ENABLE_WALLET zcash_gtest_LDADD += $(LIBBITCOIN_WALLET) endif -zcash_gtest_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBZEROCASH) $(LIBZEROCASH_LIBS) +zcash_gtest_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBZCASH) $(LIBZCASH_LIBS) zcash_gtest_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index ef99cfeb4..d45de8d20 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -362,7 +362,7 @@ if ENABLE_WALLET qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) endif qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ - $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZEROCASH_LIBS) + $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZCASH_LIBS) qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) qt_bitcoin_qt_LIBTOOLFLAGS = --tag CXX diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 8cfc0e05f..4963a396b 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -32,7 +32,7 @@ qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) endif qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) \ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ - $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZEROCASH_LIBS) + $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) $(LIBZCASH_LIBS) qt_test_test_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) CLEAN_BITCOIN_QT_TEST = $(TEST_QT_MOC_CPP) qt/test/*.gcda qt/test/*.gcno diff --git a/src/Makefile.test.include b/src/Makefile.test.include index d37289e7c..5719e512d 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -100,7 +100,7 @@ if ENABLE_WALLET test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET) endif -test_test_bitcoin_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBZEROCASH) $(LIBZEROCASH_LIBS) +test_test_bitcoin_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBZCASH) $(LIBZCASH_LIBS) test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static nodist_test_test_bitcoin_SOURCES = $(GENERATED_TEST_FILES) diff --git a/src/Makefile.zcash.include b/src/Makefile.zcash.include index 6bc0bb1a8..45c944ea1 100644 --- a/src/Makefile.zcash.include +++ b/src/Makefile.zcash.include @@ -6,16 +6,16 @@ bin_PROGRAMS += \ zcash_GenerateParams_SOURCES = zcash/GenerateParams.cpp zcash_GenerateParams_LDADD = \ $(BOOST_LIBS) \ - $(LIBZEROCASH) \ + $(LIBZCASH) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBZEROCASH_LIBS) + $(LIBZCASH_LIBS) # tests for utilities that come with zerocash zerocash_tests_utilTest_SOURCES = zerocash/tests/utilTest.cpp zerocash_tests_utilTest_LDADD = \ $(BOOST_LIBS) \ - $(LIBZEROCASH) \ + $(LIBZCASH) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) \ - $(LIBZEROCASH_LIBS) + $(LIBZCASH_LIBS)