diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-16 13:24:57 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-16 13:25:18 +0100 |
| commit | e54ebbf6009716a7abcd4d8d3f7bd910e88decdc (patch) | |
| tree | 314d2f94a777a339b54cd2817402c8d951335efd /src/Makefile.am | |
| parent | dafefb79244d513cf68e2ce6db4b16edc58ae2f5 (diff) | |
| parent | 6e182686163ce3c15b878bd78c41d8d18db344f1 (diff) | |
| download | bitcoin-e54ebbf6009716a7abcd4d8d3f7bd910e88decdc.tar.xz | |
Merge pull request #6954
6e18268 Switch to libsecp256k1-based validation for ECDSA (Pieter Wuille)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 834c3dc891..f1e98dabde 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,8 +104,6 @@ BITCOIN_CORE_H = \ consensus/validation.h \ core_io.h \ core_memusage.h \ - eccryptoverify.h \ - ecwrapper.h \ hash.h \ httprpc.h \ httpserver.h \ @@ -272,8 +270,6 @@ libbitcoin_common_a_SOURCES = \ compressor.cpp \ core_read.cpp \ core_write.cpp \ - eccryptoverify.cpp \ - ecwrapper.cpp \ hash.cpp \ key.cpp \ keystore.cpp \ @@ -404,8 +400,6 @@ libbitcoinconsensus_la_SOURCES = \ crypto/sha1.cpp \ crypto/sha256.cpp \ crypto/sha512.cpp \ - eccryptoverify.cpp \ - ecwrapper.cpp \ hash.cpp \ primitives/transaction.cpp \ pubkey.cpp \ @@ -420,8 +414,8 @@ if GLIBC_BACK_COMPAT endif libbitcoinconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) -libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS) -libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL +libbitcoinconsensus_la_LIBADD = $(LIBSECP256K1) +libbitcoinconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL libbitcoinconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) endif |