diff options
author | t3sserakt <t3ss@posteo.de> | 2021-10-15 21:02:03 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-10-15 21:02:03 +0200 |
commit | 513f23e74650db9408267e82ef8bcb8f770d1015 (patch) | |
tree | 312db7072dc444e9d1e6a13000b79482eb14de82 /src/fs | |
parent | d190d23831dae1a77075557f2ff6e0c713d747d5 (diff) | |
parent | d64ac269856744b9bab170964e1d6f36896ecc55 (diff) | |
download | gnunet-513f23e74650db9408267e82ef8bcb8f770d1015.tar.gz gnunet-513f23e74650db9408267e82ef8bcb8f770d1015.zip |
Merge branch 'master' into dev/t3ss/tng
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/Makefile.am | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 5b6ba2376..3d8ec2bac 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -21,9 +21,7 @@ lib_LTLIBRARIES = libgnunetfs.la | |||
21 | plugin_LTLIBRARIES = \ | 21 | plugin_LTLIBRARIES = \ |
22 | libgnunet_plugin_block_fs.la | 22 | libgnunet_plugin_block_fs.la |
23 | 23 | ||
24 | if HAVE_TESTING | ||
25 | noinst_LIBRARIES = libgnunetfstest.a | 24 | noinst_LIBRARIES = libgnunetfstest.a |
26 | endif | ||
27 | 25 | ||
28 | libgnunetfs_la_SOURCES = \ | 26 | libgnunetfs_la_SOURCES = \ |
29 | fs_api.c fs_api.h fs.h \ | 27 | fs_api.c fs_api.h fs.h \ |
@@ -71,11 +69,9 @@ libexec_PROGRAMS = \ | |||
71 | gnunet-helper-fs-publish \ | 69 | gnunet-helper-fs-publish \ |
72 | gnunet-service-fs | 70 | gnunet-service-fs |
73 | 71 | ||
74 | if HAVE_TESTING | ||
75 | noinst_PROGRAMS = \ | 72 | noinst_PROGRAMS = \ |
76 | gnunet-fs-profiler \ | 73 | gnunet-fs-profiler \ |
77 | gnunet-daemon-fsprofiler | 74 | gnunet-daemon-fsprofiler |
78 | endif | ||
79 | 75 | ||
80 | bin_PROGRAMS = \ | 76 | bin_PROGRAMS = \ |
81 | gnunet-auto-share \ | 77 | gnunet-auto-share \ |
@@ -230,7 +226,6 @@ if HAVE_BENCHMARKS | |||
230 | perf_gnunet_service_fs_p2p_respect | 226 | perf_gnunet_service_fs_p2p_respect |
231 | endif | 227 | endif |
232 | 228 | ||
233 | if HAVE_TESTING | ||
234 | check_PROGRAMS = \ | 229 | check_PROGRAMS = \ |
235 | test_plugin_block_fs \ | 230 | test_plugin_block_fs \ |
236 | test_fs_directory \ | 231 | test_fs_directory \ |
@@ -258,7 +253,6 @@ check_PROGRAMS = \ | |||
258 | test_gnunet_service_fs_p2p \ | 253 | test_gnunet_service_fs_p2p \ |
259 | test_gnunet_service_fs_p2p_cadet \ | 254 | test_gnunet_service_fs_p2p_cadet \ |
260 | $(FS_BENCHMARKS) | 255 | $(FS_BENCHMARKS) |
261 | endif | ||
262 | 256 | ||
263 | test_plugin_block_fs_SOURCES = \ | 257 | test_plugin_block_fs_SOURCES = \ |
264 | test_plugin_block_fs.c | 258 | test_plugin_block_fs.c |