Merge pull request #6730

laanwj · laanwj · commit cb4d6d05693a · 2015-09-29T14:17:21.000+02:00
a5b78c2 build: Remove dependency of bitcoin-cli on secp256k1 (Wladimir J. van der Laan)
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -361,8 +361,7 @@ endif
 bitcoin_cli_LDADD = \
   $(LIBBITCOIN_CLI) \
   $(LIBBITCOIN_UNIVALUE) \
-  $(LIBBITCOIN_UTIL) \
-  $(LIBSECP256K1)
+  $(LIBBITCOIN_UTIL)
 
 bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
 #

Original file line number	Diff line number	Diff line change
`@@ -361,8 +361,7 @@ endif`
`361`	`361`	`bitcoin_cli_LDADD = \`
`362`	`362`	`$(LIBBITCOIN_CLI) \`
`363`	`363`	`$(LIBBITCOIN_UNIVALUE) \`
`364`		`- $(LIBBITCOIN_UTIL) \`
`365`		`- $(LIBSECP256K1)`
	`364`	`+ $(LIBBITCOIN_UTIL)`
`366`	`365`
`367`	`366`	`bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)`
`368`	`367`	`#`