aboutsummaryrefslogtreecommitdiff
path: root/src/util/Makefile.am
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-12-05 10:46:47 +0100
committerChristian Grothoff <christian@grothoff.org>2020-12-05 10:46:47 +0100
commit813d74fafbd7d6556edeb94d8654838682624c27 (patch)
tree85a26aec056311613f0c04fdf15bb5d41d7aa10e /src/util/Makefile.am
parent4dce2caf4a001bdc03d117474b45fe8712e33a96 (diff)
parent2c5857012467c1420270545472be72d8fa9a5563 (diff)
downloadgnunet-813d74fafbd7d6556edeb94d8654838682624c27.tar.gz
gnunet-813d74fafbd7d6556edeb94d8654838682624c27.zip
Merge branch 'master' of git+ssh://gnunet.org/gnunet
Diffstat (limited to 'src/util/Makefile.am')
-rw-r--r--src/util/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c5059bbb1..d2e4b4d1a 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -138,7 +138,7 @@ libgnunetutil_la_LIBADD = \
138 138
139libgnunetutil_la_LDFLAGS = \ 139libgnunetutil_la_LDFLAGS = \
140 $(GN_LIB_LDFLAGS) \ 140 $(GN_LIB_LDFLAGS) \
141 -version-info 13:2:0 141 -version-info 13:2:1
142 142
143if HAVE_TESTING 143if HAVE_TESTING
144 GNUNET_ECC = gnunet-ecc 144 GNUNET_ECC = gnunet-ecc
@@ -169,7 +169,7 @@ noinst_PROGRAMS = \
169 169
170if ENABLE_TEST_RUN 170if ENABLE_TEST_RUN
171AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; 171AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
172TESTS = $(check_PROGRAMS) 172TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
173endif 173endif
174 174
175gnunet_timeout_SOURCES = \ 175gnunet_timeout_SOURCES = \
@@ -195,7 +195,7 @@ gnunet_crypto_tvg_SOURCES = \
195 gnunet-crypto-tvg.c 195 gnunet-crypto-tvg.c
196gnunet_crypto_tvg_LDADD = \ 196gnunet_crypto_tvg_LDADD = \
197 libgnunetutil.la \ 197 libgnunetutil.la \
198 $(GN_LIBINTL) -lgcrypt 198 $(GN_LIBINTL) -lgcrypt -ljansson
199 199
200gnunet_ecc_SOURCES = \ 200gnunet_ecc_SOURCES = \
201 gnunet-ecc.c 201 gnunet-ecc.c
@@ -255,6 +255,9 @@ if HAVE_SSH_KEY
255# SSH_USING_TESTS = test_socks.nc 255# SSH_USING_TESTS = test_socks.nc
256endif 256endif
257 257
258check_SCRIPTS = \
259 test_crypto_vectors.sh
260
258check_PROGRAMS = \ 261check_PROGRAMS = \
259 test_bio \ 262 test_bio \
260 test_client.nc \ 263 test_client.nc \