Fix exception

[VerusCoin.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 15169e5bdff97398c79d8b46135f351da8a4500c..f9b19978bfb441e9fd08ef603a88c4683d245323 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = secp256k1 univalue
+DIST_SUBDIRS = secp256k1 univalue cryptoconditions

 
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(SAN_LDFLAGS) $(HARDENED_LDFLAGS)
 AM_CXXFLAGS = $(SAN_CXXFLAGS) $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS)
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(SAN_LDFLAGS) $(HARDENED_LDFLAGS)
 AM_CXXFLAGS = $(SAN_CXXFLAGS) $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS)


@@ -23,6 +23,7 @@ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
 BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
 
 BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
 BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
 
 BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include

+BITCOIN_INCLUDES += -I$(srcdir)/cryptoconditions/include

 BITCOIN_INCLUDES += -I$(srcdir)/snark
 BITCOIN_INCLUDES += -I$(srcdir)/snark/libsnark
 BITCOIN_INCLUDES += -I$(srcdir)/univalue/include
 BITCOIN_INCLUDES += -I$(srcdir)/snark
 BITCOIN_INCLUDES += -I$(srcdir)/snark/libsnark
 BITCOIN_INCLUDES += -I$(srcdir)/univalue/include


@@ -42,6 +43,7 @@ LIBBITCOIN_CLI=libbitcoin_cli.a
 LIBBITCOIN_UTIL=libbitcoin_util.a
 LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
 LIBSECP256K1=secp256k1/libsecp256k1.la
 LIBBITCOIN_UTIL=libbitcoin_util.a
 LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
 LIBSECP256K1=secp256k1/libsecp256k1.la

+LIBCRYPTOCONDITIONS=cryptoconditions/libcryptoconditions_core.la

 LIBSNARK=snark/libsnark.a
 LIBUNIVALUE=univalue/libunivalue.la
 LIBZCASH=libzcash.a -lcurl
 LIBSNARK=snark/libsnark.a
 LIBUNIVALUE=univalue/libunivalue.la
 LIBZCASH=libzcash.a -lcurl


