Skip to content

Commit 7141218

Browse files
committed
rename macro to SECP_CONFIG_DEFINES
1 parent 081e69d commit 7141218

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

Makefile.am

+11-11
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ noinst_HEADERS += examples/random.h
6767
PRECOMPUTED_LIB = libsecp256k1_precomputed.la
6868
noinst_LTLIBRARIES = $(PRECOMPUTED_LIB)
6969
libsecp256k1_precomputed_la_SOURCES = src/precomputed_ecmult.c src/precomputed_ecmult_gen.c
70-
libsecp256k1_precomputed_la_CPPFLAGS = $(SECP_INCLUDES) $(SECP_DEFINE_FLAGS)
70+
libsecp256k1_precomputed_la_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
7171

7272
if USE_EXTERNAL_ASM
7373
COMMON_LIB = libsecp256k1_common.la
@@ -86,7 +86,7 @@ endif
8686
endif
8787

8888
libsecp256k1_la_SOURCES = src/secp256k1.c
89-
libsecp256k1_la_CPPFLAGS = $(SECP_INCLUDES) $(SECP_DEFINE_FLAGS)
89+
libsecp256k1_la_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
9090
libsecp256k1_la_LIBADD = $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB)
9191
libsecp256k1_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_CURRENT):$(LIB_VERSION_REVISION):$(LIB_VERSION_AGE)
9292

@@ -101,17 +101,17 @@ bench_SOURCES = src/bench.c
101101
bench_LDADD = libsecp256k1.la $(SECP_LIBS) $(SECP_TEST_LIBS) $(COMMON_LIB)
102102
bench_internal_SOURCES = src/bench_internal.c
103103
bench_internal_LDADD = $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB)
104-
bench_internal_CPPFLAGS = $(SECP_INCLUDES) $(SECP_DEFINE_FLAGS)
104+
bench_internal_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
105105
bench_ecmult_SOURCES = src/bench_ecmult.c
106106
bench_ecmult_LDADD = $(SECP_LIBS) $(COMMON_LIB) $(PRECOMPUTED_LIB)
107-
bench_ecmult_CPPFLAGS = $(SECP_INCLUDES) $(SECP_DEFINE_FLAGS)
107+
bench_ecmult_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
108108
endif
109109

110110
TESTS =
111111
if USE_TESTS
112112
noinst_PROGRAMS += tests
113113
tests_SOURCES = src/tests.c
114-
tests_CPPFLAGS = $(SECP_INCLUDES) $(SECP_TEST_INCLUDES) $(SECP_DEFINE_FLAGS)
114+
tests_CPPFLAGS = $(SECP_INCLUDES) $(SECP_TEST_INCLUDES) $(SECP_CONFIG_DEFINES)
115115
if VALGRIND_ENABLED
116116
tests_CPPFLAGS += -DVALGRIND
117117
noinst_PROGRAMS += valgrind_ctime_test
@@ -129,7 +129,7 @@ endif
129129
if USE_EXHAUSTIVE_TESTS
130130
noinst_PROGRAMS += exhaustive_tests
131131
exhaustive_tests_SOURCES = src/tests_exhaustive.c
132-
exhaustive_tests_CPPFLAGS = $(SECP_INCLUDES) $(SECP_DEFINE_FLAGS)
132+
exhaustive_tests_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
133133
if !ENABLE_COVERAGE
134134
exhaustive_tests_CPPFLAGS += -DVERIFY
135135
endif
@@ -142,7 +142,7 @@ endif
142142
if USE_EXAMPLES
143143
noinst_PROGRAMS += ecdsa_example
144144
ecdsa_example_SOURCES = examples/ecdsa.c
145-
ecdsa_example_CPPFLAGS = -I$(top_srcdir)/include $(SECP_DEFINE_FLAGS)
145+
ecdsa_example_CPPFLAGS = -I$(top_srcdir)/include $(SECP_CONFIG_DEFINES)
146146
ecdsa_example_LDADD = libsecp256k1.la
147147
ecdsa_example_LDFLAGS = -static
148148
if BUILD_WINDOWS
@@ -152,7 +152,7 @@ TESTS += ecdsa_example
152152
if ENABLE_MODULE_ECDH
153153
noinst_PROGRAMS += ecdh_example
154154
ecdh_example_SOURCES = examples/ecdh.c
155-
ecdh_example_CPPFLAGS = -I$(top_srcdir)/include $(SECP_DEFINE_FLAGS)
155+
ecdh_example_CPPFLAGS = -I$(top_srcdir)/include $(SECP_CONFIG_DEFINES)
156156
ecdh_example_LDADD = libsecp256k1.la
157157
ecdh_example_LDFLAGS = -static
158158
if BUILD_WINDOWS
@@ -163,7 +163,7 @@ endif
163163
if ENABLE_MODULE_SCHNORRSIG
164164
noinst_PROGRAMS += schnorr_example
165165
schnorr_example_SOURCES = examples/schnorr.c
166-
schnorr_example_CPPFLAGS = -I$(top_srcdir)/include $(SECP_DEFINE_FLAGS)
166+
schnorr_example_CPPFLAGS = -I$(top_srcdir)/include $(SECP_CONFIG_DEFINES)
167167
schnorr_example_LDADD = libsecp256k1.la
168168
schnorr_example_LDFLAGS = -static
169169
if BUILD_WINDOWS
@@ -178,11 +178,11 @@ EXTRA_PROGRAMS = precompute_ecmult precompute_ecmult_gen
178178
CLEANFILES = $(EXTRA_PROGRAMS)
179179

