aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2021-04-26 10:27:26 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2021-04-26 10:27:26 +0200
commit87def80f115a05314b2ff25b9ed53a8112a5490f (patch)
tree2e32c73ac9158f24d6c62e39ac9dfd5e7b293783
parent00f935e43df6f8c2129cb80992c35f5d0423901e (diff)
downloadgnunet-87def80f115a05314b2ff25b9ed53a8112a5490f.tar.gz
gnunet-87def80f115a05314b2ff25b9ed53a8112a5490f.zip
- unconditionally build dlog
-rw-r--r--src/util/Makefile.am17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index f05fc7bf7..72fd37bde 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -25,10 +25,8 @@ if ENABLE_BENCHMARK
25 PTHREAD = -lpthread 25 PTHREAD = -lpthread
26endif 26endif
27 27
28if HAVE_NOLIBGCRYPT19 28DLOG = crypto_ecc_dlog.c
29 DLOG = crypto_ecc_dlog.c 29DLOG_TEST = test_crypto_ecc_dlog
30 DLOG_TEST = test_crypto_ecc_dlog
31endif
32 30
33gnunet_config_diff_SOURCES = \ 31gnunet_config_diff_SOURCES = \
34 gnunet-config-diff.c 32 gnunet-config-diff.c
@@ -259,11 +257,8 @@ if HAVE_BENCHMARKS
259 perf_crypto_asymmetric \ 257 perf_crypto_asymmetric \
260 perf_malloc \ 258 perf_malloc \
261 perf_mq \ 259 perf_mq \
262 perf_scheduler 260 perf_scheduler \
263 261 perf_crypto_ecc_dlog
264if HAVE_NOLIBGCRYPT19
265 BENCHMARKS += perf_crypto_ecc_dlog
266endif
267endif 262endif
268 263
269if HAVE_SSH_KEY 264if HAVE_SSH_KEY
@@ -456,14 +451,12 @@ test_crypto_eddsa_LDADD = \
456 libgnunetutil.la \ 451 libgnunetutil.la \
457 $(LIBGCRYPT_LIBS) 452 $(LIBGCRYPT_LIBS)
458 453
459if HAVE_NOLIBGCRYPT19
460test_crypto_ecc_dlog_SOURCES = \ 454test_crypto_ecc_dlog_SOURCES = \
461 test_crypto_ecc_dlog.c 455 test_crypto_ecc_dlog.c
462test_crypto_ecc_dlog_LDADD = \ 456test_crypto_ecc_dlog_LDADD = \
463 -lsodium \ 457 -lsodium \
464 libgnunetutil.la \ 458 libgnunetutil.la \
465 $(LIBGCRYPT_LIBS) 459 $(LIBGCRYPT_LIBS)
466endif
467 460
468test_crypto_ecdhe_SOURCES = \ 461test_crypto_ecdhe_SOURCES = \
469 test_crypto_ecdhe.c 462 test_crypto_ecdhe.c
@@ -606,13 +599,11 @@ perf_crypto_hash_SOURCES = \
606perf_crypto_hash_LDADD = \ 599perf_crypto_hash_LDADD = \
607 libgnunetutil.la 600 libgnunetutil.la
608 601
609if HAVE_NOLIBGCRYPT19
610perf_crypto_ecc_dlog_SOURCES = \ 602perf_crypto_ecc_dlog_SOURCES = \
611 perf_crypto_ecc_dlog.c 603 perf_crypto_ecc_dlog.c
612perf_crypto_ecc_dlog_LDADD = \ 604perf_crypto_ecc_dlog_LDADD = \
613 libgnunetutil.la \ 605 libgnunetutil.la \
614 -lsodium 606 -lsodium
615endif
616 607
617perf_crypto_rsa_SOURCES = \ 608perf_crypto_rsa_SOURCES = \
618 perf_crypto_rsa.c 609 perf_crypto_rsa.c