@@ -64,15 +66,18 @@ libsnark-tests: $(wildcard snark/src/*)
 $(LIBUNIVALUE): $(wildcard univalue/lib/*)
        $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/
 
 $(LIBUNIVALUE): $(wildcard univalue/lib/*)
        $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/
 

+$(LIBCRYPTOCONDITIONS): $(wildcard cryptoconditions/src/*) $(wildcard cryptoconditions/include/*)
+       $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
+

 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
 EXTRA_LIBRARIES = \
 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
 EXTRA_LIBRARIES = \

-  crypto/libbitcoin_crypto.a \
-  libbitcoin_util.a \
-  libbitcoin_common.a \
-  libbitcoin_server.a \
-  libbitcoin_cli.a \
-  libzcash.a
+       crypto/libbitcoin_crypto.a \
+       libbitcoin_util.a \
+       libbitcoin_common.a \
+       libbitcoin_server.a \
+       libbitcoin_cli.a \
+       libzcash.a

 if ENABLE_WALLET
 BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
 EXTRA_LIBRARIES += libbitcoin_wallet.a
 if ENABLE_WALLET
 BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
 EXTRA_LIBRARIES += libbitcoin_wallet.a


@@ -95,13 +100,17 @@ bin_PROGRAMS =
 noinst_PROGRAMS =
 TESTS =
 
 noinst_PROGRAMS =
 TESTS =
 

-if BUILD_BITCOIND
+#if BUILD_BITCOIND

   bin_PROGRAMS += komodod
   bin_PROGRAMS += komodod

-endif
+#endif

 
 if BUILD_BITCOIN_UTILS
   bin_PROGRAMS += komodo-cli komodo-tx
 endif
 
 if BUILD_BITCOIN_UTILS
   bin_PROGRAMS += komodo-cli komodo-tx
 endif

+if ENABLE_WALLET
+  bin_PROGRAMS += wallet-utility
+endif
+

 
 LIBZCASH_H = \
   zcash/IncrementalMerkleTree.hpp \
 
 LIBZCASH_H = \
   zcash/IncrementalMerkleTree.hpp \


@@ -117,6 +126,8 @@ LIBZCASH_H = \
 .PHONY: FORCE collate-libsnark check-symbols check-security
 # bitcoin core #
 BITCOIN_CORE_H = \
 .PHONY: FORCE collate-libsnark check-symbols check-security
 # bitcoin core #
 BITCOIN_CORE_H = \

+  addressindex.h \
+  spentindex.h \

   addrman.h \
   alert.h \
   amount.h \
   addrman.h \
   alert.h \
   amount.h \


@@ -130,6 +141,7 @@ BITCOIN_CORE_H = \
   asyncrpcqueue.h \
   base58.h \
   bloom.h \
   asyncrpcqueue.h \
   base58.h \
   bloom.h \

+  cc/eval.h \

   chain.h \
   chainparams.h \
   chainparamsbase.h \
   chain.h \
   chainparams.h \
   chainparamsbase.h \


@@ -185,7 +197,7 @@ BITCOIN_CORE_H = \
   script/interpreter.h \
   script/script.h \
   script/script_error.h \
   script/interpreter.h \
   script/script.h \
   script/script_error.h \

-  script/sigcache.h \
+  script/serverchecker.h \

   script/sign.h \
   script/standard.h \
   serialize.h \
   script/sign.h \
   script/standard.h \
   serialize.h \


@@ -229,7 +241,7 @@ BITCOIN_CORE_H = \
 obj/build.h: FORCE
        @$(MKDIR_P) $(builddir)/obj
        @$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
 obj/build.h: FORCE
        @$(MKDIR_P) $(builddir)/obj
        @$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \

-         $(abs_top_srcdir)
+       $(abs_top_srcdir)

 libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 
 # server: zcashd
 libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 
 # server: zcashd


@@ -243,8 +255,12 @@ libbitcoin_server_a_SOURCES = \
   asyncrpcoperation.cpp \
   asyncrpcqueue.cpp \
   bloom.cpp \
   asyncrpcoperation.cpp \
   asyncrpcqueue.cpp \
   bloom.cpp \

+  cc/eval.cpp \
+  cc/import.cpp \
+  cc/betprotocol.cpp \

   chain.cpp \
   checkpoints.cpp \
   chain.cpp \
   checkpoints.cpp \

+  crosschain.cpp \

   deprecation.cpp \
   httprpc.cpp \
   httpserver.cpp \
   deprecation.cpp \
   httprpc.cpp \
   httpserver.cpp \


@@ -256,18 +272,20 @@ libbitcoin_server_a_SOURCES = \
   miner.cpp \
   net.cpp \
   noui.cpp \
   miner.cpp \
   net.cpp \
   noui.cpp \

+  notarisationdb.cpp \

   paymentdisclosure.cpp \
   paymentdisclosuredb.cpp \
   policy/fees.cpp \
   pow.cpp \
   rest.cpp \
   rpcblockchain.cpp \
   paymentdisclosure.cpp \
   paymentdisclosuredb.cpp \
   policy/fees.cpp \
   pow.cpp \
   rest.cpp \
   rpcblockchain.cpp \

+  rpccrosschain.cpp \

   rpcmining.cpp \
   rpcmisc.cpp \
   rpcnet.cpp \
   rpcrawtransaction.cpp \
   rpcserver.cpp \
   rpcmining.cpp \
   rpcmisc.cpp \
   rpcnet.cpp \
   rpcrawtransaction.cpp \
   rpcserver.cpp \

-  script/sigcache.cpp \
+  script/serverchecker.cpp \

   timedata.cpp \
   torcontrol.cpp \
   txdb.cpp \
   timedata.cpp \
   torcontrol.cpp \
   txdb.cpp \


@@ -282,9 +300,9 @@ LIBBITCOIN_ZMQ=libbitcoin_zmq.a
 libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
 libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_zmq_a_SOURCES = \
 libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
 libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_zmq_a_SOURCES = \

-  zmq/zmqabstractnotifier.cpp \
-  zmq/zmqnotificationinterface.cpp \
-  zmq/zmqpublishnotifier.cpp
+       zmq/zmqabstractnotifier.cpp \
+       zmq/zmqnotificationinterface.cpp \
+       zmq/zmqpublishnotifier.cpp

 endif
 
 if ENABLE_PROTON
 endif
 
 if ENABLE_PROTON


@@ -326,33 +344,33 @@ libbitcoin_wallet_a_SOURCES = \
 crypto_libbitcoin_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES)
 crypto_libbitcoin_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 crypto_libbitcoin_crypto_a_SOURCES = \
 crypto_libbitcoin_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES)
 crypto_libbitcoin_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 crypto_libbitcoin_crypto_a_SOURCES = \

-  crypto/common.h \
-  crypto/equihash.cpp \
-  crypto/equihash.h \
-  crypto/equihash.tcc \
-  crypto/hmac_sha256.cpp \
-  crypto/hmac_sha256.h \
-  crypto/hmac_sha512.cpp \
-  crypto/hmac_sha512.h \
-  crypto/ripemd160.cpp \
-  crypto/ripemd160.h \
-  crypto/sha1.cpp \
-  crypto/sha1.h \
-  crypto/sha256.cpp \
-  crypto/sha256.h \
-  crypto/sha512.cpp \
-  crypto/sha512.h
+       crypto/common.h \
+       crypto/equihash.cpp \
+       crypto/equihash.h \
+       crypto/equihash.tcc \
+       crypto/hmac_sha256.cpp \
+       crypto/hmac_sha256.h \
+       crypto/hmac_sha512.cpp \
+       crypto/hmac_sha512.h \
+       crypto/ripemd160.cpp \
+       crypto/ripemd160.h \
+       crypto/sha1.cpp \
+       crypto/sha1.h \
+       crypto/sha256.cpp \
+       crypto/sha256.h \
+       crypto/sha512.cpp \
+       crypto/sha512.h

 
 if ENABLE_MINING
 EQUIHASH_TROMP_SOURCES = \
 
 if ENABLE_MINING
 EQUIHASH_TROMP_SOURCES = \

-  pow/tromp/equi_miner.h \
-  pow/tromp/equi.h \
-  pow/tromp/osx_barrier.h
+       pow/tromp/equi_miner.h \
+       pow/tromp/equi.h \
+       pow/tromp/osx_barrier.h

 
 crypto_libbitcoin_crypto_a_CPPFLAGS += \
 
 crypto_libbitcoin_crypto_a_CPPFLAGS += \

-  -DEQUIHASH_TROMP_ATOMIC
+       -DEQUIHASH_TROMP_ATOMIC

 crypto_libbitcoin_crypto_a_SOURCES += \
 crypto_libbitcoin_crypto_a_SOURCES += \

-  ${EQUIHASH_TROMP_SOURCES}
+       ${EQUIHASH_TROMP_SOURCES}

 endif
 
 # common: shared between zcashd and non-server tools
 endif
 
 # common: shared between zcashd and non-server tools


@@ -369,6 +387,7 @@ libbitcoin_common_a_SOURCES = \
   core_read.cpp \
   core_write.cpp \
   hash.cpp \
   core_read.cpp \
   core_write.cpp \
   hash.cpp \

+  importcoin.cpp \

   key.cpp \
   keystore.cpp \
   netbase.cpp \
   key.cpp \
   keystore.cpp \
   netbase.cpp \


@@ -377,6 +396,7 @@ libbitcoin_common_a_SOURCES = \
   protocol.cpp \
   pubkey.cpp \
   scheduler.cpp \
   protocol.cpp \
   pubkey.cpp \
   scheduler.cpp \

+  script/cc.cpp \

   script/interpreter.cpp \
   script/script.cpp \
   script/script_error.cpp \
   script/interpreter.cpp \
   script/script.cpp \
   script/script_error.cpp \


@@ -391,23 +411,23 @@ libbitcoin_common_a_SOURCES = \
 libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_util_a_SOURCES = \
 libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_util_a_SOURCES = \

-  support/pagelocker.cpp \
-  chainparamsbase.cpp \
-  clientversion.cpp \
-  compat/glibc_sanity.cpp \
-  compat/glibcxx_sanity.cpp \
-  compat/strnlen.cpp \
-  random.cpp \
-  rpcprotocol.cpp \
-  support/cleanse.cpp \
-  sync.cpp \
-  uint256.cpp \
-  util.cpp \
-  utilmoneystr.cpp \
-  utilstrencodings.cpp \
-  utiltime.cpp \
-  $(BITCOIN_CORE_H) \
-  $(LIBZCASH_H)
+       support/pagelocker.cpp \
+       chainparamsbase.cpp \
+       clientversion.cpp \
+       compat/glibc_sanity.cpp \
+       compat/glibcxx_sanity.cpp \
+       compat/strnlen.cpp \
+       random.cpp \
+       rpcprotocol.cpp \
+       support/cleanse.cpp \
+       sync.cpp \
+       uint256.cpp \
+       util.cpp \
+       utilmoneystr.cpp \
+       utilstrencodings.cpp \
+       utiltime.cpp \
+       $(BITCOIN_CORE_H) \
+       $(LIBZCASH_H)

 
 if GLIBC_BACK_COMPAT
 libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
 
 if GLIBC_BACK_COMPAT
 libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp


@@ -417,9 +437,9 @@ endif
 libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_cli_a_SOURCES = \
 libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_cli_a_SOURCES = \

-  rpcclient.cpp \
-  $(BITCOIN_CORE_H) \
-  $(LIBZCASH_H)
+       rpcclient.cpp \
+       $(BITCOIN_CORE_H) \
+       $(LIBZCASH_H)

 
 nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
 #
 
 nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
 #


@@ -444,7 +464,8 @@ komodod_LDADD = \
   $(LIBSNARK) \
   $(LIBLEVELDB) \
   $(LIBMEMENV) \
   $(LIBSNARK) \
   $(LIBLEVELDB) \
   $(LIBMEMENV) \

-  $(LIBSECP256K1)
+  $(LIBSECP256K1) \
+  $(LIBCRYPTOCONDITIONS)

 
 if ENABLE_ZMQ
 komodod_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 
 if ENABLE_ZMQ
 komodod_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)


@@ -465,7 +486,7 @@ komodod_LDADD += \
   $(LIBZCASH_LIBS)
 
 if ENABLE_PROTON
   $(LIBZCASH_LIBS)
 
 if ENABLE_PROTON

-zcashd_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)
+komodod_LDADD += $(LIBBITCOIN_PROTON) $(PROTON_LIBS)

 endif
 
 # bitcoin-cli binary #
 endif
 
 # bitcoin-cli binary #


@@ -474,23 +495,45 @@ komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS)
 komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
 komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 

+# wallet-utility binary #
+if ENABLE_WALLET
+wallet_utility_SOURCES = wallet-utility.cpp
+wallet_utility_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+wallet_utility_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+wallet_utility_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+endif
+

 if TARGET_WINDOWS
 komodo_cli_SOURCES += bitcoin-cli-res.rc
 endif
 
 komodo_cli_LDADD = \
 if TARGET_WINDOWS
 komodo_cli_SOURCES += bitcoin-cli-res.rc
 endif
 
 komodo_cli_LDADD = \

-  $(LIBBITCOIN_CLI) \
-  $(LIBUNIVALUE) \
-  $(LIBBITCOIN_UTIL) \
-  $(BOOST_LIBS) \
-  $(SSL_LIBS) \
-  $(CRYPTO_LIBS) \
-  $(EVENT_LIBS) \
-  $(LIBZCASH) \
-  $(LIBSNARK) \
-  $(LIBBITCOIN_CRYPTO) \
-  $(LIBZCASH_LIBS)
-#
+       $(LIBBITCOIN_CLI) \
+       $(LIBUNIVALUE) \
+       $(LIBBITCOIN_UTIL) \
+       $(BOOST_LIBS) \
+       $(SSL_LIBS) \
+       $(CRYPTO_LIBS) \
+       $(EVENT_LIBS) \
+       $(LIBZCASH) \
+       $(LIBBITCOIN_CRYPTO) \
+       $(LIBZCASH_LIBS)
+
+if ENABLE_WALLET
+wallet_utility_LDADD = \
+       libbitcoin_wallet.a \
+       $(LIBBITCOIN_COMMON) \
+       $(LIBBITCOIN_CRYPTO) \
+       $(LIBSECP256K1) \
+       $(LIBBITCOIN_UTIL) \
+       $(BOOST_LIBS) \
+       $(BDB_LIBS) \
+       $(CRYPTO_LIBS) \
+       $(LIBZCASH) \
+       $(LIBSNARK) \
+       $(LIBZCASH_LIBS)\
+  $(LIBCRYPTOCONDITIONS)
+endif

 
 # zcash-tx binary #
 komodo_tx_SOURCES = komodo-tx.cpp
 
 # zcash-tx binary #
 komodo_tx_SOURCES = komodo-tx.cpp


@@ -511,27 +554,28 @@ komodo_tx_LDADD = \
   $(LIBZCASH) \
   $(LIBSNARK) \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBZCASH) \
   $(LIBSNARK) \
   $(LIBBITCOIN_CRYPTO) \

-  $(LIBZCASH_LIBS)
+  $(LIBZCASH_LIBS) \
+  $(LIBCRYPTOCONDITIONS)

 
 komodo_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
 #
 
 # zcash protocol primitives #
 libzcash_a_SOURCES = \
 
 komodo_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
 #
 
 # zcash protocol primitives #
 libzcash_a_SOURCES = \

-  zcash/IncrementalMerkleTree.cpp \
-  zcash/NoteEncryption.cpp \
-  zcash/Address.cpp \
-  zcash/JoinSplit.cpp \
-  zcash/Proof.cpp \
-  zcash/Note.cpp \
-  zcash/prf.cpp \
-  zcash/util.cpp \
-  zcash/circuit/commitment.tcc \
-  zcash/circuit/gadget.tcc \
-  zcash/circuit/merkle.tcc \
-  zcash/circuit/note.tcc \
-  zcash/circuit/prfs.tcc \
-  zcash/circuit/utils.tcc
+       zcash/IncrementalMerkleTree.cpp \
+       zcash/NoteEncryption.cpp \
+       zcash/Address.cpp \
+       zcash/JoinSplit.cpp \
+       zcash/Proof.cpp \
+       zcash/Note.cpp \
+       zcash/prf.cpp \
+       zcash/util.cpp \
+       zcash/circuit/commitment.tcc \
+       zcash/circuit/gadget.tcc \
+       zcash/circuit/merkle.tcc \
+       zcash/circuit/note.tcc \
+       zcash/circuit/prfs.tcc \
+       zcash/circuit/utils.tcc

 
 libzcash_a_CPPFLAGS = -DMULTICORE -fopenmp -fPIC -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) $(HARDENED_CXXFLAGS) $(HARDENED_LDFLAGS) -pipe $(SAN_LDFLAGS) -O1 -g -Wstack-protector $(SAN_CXXFLAGS) -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES)
 
 
 libzcash_a_CPPFLAGS = -DMULTICORE -fopenmp -fPIC -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS $(HARDENED_CPPFLAGS) $(HARDENED_CXXFLAGS) $(HARDENED_LDFLAGS) -pipe $(SAN_LDFLAGS) -O1 -g -Wstack-protector $(SAN_CXXFLAGS) -fstack-protector-all -fPIE -fvisibility=hidden -DSTATIC $(BITCOIN_INCLUDES)
 


@@ -559,12 +603,12 @@ libzcashconsensus_la_SOURCES = \
   utilstrencodings.cpp
 
 if GLIBC_BACK_COMPAT
   utilstrencodings.cpp
 
 if GLIBC_BACK_COMPAT

-  libzcashconsensus_la_SOURCES += compat/glibc_compat.cpp
+libzcashconsensus_la_SOURCES += compat/glibc_compat.cpp

 endif
 
 libzcashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
 libzcashconsensus_la_LIBADD = $(LIBSECP256K1)
 endif
 
 libzcashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
 libzcashconsensus_la_LIBADD = $(LIBSECP256K1)

-libzcashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL
+libzcashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -I$(srcdir)/cryptoconditions/include -DBUILD_BITCOIN_INTERNAL

 libzcashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
 endif
 libzcashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
 endif


@@ -607,9 +651,10 @@ endif
        @test -f $(PROTOC)
        $(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)
 
        @test -f $(PROTOC)
        $(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)
 

-#if ENABLE_TESTS
+if ENABLE_TESTS
+include Makefile.ktest.include

 #include Makefile.test.include
 #include Makefile.gtest.include
 #include Makefile.test.include
 #include Makefile.gtest.include

-#endif
+endif

 
 include Makefile.zcash.include
 
 include Makefile.zcash.include