180180
precompute_ecmult_SOURCES = src/precompute_ecmult.c
181-
precompute_ecmult_CPPFLAGS = $(SECP_INCLUDES) $(SECP_DEFINE_FLAGS)
181+
precompute_ecmult_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
182182
precompute_ecmult_LDADD = $(SECP_LIBS) $(COMMON_LIB)
183183

184184
precompute_ecmult_gen_SOURCES = src/precompute_ecmult_gen.c
185-
precompute_ecmult_gen_CPPFLAGS = $(SECP_INCLUDES) $(SECP_DEFINE_FLAGS)
185+
precompute_ecmult_gen_CPPFLAGS = $(SECP_INCLUDES) $(SECP_CONFIG_DEFINES)
186186
precompute_ecmult_gen_LDADD = $(SECP_LIBS) $(COMMON_LIB)
187187

188188
# See Automake manual, Section "Errors with distclean".

configure.ac

+13-13
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ fi
224224
AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
225225

226226
if test x"$enable_coverage" = x"yes"; then
227-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DCOVERAGE=1"
227+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DCOVERAGE=1"
228228
SECP_CFLAGS="-O0 --coverage $SECP_CFLAGS"
229229
LDFLAGS="--coverage $LDFLAGS"
230230
else
@@ -266,7 +266,7 @@ enable_external_asm=no
266266

267267
case $set_asm in
268268
x86_64)
269-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DUSE_ASM_X86_64=1"
269+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DUSE_ASM_X86_64=1"
270270
;;
271271
arm)
272272
enable_external_asm=yes
@@ -279,17 +279,17 @@ no)
279279
esac
280280

281281
if test x"$enable_external_asm" = x"yes"; then
282-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DUSE_EXTERNAL_ASM=1"
282+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DUSE_EXTERNAL_ASM=1"
283283
fi
284284

285285

286286
# Select wide multiplication implementation
287287
case $set_widemul in
288288
int128)
289-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DUSE_FORCE_WIDEMUL_INT128=1"
289+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DUSE_FORCE_WIDEMUL_INT128=1"
290290
;;
291291
int64)
292-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DUSE_FORCE_WIDEMUL_INT64=1"
292+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DUSE_FORCE_WIDEMUL_INT64=1"
293293
;;
294294
auto)
295295
;;
@@ -316,7 +316,7 @@ case $set_ecmult_window in
316316
# not in range
317317
AC_MSG_ERROR($error_window_size)
318318
fi
319-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DECMULT_WINDOW_SIZE=$set_ecmult_window"
319+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DECMULT_WINDOW_SIZE=$set_ecmult_window"
320320
;;
321321
esac
322322

@@ -329,7 +329,7 @@ fi
329329

330330
case $set_ecmult_gen_precision in
331331
2|4|8)
332-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DECMULT_GEN_PREC_BITS=$set_ecmult_gen_precision"
332+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DECMULT_GEN_PREC_BITS=$set_ecmult_gen_precision"
333333
;;
334334
*)
335335
AC_MSG_ERROR(['ecmult gen precision not 2, 4, 8 or "auto"'])
@@ -350,26 +350,26 @@ SECP_CFLAGS="$SECP_CFLAGS $WERROR_CFLAGS"
350350
###
351351

352352
if test x"$enable_module_ecdh" = x"yes"; then
353-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DENABLE_MODULE_ECDH=1"
353+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_ECDH=1"
354354
fi
355355

356356
if test x"$enable_module_recovery" = x"yes"; then
357-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DENABLE_MODULE_RECOVERY=1"
357+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_RECOVERY=1"
358358
fi
359359

360360
if test x"$enable_module_schnorrsig" = x"yes"; then
361-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DENABLE_MODULE_SCHNORRSIG=1"
361+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_SCHNORRSIG=1"
362362
enable_module_extrakeys=yes
363363
fi
364364

365365
# Test if extrakeys is set after the schnorrsig module to allow the schnorrsig
366366
# module to set enable_module_extrakeys=yes
367367
if test x"$enable_module_extrakeys" = x"yes"; then
368-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DENABLE_MODULE_EXTRAKEYS=1"
368+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DENABLE_MODULE_EXTRAKEYS=1"
369369
fi
370370

371371
if test x"$enable_external_default_callbacks" = x"yes"; then
372-
SECP_DEFINE_FLAGS="$SECP_DEFINE_FLAGS -DUSE_EXTERNAL_DEFAULT_CALLBACKS=1"
372+
SECP_CONFIG_DEFINES="$SECP_CONFIG_DEFINES -DUSE_EXTERNAL_DEFAULT_CALLBACKS=1"
373373
fi
374374

375375
###
@@ -397,7 +397,7 @@ AC_SUBST(SECP_LIBS)
397397
AC_SUBST(SECP_TEST_LIBS)
398398
AC_SUBST(SECP_TEST_INCLUDES)
399399
AC_SUBST(SECP_CFLAGS)
400-
AC_SUBST(SECP_DEFINE_FLAGS)
400+
AC_SUBST(SECP_CONFIG_DEFINES)
401401
AM_CONDITIONAL([ENABLE_COVERAGE], [test x"$enable_coverage" = x"yes"])
402402
AM_CONDITIONAL([USE_TESTS], [test x"$enable_tests" != x"no"])
403403
AM_CONDITIONAL([USE_EXHAUSTIVE_TESTS], [test x"$enable_exhaustive_tests" != x"no"])

0 commit comments

Comments
 (0)