From 54b37db953f9feebae89e43f618c4859cd36acdb Mon Sep 17 00:00:00 2001
From: Tim Ruffing <crypto@timruffing.de>
Date: Fri, 28 Jul 2023 11:28:58 +0200
Subject: [PATCH] build: Fix linkage of extra binaries in -zkp modules

---
 Makefile.am                                | 2 +-
 src/modules/generator/Makefile.am.include  | 4 ++--
 src/modules/rangeproof/Makefile.am.include | 4 ++--
 src/modules/whitelist/Makefile.am.include  | 5 ++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7e10ccbd..0ca6c57c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,7 +187,7 @@ endif
 if ENABLE_MODULE_MUSIG
 noinst_PROGRAMS += musig_example
 musig_example_SOURCES = examples/musig.c
-musig_example_CPPFLAGS = -I$(top_srcdir)/include
+musig_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
 musig_example_LDADD = libsecp256k1.la
 musig_example_LDFLAGS = -static
 if BUILD_WINDOWS
diff --git a/src/modules/generator/Makefile.am.include b/src/modules/generator/Makefile.am.include
index 4119966c..f1bee7b3 100644
--- a/src/modules/generator/Makefile.am.include
+++ b/src/modules/generator/Makefile.am.include
@@ -6,6 +6,6 @@ noinst_HEADERS += src/modules/generator/tests_impl.h
 if USE_BENCHMARK
 noinst_PROGRAMS += bench_generator
 bench_generator_SOURCES = src/bench_generator.c
-bench_generator_LDADD = libsecp256k1.la $(SECP_LIBS)
-bench_generator_LDFLAGS = -static
+bench_generator_LDADD = libsecp256k1.la
+bench_generator_CPPFLAGS = $(SECP_CONFIG_DEFINES)
 endif
diff --git a/src/modules/rangeproof/Makefile.am.include b/src/modules/rangeproof/Makefile.am.include
index 5272f229..bc727d5b 100644
--- a/src/modules/rangeproof/Makefile.am.include
+++ b/src/modules/rangeproof/Makefile.am.include
@@ -8,6 +8,6 @@ noinst_HEADERS += src/modules/rangeproof/tests_impl.h
 if USE_BENCHMARK
 noinst_PROGRAMS += bench_rangeproof
 bench_rangeproof_SOURCES = src/bench_rangeproof.c
-bench_rangeproof_LDADD = libsecp256k1.la $(SECP_LIBS)
-bench_rangeproof_LDFLAGS = -static
+bench_rangeproof_LDADD = libsecp256k1.la
+bench_rangeproof_CPPFLAGS = $(SECP_CONFIG_DEFINES)
 endif
diff --git a/src/modules/whitelist/Makefile.am.include b/src/modules/whitelist/Makefile.am.include
index f43e3e4b..41445112 100644
--- a/src/modules/whitelist/Makefile.am.include
+++ b/src/modules/whitelist/Makefile.am.include
@@ -5,7 +5,6 @@ noinst_HEADERS += src/modules/whitelist/tests_impl.h
 if USE_BENCHMARK
 noinst_PROGRAMS += bench_whitelist
 bench_whitelist_SOURCES = src/bench_whitelist.c
-bench_whitelist_CPPFLAGS = -DSECP256K1_BUILD $(SECP_INCLUDES)
-bench_whitelist_LDADD = libsecp256k1.la $(SECP_LIBS)
-bench_generator_LDFLAGS = -static
+bench_whitelist_LDADD = libsecp256k1.la
+bench_generator_CPPFLAGS = $(SECP_CONFIG_DEFINES)
 endif