From 213aa6739778288b6c940a059dfe3797cc2d6ce4 Mon Sep 17 00:00:00 2001 From: Gregory Maxwell Date: Tue, 29 Sep 2015 19:03:51 +0000 Subject: [PATCH] Do not force benchmarks to be statically linked. Libtool will do the right thing and use whatever is available based on --enable-shared/--enable-static. This also means that some of the things we build actually test the dynamic library. --- Makefile.am | 3 --- src/modules/ecdh/Makefile.am.include | 1 - src/modules/recovery/Makefile.am.include | 1 - src/modules/schnorr/Makefile.am.include | 1 - 4 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 57524fab05767..8480651e7d716 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,13 +54,10 @@ if USE_BENCHMARK noinst_PROGRAMS += bench_verify bench_sign bench_internal bench_verify_SOURCES = src/bench_verify.c bench_verify_LDADD = libsecp256k1.la $(SECP_LIBS) -bench_verify_LDFLAGS = -static bench_sign_SOURCES = src/bench_sign.c bench_sign_LDADD = libsecp256k1.la $(SECP_LIBS) -bench_sign_LDFLAGS = -static bench_internal_SOURCES = src/bench_internal.c bench_internal_LDADD = $(SECP_LIBS) -bench_internal_LDFLAGS = -static bench_internal_CPPFLAGS = $(SECP_INCLUDES) endif diff --git a/src/modules/ecdh/Makefile.am.include b/src/modules/ecdh/Makefile.am.include index 8ef3aff92fd2c..670b9c1152e75 100644 --- a/src/modules/ecdh/Makefile.am.include +++ b/src/modules/ecdh/Makefile.am.include @@ -5,5 +5,4 @@ if USE_BENCHMARK noinst_PROGRAMS += bench_ecdh bench_ecdh_SOURCES = src/bench_ecdh.c bench_ecdh_LDADD = libsecp256k1.la $(SECP_LIBS) -bench_ecdh_LDFLAGS = -static endif diff --git a/src/modules/recovery/Makefile.am.include b/src/modules/recovery/Makefile.am.include index 754469eeb2bb3..5de3ea33ea5e1 100644 --- a/src/modules/recovery/Makefile.am.include +++ b/src/modules/recovery/Makefile.am.include @@ -5,5 +5,4 @@ if USE_BENCHMARK noinst_PROGRAMS += bench_recover bench_recover_SOURCES = src/bench_recover.c bench_recover_LDADD = libsecp256k1.la $(SECP_LIBS) -bench_recover_LDFLAGS = -static endif diff --git a/src/modules/schnorr/Makefile.am.include b/src/modules/schnorr/Makefile.am.include index bad4cb7c5b220..b3bfa7d5cc49e 100644 --- a/src/modules/schnorr/Makefile.am.include +++ b/src/modules/schnorr/Makefile.am.include @@ -7,5 +7,4 @@ if USE_BENCHMARK noinst_PROGRAMS += bench_schnorr_verify bench_schnorr_verify_SOURCES = src/bench_schnorr_verify.c bench_schnorr_verify_LDADD = libsecp256k1.la $(SECP_LIBS) -bench_schnorr_verify_LDFLAGS = -static endif