diff options
-rw-r--r-- | src/conversation/meson.build | 5 | ||||
-rw-r--r-- | src/gnsrecord/meson.build | 38 | ||||
-rw-r--r-- | src/hello/meson.build | 1 | ||||
-rw-r--r-- | src/hostlist/meson.build | 29 | ||||
-rw-r--r-- | src/json/meson.build | 3 | ||||
-rw-r--r-- | src/messenger/meson.build | 1 | ||||
-rw-r--r-- | src/reclaim/meson.build | 64 | ||||
-rw-r--r-- | src/revocation/meson.build | 60 | ||||
-rw-r--r-- | src/statistics/meson.build | 37 |
9 files changed, 144 insertions, 94 deletions
diff --git a/src/conversation/meson.build b/src/conversation/meson.build index d4d905e6f..dc76affff 100644 --- a/src/conversation/meson.build +++ b/src/conversation/meson.build | |||
@@ -68,11 +68,6 @@ shared_module('gnunet_plugin_gnsrecord_conversation', | |||
68 | install: true, | 68 | install: true, |
69 | install_dir: get_option('libdir')) | 69 | install_dir: get_option('libdir')) |
70 | 70 | ||
71 | libgnunetconversation_dep = declare_dependency(link_with : libgnunetconversation) | ||
72 | pkg.generate(libgnunetconversation, url: 'https://www.gnunet.org', | ||
73 | description : 'Provides API to access the GNU Name System') | ||
74 | |||
75 | |||
76 | executable ('gnunet-conversation', | 71 | executable ('gnunet-conversation', |
77 | 'gnunet-conversation.c', | 72 | 'gnunet-conversation.c', |
78 | dependencies: [libgnunetconversation_dep, | 73 | dependencies: [libgnunetconversation_dep, |
diff --git a/src/gnsrecord/meson.build b/src/gnsrecord/meson.build index f98415ce5..28e211f16 100644 --- a/src/gnsrecord/meson.build +++ b/src/gnsrecord/meson.build | |||
@@ -4,22 +4,30 @@ libgnunetgnsrecord_src = ['gnsrecord.c', | |||
4 | 'gnsrecord_misc.c'] | 4 | 'gnsrecord_misc.c'] |
5 | libgnunetgnsrecordjson_src = ['json_gnsrecord.c'] | 5 | libgnunetgnsrecordjson_src = ['json_gnsrecord.c'] |
6 | 6 | ||
7 | if get_option('monolith') == false | 7 | if get_option('monolith') |
8 | libgnunetgnsrecord = library('gnunetgnsrecord', | ||
9 | libgnunetgnsrecord_src, | ||
10 | dependencies: [libgnunetutil_dep, | ||
11 | sodium_dep, | ||
12 | libgnunetidentity_dep, | ||
13 | gcrypt_dep], | ||
14 | include_directories: [incdir, configuration_inc]) | ||
15 | libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord) | ||
16 | libgnunetgnsrecordjson = library('gnunetgnsrecordjson', | ||
17 | libgnunetgnsrecordjson_src, | ||
18 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep], | ||
19 | include_directories: [incdir, configuration_inc]) | ||
20 | libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecord) | ||
21 | else | ||
22 | foreach p : libgnunetgnsrecord_src + libgnunetgnsrecordjson_src | 8 | foreach p : libgnunetgnsrecord_src + libgnunetgnsrecordjson_src |
23 | gnunet_src += 'gnsrecord/' + p | 9 | gnunet_src += 'gnsrecord/' + p |
24 | endforeach | 10 | endforeach |
11 | subdir_done() | ||
25 | endif | 12 | endif |
13 | |||
14 | libgnunetgnsrecord = library('gnunetgnsrecord', | ||
15 | libgnunetgnsrecord_src, | ||
16 | soversion: '0.0.0', | ||
17 | dependencies: [libgnunetutil_dep, | ||
18 | sodium_dep, | ||
19 | libgnunetidentity_dep, | ||
20 | gcrypt_dep], | ||
21 | include_directories: [incdir, configuration_inc]) | ||
22 | libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord) | ||
23 | pkg.generate(libgnunetgnsrecord, url: 'https://www.gnunet.org', | ||
24 | description : 'Provides API for manipulating GNS records') | ||
25 | |||
26 | |||
27 | libgnunetgnsrecordjson = library('gnunetgnsrecordjson', | ||
28 | libgnunetgnsrecordjson_src, | ||
29 | soversion: '0.0.0', | ||
30 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep], | ||
31 | include_directories: [incdir, configuration_inc]) | ||
32 | libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecord) | ||
33 | |||
diff --git a/src/hello/meson.build b/src/hello/meson.build index 23f26db31..f2e4c446c 100644 --- a/src/hello/meson.build +++ b/src/hello/meson.build | |||
@@ -15,6 +15,7 @@ endif | |||
15 | 15 | ||
16 | libgnunethello = library('gnunethello', | 16 | libgnunethello = library('gnunethello', |
17 | libgnunethello_src, | 17 | libgnunethello_src, |
18 | soversion: '1.0.1', | ||
18 | dependencies: libgnunetutil_dep, | 19 | dependencies: libgnunetutil_dep, |
19 | include_directories: [incdir, configuration_inc]) | 20 | include_directories: [incdir, configuration_inc]) |
20 | libgnunethello_dep = declare_dependency(link_with : libgnunethello) | 21 | libgnunethello_dep = declare_dependency(link_with : libgnunethello) |
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build index 8cdcf3972..99cc089df 100644 --- a/src/hostlist/meson.build +++ b/src/hostlist/meson.build | |||
@@ -9,20 +9,17 @@ configure_file(input : 'hostlist.conf', | |||
9 | install_dir: pkgcfgdir) | 9 | install_dir: pkgcfgdir) |
10 | 10 | ||
11 | 11 | ||
12 | if get_option('monolith') == false | 12 | if get_option('monolith') |
13 | executable ('gnunet-daemon-hostlist', | 13 | subdir_done() |
14 | gnunetdaemonhostlist_src, | ||
15 | dependencies: [libgnunetutil_dep, | ||
16 | libgnunetcore_dep, | ||
17 | libgnunethello_dep, | ||
18 | libgnunetpeerinfo_dep, | ||
19 | libgnunetstatistics_dep, | ||
20 | libgnunettransport_dep, | ||
21 | mhd_dep, | ||
22 | curl_dep], | ||
23 | include_directories: [incdir, configuration_inc]) | ||
24 | else | ||
25 | #foreach p : gnunetdaemonhostlist_src | ||
26 | # gnunet_src += 'hostlist/' + p | ||
27 | #endforeach | ||
28 | endif | 14 | endif |
15 | executable ('gnunet-daemon-hostlist', | ||
16 | gnunetdaemonhostlist_src, | ||
17 | dependencies: [libgnunetutil_dep, | ||
18 | libgnunetcore_dep, | ||
19 | libgnunethello_dep, | ||
20 | libgnunetpeerinfo_dep, | ||
21 | libgnunetstatistics_dep, | ||
22 | libgnunettransport_dep, | ||
23 | mhd_dep, | ||
24 | curl_dep], | ||
25 | include_directories: [incdir, configuration_inc]) | ||
diff --git a/src/json/meson.build b/src/json/meson.build index 9c3566335..3ebd10ec1 100644 --- a/src/json/meson.build +++ b/src/json/meson.build | |||
@@ -13,9 +13,10 @@ endif | |||
13 | 13 | ||
14 | libgnunetjson = library('gnunetjson', | 14 | libgnunetjson = library('gnunetjson', |
15 | libgnunetjson_src, | 15 | libgnunetjson_src, |
16 | soversion: '0.0.0', | ||
16 | dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep], | 17 | dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep], |
17 | include_directories: [incdir, configuration_inc]) | 18 | include_directories: [incdir, configuration_inc]) |
18 | libgnunetjson_dep = declare_dependency(link_with : libgnunetjson) | 19 | libgnunetjson_dep = declare_dependency(link_with : libgnunetjson) |
19 | pkg.generate(libgnunetarm, url: 'https://www.gnunet.org', | 20 | pkg.generate(libgnunetjson, url: 'https://www.gnunet.org', |
20 | description : 'Library for JSON de/serialization') | 21 | description : 'Library for JSON de/serialization') |
21 | 22 | ||
diff --git a/src/messenger/meson.build b/src/messenger/meson.build index e2e74c5e7..097ba5d49 100644 --- a/src/messenger/meson.build +++ b/src/messenger/meson.build | |||
@@ -37,6 +37,7 @@ endif | |||
37 | 37 | ||
38 | libgnunetmessenger = library('gnunetmessenger', | 38 | libgnunetmessenger = library('gnunetmessenger', |
39 | libgnunetmessenger_src, | 39 | libgnunetmessenger_src, |
40 | soversion: '0.0.0', | ||
40 | dependencies: [libgnunetutil_dep, | 41 | dependencies: [libgnunetutil_dep, |
41 | libgnunetcadet_dep, | 42 | libgnunetcadet_dep, |
42 | libgnunetidentity_dep], | 43 | libgnunetidentity_dep], |
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build index 26eaa6b31..ee32137a6 100644 --- a/src/reclaim/meson.build +++ b/src/reclaim/meson.build | |||
@@ -12,37 +12,41 @@ configure_file(input : 'reclaim.conf', | |||
12 | install_dir: pkgcfgdir) | 12 | install_dir: pkgcfgdir) |
13 | 13 | ||
14 | 14 | ||
15 | if get_option('monolith') == false | 15 | if get_option('monolith') |
16 | libgnunetreclaim = library('gnunetreclaim', | ||
17 | libgnunetreclaim_src, | ||
18 | dependencies: [libgnunetutil_dep, | ||
19 | libgnunetidentity_dep], | ||
20 | include_directories: [incdir, configuration_inc], | ||
21 | install: true, | ||
22 | install_dir: get_option('libdir')) | ||
23 | libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim) | ||
24 | executable ('gnunet-reclaim', | ||
25 | 'gnunet-reclaim.c', | ||
26 | dependencies: [libgnunetreclaim_dep, | ||
27 | libgnunetidentity_dep, | ||
28 | libgnunetutil_dep], | ||
29 | include_directories: [incdir, configuration_inc], | ||
30 | install: true, | ||
31 | install_dir: get_option('bindir')) | ||
32 | executable ('gnunet-service-reclaim', | ||
33 | gnunetservicereclaim_src, | ||
34 | dependencies: [libgnunetreclaim_dep, | ||
35 | libgnunetutil_dep, | ||
36 | libgnunetstatistics_dep, | ||
37 | libgnunetgnsrecord_dep, | ||
38 | libgnunetgns_dep, | ||
39 | libgnunetidentity_dep, | ||
40 | libgnunetnamestore_dep], | ||
41 | include_directories: [incdir, configuration_inc], | ||
42 | install: true, | ||
43 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
44 | else | ||
45 | foreach p : libgnunetreclaim_src + gnunetservicereclaim_src | 16 | foreach p : libgnunetreclaim_src + gnunetservicereclaim_src |
46 | gnunet_src += 'reclaim/' + p | 17 | gnunet_src += 'reclaim/' + p |
47 | endforeach | 18 | endforeach |
19 | subdir_done() | ||
48 | endif | 20 | endif |
21 | libgnunetreclaim = library('gnunetreclaim', | ||
22 | libgnunetreclaim_src, | ||
23 | dependencies: [libgnunetutil_dep, | ||
24 | libgnunetidentity_dep], | ||
25 | include_directories: [incdir, configuration_inc], | ||
26 | install: true, | ||
27 | install_dir: get_option('libdir')) | ||
28 | libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim) | ||
29 | pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org', | ||
30 | description : 'Provides API to access reclaimID') | ||
31 | |||
32 | executable ('gnunet-reclaim', | ||
33 | 'gnunet-reclaim.c', | ||
34 | dependencies: [libgnunetreclaim_dep, | ||
35 | libgnunetidentity_dep, | ||
36 | libgnunetutil_dep], | ||
37 | include_directories: [incdir, configuration_inc], | ||
38 | install: true, | ||
39 | install_dir: get_option('bindir')) | ||
40 | executable ('gnunet-service-reclaim', | ||
41 | gnunetservicereclaim_src, | ||
42 | dependencies: [libgnunetreclaim_dep, | ||
43 | libgnunetutil_dep, | ||
44 | libgnunetstatistics_dep, | ||
45 | libgnunetgnsrecord_dep, | ||
46 | libgnunetgns_dep, | ||
47 | libgnunetidentity_dep, | ||
48 | libgnunetnamestore_dep], | ||
49 | include_directories: [incdir, configuration_inc], | ||
50 | install: true, | ||
51 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
52 | |||
diff --git a/src/revocation/meson.build b/src/revocation/meson.build index 6a539febb..f1023b00a 100644 --- a/src/revocation/meson.build +++ b/src/revocation/meson.build | |||
@@ -9,23 +9,51 @@ configure_file(input : 'revocation.conf.in', | |||
9 | install_dir: pkgcfgdir) | 9 | install_dir: pkgcfgdir) |
10 | 10 | ||
11 | 11 | ||
12 | if get_option('monolith') == false | 12 | if get_option('monolith') |
13 | libgnunetrevocation = library('gnunetrevocation', | ||
14 | libgnunetrevocation_src, | ||
15 | dependencies: [libgnunetutil_dep, libgnunetidentity_dep], | ||
16 | include_directories: [incdir, configuration_inc]) | ||
17 | libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation) | ||
18 | executable ('gnunet-service-revocation', | ||
19 | gnunetservicerevocation_src, | ||
20 | dependencies: [libgnunetrevocation_dep, | ||
21 | libgnunetutil_dep, | ||
22 | libgnunetstatistics_dep, | ||
23 | libgnunetcore_dep, | ||
24 | libgnunetsetu_dep, | ||
25 | libgnunetidentity_dep], | ||
26 | include_directories: [incdir, configuration_inc]) | ||
27 | else | ||
28 | foreach p : libgnunetrevocation_src + gnunetservicerevocation_src | 13 | foreach p : libgnunetrevocation_src + gnunetservicerevocation_src |
29 | gnunet_src += 'revocation/' + p | 14 | gnunet_src += 'revocation/' + p |
30 | endforeach | 15 | endforeach |
16 | subdir_done() | ||
31 | endif | 17 | endif |
18 | |||
19 | libgnunetrevocation = library('gnunetrevocation', | ||
20 | libgnunetrevocation_src, | ||
21 | soversion: '0.0.0', | ||
22 | dependencies: [libgnunetutil_dep, libgnunetidentity_dep], | ||
23 | include_directories: [incdir, configuration_inc]) | ||
24 | libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation) | ||
25 | pkg.generate(libgnunetrevocation, url: 'https://www.gnunet.org', | ||
26 | description : 'Provides API to perform key revocation in GNUnet') | ||
27 | |||
28 | shared_module('gnunet_plugin_block_revocation', | ||
29 | ['plugin_block_revocation.c'], | ||
30 | dependencies: [libgnunetutil_dep, | ||
31 | libgnunetrevocation_dep, | ||
32 | libgnunetblock_dep], | ||
33 | include_directories: [incdir, configuration_inc], | ||
34 | install: true, | ||
35 | install_dir: get_option('libdir')) | ||
36 | |||
37 | executable ('gnunet-revocation', | ||
38 | ['gnunet-revocation.c'], | ||
39 | dependencies: [libgnunetrevocation_dep, | ||
40 | libgnunetutil_dep, | ||
41 | libgnunetstatistics_dep, | ||
42 | libgnunetcore_dep, | ||
43 | libgnunetsetu_dep, | ||
44 | libgnunetidentity_dep], | ||
45 | include_directories: [incdir, configuration_inc], | ||
46 | install: true, | ||
47 | install_dir: get_option('bindir')) | ||
48 | executable ('gnunet-service-revocation', | ||
49 | gnunetservicerevocation_src, | ||
50 | dependencies: [libgnunetrevocation_dep, | ||
51 | libgnunetutil_dep, | ||
52 | libgnunetstatistics_dep, | ||
53 | libgnunetcore_dep, | ||
54 | libgnunetsetu_dep, | ||
55 | libgnunetidentity_dep], | ||
56 | include_directories: [incdir, configuration_inc], | ||
57 | install: true, | ||
58 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
59 | |||
diff --git a/src/statistics/meson.build b/src/statistics/meson.build index 86c3b6eb9..446523416 100644 --- a/src/statistics/meson.build +++ b/src/statistics/meson.build | |||
@@ -9,18 +9,33 @@ configure_file(input : 'statistics.conf.in', | |||
9 | install_dir: pkgcfgdir) | 9 | install_dir: pkgcfgdir) |
10 | 10 | ||
11 | 11 | ||
12 | if get_option('monolith') == false | 12 | if get_option('monolith') |
13 | libgnunetstatistics = library('gnunetstatistics', | ||
14 | libgnunetstatistics_src, | ||
15 | dependencies: libgnunetutil_dep, | ||
16 | include_directories: [incdir, configuration_inc]) | ||
17 | libgnunetstatistics_dep = declare_dependency(link_with : libgnunetstatistics) | ||
18 | executable ('gnunet-service-statistics', | ||
19 | gnunetservicestatistics_src, | ||
20 | dependencies: [libgnunetstatistics_dep, libgnunetutil_dep], | ||
21 | include_directories: [incdir, configuration_inc]) | ||
22 | else | ||
23 | foreach p : libgnunetstatistics_src + gnunetservicestatistics_src | 13 | foreach p : libgnunetstatistics_src + gnunetservicestatistics_src |
24 | gnunet_src += 'statistics/' + p | 14 | gnunet_src += 'statistics/' + p |
25 | endforeach | 15 | endforeach |
16 | subdir_done() | ||
26 | endif | 17 | endif |
18 | |||
19 | libgnunetstatistics = library('gnunetstatistics', | ||
20 | libgnunetstatistics_src, | ||
21 | soversion: '2.0.0', | ||
22 | dependencies: libgnunetutil_dep, | ||
23 | include_directories: [incdir, configuration_inc]) | ||
24 | libgnunetstatistics_dep = declare_dependency(link_with : libgnunetstatistics) | ||
25 | pkg.generate(libgnunetstatistics, url: 'https://www.gnunet.org', | ||
26 | description : 'Provides API of GNUnet statistics service') | ||
27 | |||
28 | executable ('gnunet-service-statistics', | ||
29 | gnunetservicestatistics_src, | ||
30 | dependencies: [libgnunetstatistics_dep, libgnunetutil_dep], | ||
31 | include_directories: [incdir, configuration_inc], | ||
32 | install: true, | ||
33 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
34 | executable ('gnunet-statistics', | ||
35 | gnunetservicestatistics_src, | ||
36 | dependencies: [libgnunetstatistics_dep, libgnunetutil_dep], | ||
37 | include_directories: [incdir, configuration_inc], | ||
38 | install: true, | ||
39 | install_dir: get_option('bindir')) | ||
40 | |||
41 | |||