diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-09-23 09:56:57 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-09-23 09:56:57 +0200 |
commit | 5162b6584b14d6963b71a7e0312f3eabade6be70 (patch) | |
tree | 9dc38cef3ae1d7f679a1ae9aa3761f1a45a88b2d | |
parent | 5a6ea6b45ff9c9398cf4d532b55889c3ffbaa1e7 (diff) | |
download | gnunet-5162b6584b14d6963b71a7e0312f3eabade6be70.tar.gz gnunet-5162b6584b14d6963b71a7e0312f3eabade6be70.zip |
BUILD: More pkg-config and soversions
-rw-r--r-- | src/block/meson.build | 1 | ||||
-rw-r--r-- | src/core/meson.build | 1 | ||||
-rw-r--r-- | src/dht/meson.build | 56 | ||||
-rw-r--r-- | src/gns/meson.build | 106 | ||||
-rw-r--r-- | src/util/meson.build | 99 |
5 files changed, 139 insertions, 124 deletions
diff --git a/src/block/meson.build b/src/block/meson.build index 660f6e947..18fd71bb0 100644 --- a/src/block/meson.build +++ b/src/block/meson.build | |||
@@ -24,6 +24,7 @@ libgnunetblockgroup = library('gnunetblockgroup', | |||
24 | soversion: '0.0.0', | 24 | soversion: '0.0.0', |
25 | install_dir: get_option('libdir')) | 25 | install_dir: get_option('libdir')) |
26 | libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup) | 26 | libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup) |
27 | |||
27 | plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep] | 28 | plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep] |
28 | shared_module('gnunet_plugin_block_test', | 29 | shared_module('gnunet_plugin_block_test', |
29 | ['plugin_block_test.c'], | 30 | ['plugin_block_test.c'], |
diff --git a/src/core/meson.build b/src/core/meson.build index 5493f9ae9..0b48d04fb 100644 --- a/src/core/meson.build +++ b/src/core/meson.build | |||
@@ -29,6 +29,7 @@ libgnunetcore = library('gnunetcore', | |||
29 | libgnunetcore_dep = declare_dependency(link_with : libgnunetcore) | 29 | libgnunetcore_dep = declare_dependency(link_with : libgnunetcore) |
30 | pkg.generate(libgnunetcore, url: 'https://www.gnunet.org', | 30 | pkg.generate(libgnunetcore, url: 'https://www.gnunet.org', |
31 | description : 'Provides API for (encrypted) P2P communication') | 31 | description : 'Provides API for (encrypted) P2P communication') |
32 | |||
32 | executable ('gnunet-service-core', | 33 | executable ('gnunet-service-core', |
33 | gnunetservicecore_src, | 34 | gnunetservicecore_src, |
34 | dependencies: [libgnunetcore_dep, libgnunetutil_dep, | 35 | dependencies: [libgnunetcore_dep, libgnunetutil_dep, |
diff --git a/src/dht/meson.build b/src/dht/meson.build index 686d8e7ed..8b595a58f 100644 --- a/src/dht/meson.build +++ b/src/dht/meson.build | |||
@@ -1,7 +1,5 @@ | |||
1 | libgnunetdht_src = ['dht_api.c'] | 1 | libgnunetdht_src = ['dht_api.c'] |
2 | 2 | ||
3 | libgnunetpluginblockdht_src = ['plugin_block_dht.c'] | ||
4 | |||
5 | gnunetservicedht_src = ['gnunet-service-dht.c', | 3 | gnunetservicedht_src = ['gnunet-service-dht.c', |
6 | 'gnunet-service-dht_datacache.c', | 4 | 'gnunet-service-dht_datacache.c', |
7 | 'gnunet-service-dht_neighbours.c', | 5 | 'gnunet-service-dht_neighbours.c', |
@@ -13,32 +11,36 @@ configure_file(input : 'dht.conf.in', | |||
13 | install: true, | 11 | install: true, |
14 | install_dir: pkgcfgdir) | 12 | install_dir: pkgcfgdir) |
15 | 13 | ||
16 | if get_option('monolith') == false | 14 | if get_option('monolith') |
17 | libgnunetdht = library('gnunetdht', | ||
18 | libgnunetdht_src, | ||
19 | dependencies: libgnunetutil_dep, | ||
20 | include_directories: [incdir, configuration_inc]) | ||
21 | libgnunetdht_dep = declare_dependency(link_with : libgnunetdht) | ||
22 | libgnunetpluginblockdht = library('gnunet_plugin_block_dht', | ||
23 | libgnunetpluginblockdht_src, | ||
24 | dependencies: [libgnunetutil_dep, | ||
25 | libgnunethello_dep, | ||
26 | libgnunetblock_dep, | ||
27 | libgnunetblockgroup_dep], | ||
28 | include_directories: [incdir, configuration_inc]) | ||
29 | libgnunetpluginblockdht_dep = declare_dependency(link_with : libgnunetpluginblockdht) | ||
30 | executable ('gnunet-service-dht', | ||
31 | gnunetservicedht_src, | ||
32 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, | ||
33 | libgnunetblock_dep, | ||
34 | m_dep, | ||
35 | libgnunetdatacache_dep, | ||
36 | libgnunetstatistics_dep, | ||
37 | libgnunetblockgroup_dep, | ||
38 | libgnunethello_dep], | ||
39 | include_directories: [incdir, configuration_inc]) | ||
40 | else | ||
41 | foreach p : libgnunetdht_src + gnunetservicedht_src | 15 | foreach p : libgnunetdht_src + gnunetservicedht_src |
42 | gnunet_src += 'dht/' + p | 16 | gnunet_src += 'dht/' + p |
43 | endforeach | 17 | endforeach |
44 | endif | 18 | endif |
19 | |||
20 | libgnunetdht = library('gnunetdht', | ||
21 | libgnunetdht_src, | ||
22 | soversion: '4.0.0', | ||
23 | dependencies: libgnunetutil_dep, | ||
24 | include_directories: [incdir, configuration_inc]) | ||
25 | libgnunetdht_dep = declare_dependency(link_with : libgnunetdht) | ||
26 | pkg.generate(libgnunetdht, url: 'https://www.gnunet.org', | ||
27 | description : 'Provides API for the R5N distributed hash table') | ||
28 | |||
29 | shared_module('gnunet_plugin_block_dht', | ||
30 | ['plugin_block_dht.c'], | ||
31 | dependencies: [libgnunetutil_dep, | ||
32 | libgnunethello_dep, | ||
33 | libgnunetblock_dep, | ||
34 | libgnunetblockgroup_dep], | ||
35 | include_directories: [incdir, configuration_inc]) | ||
36 | |||
37 | executable ('gnunet-service-dht', | ||
38 | gnunetservicedht_src, | ||
39 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, | ||
40 | libgnunetblock_dep, | ||
41 | m_dep, | ||
42 | libgnunetdatacache_dep, | ||
43 | libgnunetstatistics_dep, | ||
44 | libgnunetblockgroup_dep, | ||
45 | libgnunethello_dep], | ||
46 | include_directories: [incdir, configuration_inc]) | ||
diff --git a/src/gns/meson.build b/src/gns/meson.build index eef8224ef..fa6837a4b 100644 --- a/src/gns/meson.build +++ b/src/gns/meson.build | |||
@@ -13,57 +13,63 @@ configure_file(input : 'gns.conf.in', | |||
13 | install_dir: pkgcfgdir) | 13 | install_dir: pkgcfgdir) |
14 | 14 | ||
15 | 15 | ||
16 | if get_option('monolith') == false | 16 | if get_option('monolith') |
17 | libgnunetgns = library('gnunetgns', | ||
18 | libgnunetgns_src, | ||
19 | dependencies: [libgnunetutil_dep, | ||
20 | libgnunetgnsrecord_dep, | ||
21 | libgnunetidentity_dep], | ||
22 | include_directories: [incdir, configuration_inc], | ||
23 | install: true, | ||
24 | install_dir: get_option('libdir')) | ||
25 | libgnunetgns_dep = declare_dependency(link_with : libgnunetgns) | ||
26 | executable ('gnunet-gns', | ||
27 | 'gnunet-gns.c', | ||
28 | dependencies: [libgnunetgns_dep, | ||
29 | libgnunetgnsrecord_dep, | ||
30 | idn_dep, | ||
31 | libgnunetutil_dep], | ||
32 | include_directories: [incdir, configuration_inc], | ||
33 | install: true, | ||
34 | install_dir: get_option('bindir')) | ||
35 | executable ('gnunet-gns-proxy', | ||
36 | gnunetgnsproxy_src, | ||
37 | dependencies: [libgnunetgns_dep, | ||
38 | libgnunetutil_dep, | ||
39 | mhd_dep, | ||
40 | idn_dep, | ||
41 | curl_dep, | ||
42 | gnutls_dep, | ||
43 | libgnunetidentity_dep], | ||
44 | include_directories: [incdir, configuration_inc], | ||
45 | install: true, | ||
46 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
47 | executable ('gnunet-service-gns', | ||
48 | gnunetservicegns_src, | ||
49 | dependencies: [libgnunetgns_dep, | ||
50 | libgnunetutil_dep, | ||
51 | libgnunetstatistics_dep, | ||
52 | libgnunetcore_dep, | ||
53 | libgnunetdht_dep, | ||
54 | libgnunetdns_dep, | ||
55 | idn_dep, | ||
56 | libgnunetidentity_dep, | ||
57 | libgnunetnamecache_dep, | ||
58 | libgnunetrevocation_dep, | ||
59 | libgnunetgnsrecord_dep, | ||
60 | libgnunetcadet_dep, | ||
61 | libgnunetblock_dep], | ||
62 | include_directories: [incdir, configuration_inc], | ||
63 | install: true, | ||
64 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
65 | else | ||
66 | foreach p : libgnunetgns_src + gnunetservicegns_src | 17 | foreach p : libgnunetgns_src + gnunetservicegns_src |
67 | gnunet_src += 'gns/' + p | 18 | gnunet_src += 'gns/' + p |
68 | endforeach | 19 | endforeach |
20 | subdir_done() | ||
69 | endif | 21 | endif |
22 | |||
23 | libgnunetgns = library('gnunetgns', | ||
24 | libgnunetgns_src, | ||
25 | soversion: '0.0.0', | ||
26 | dependencies: [libgnunetutil_dep, | ||
27 | libgnunetgnsrecord_dep, | ||
28 | libgnunetidentity_dep], | ||
29 | include_directories: [incdir, configuration_inc], | ||
30 | install: true, | ||
31 | install_dir: get_option('libdir')) | ||
32 | libgnunetgns_dep = declare_dependency(link_with : libgnunetgns) | ||
33 | pkg.generate(libgnunetgns, url: 'https://www.gnunet.org', | ||
34 | description : 'Provides API to access the GNU Name System') | ||
35 | |||
36 | |||
37 | executable ('gnunet-gns', | ||
38 | 'gnunet-gns.c', | ||
39 | dependencies: [libgnunetgns_dep, | ||
40 | libgnunetgnsrecord_dep, | ||
41 | idn_dep, | ||
42 | libgnunetutil_dep], | ||
43 | include_directories: [incdir, configuration_inc], | ||
44 | install: true, | ||
45 | install_dir: get_option('bindir')) | ||
46 | executable ('gnunet-gns-proxy', | ||
47 | gnunetgnsproxy_src, | ||
48 | dependencies: [libgnunetgns_dep, | ||
49 | libgnunetutil_dep, | ||
50 | mhd_dep, | ||
51 | idn_dep, | ||
52 | curl_dep, | ||
53 | gnutls_dep, | ||
54 | libgnunetidentity_dep], | ||
55 | include_directories: [incdir, configuration_inc], | ||
56 | install: true, | ||
57 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
58 | executable ('gnunet-service-gns', | ||
59 | gnunetservicegns_src, | ||
60 | dependencies: [libgnunetgns_dep, | ||
61 | libgnunetutil_dep, | ||
62 | libgnunetstatistics_dep, | ||
63 | libgnunetcore_dep, | ||
64 | libgnunetdht_dep, | ||
65 | libgnunetdns_dep, | ||
66 | idn_dep, | ||
67 | libgnunetidentity_dep, | ||
68 | libgnunetnamecache_dep, | ||
69 | libgnunetrevocation_dep, | ||
70 | libgnunetgnsrecord_dep, | ||
71 | libgnunetcadet_dep, | ||
72 | libgnunetblock_dep], | ||
73 | include_directories: [incdir, configuration_inc], | ||
74 | install: true, | ||
75 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
diff --git a/src/util/meson.build b/src/util/meson.build index d4b03479a..9cda9f193 100644 --- a/src/util/meson.build +++ b/src/util/meson.build | |||
@@ -76,54 +76,59 @@ configure_file(input : 'util.conf', | |||
76 | install_dir: pkgcfgdir) | 76 | install_dir: pkgcfgdir) |
77 | 77 | ||
78 | 78 | ||
79 | if get_option('monolith') == false | 79 | if get_option('monolith') |
80 | libgnunetutil = library('gnunetutil', | ||
81 | libgnunetutil_src, | ||
82 | dependencies: gnunetdeps, | ||
83 | include_directories: [incdir, configuration_inc]) | ||
84 | libgnunetutil_dep = declare_dependency(link_with : libgnunetutil) | ||
85 | testcommonalloc = executable ('test_common_allocation', | ||
86 | ['test_common_allocation.c'], | ||
87 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
88 | include_directories: [incdir, configuration_inc], | ||
89 | install: false) | ||
90 | test('test_common_allocation', testcommonalloc, | ||
91 | workdir: meson.current_source_dir(), | ||
92 | suite: ['util', 'util-common']) | ||
93 | testcommonlog = executable ('test_common_logging', | ||
94 | ['test_common_logging.c'], | ||
95 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
96 | include_directories: [incdir, configuration_inc], | ||
97 | install: false) | ||
98 | test('test_common_logging', testcommonlog, | ||
99 | workdir: meson.current_source_dir(), | ||
100 | suite: ['util', 'util-common']) | ||
101 | testcommonendian = executable ('test_common_endian', | ||
102 | ['test_common_endian.c'], | ||
103 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
104 | include_directories: [incdir, configuration_inc], | ||
105 | install: false) | ||
106 | test('test_common_endian', testcommonendian, | ||
107 | workdir: meson.current_source_dir(), | ||
108 | suite: ['util', 'util-common']) | ||
109 | testconf = executable ('test_configuration', | ||
110 | ['test_configuration.c'], | ||
111 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
112 | include_directories: [incdir, configuration_inc], | ||
113 | install: false) | ||
114 | test('test_configuration', testconf, | ||
115 | workdir: meson.current_source_dir(), | ||
116 | suite: ['util', 'util-configuration']) | ||
117 | testcontainerbloom = executable ('test_container_bloomfilter', | ||
118 | ['test_container_bloomfilter.c'], | ||
119 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
120 | include_directories: [incdir, configuration_inc], | ||
121 | install: false) | ||
122 | test('test_container_bloomfilter', testcontainerbloom, | ||
123 | workdir: meson.current_source_dir(), | ||
124 | suite: ['util', 'util-container']) | ||
125 | else | ||
126 | foreach p : libgnunetutil_src | 80 | foreach p : libgnunetutil_src |
127 | gnunet_src += 'util/' + p | 81 | gnunet_src += 'util/' + p |
128 | endforeach | 82 | endforeach |
129 | endif | 83 | endif |
84 | |||
85 | libgnunetutil = library('gnunetutil', | ||
86 | libgnunetutil_src, | ||
87 | soversion: '15.0.0', | ||
88 | dependencies: gnunetdeps, | ||
89 | include_directories: [incdir, configuration_inc]) | ||
90 | libgnunetutil_dep = declare_dependency(link_with : libgnunetutil) | ||
91 | pkg.generate(libgnunetutil, url: 'https://www.gnunet.org', | ||
92 | description : 'Provides miscellaneous utility functions and API for GNUnet') | ||
93 | |||
94 | |||
95 | testcommonalloc = executable ('test_common_allocation', | ||
96 | ['test_common_allocation.c'], | ||
97 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
98 | include_directories: [incdir, configuration_inc], | ||
99 | install: false) | ||
100 | test('test_common_allocation', testcommonalloc, | ||
101 | workdir: meson.current_source_dir(), | ||
102 | suite: ['util', 'util-common']) | ||
103 | testcommonlog = executable ('test_common_logging', | ||
104 | ['test_common_logging.c'], | ||
105 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
106 | include_directories: [incdir, configuration_inc], | ||
107 | install: false) | ||
108 | test('test_common_logging', testcommonlog, | ||
109 | workdir: meson.current_source_dir(), | ||
110 | suite: ['util', 'util-common']) | ||
111 | testcommonendian = executable ('test_common_endian', | ||
112 | ['test_common_endian.c'], | ||
113 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
114 | include_directories: [incdir, configuration_inc], | ||
115 | install: false) | ||
116 | test('test_common_endian', testcommonendian, | ||
117 | workdir: meson.current_source_dir(), | ||
118 | suite: ['util', 'util-common']) | ||
119 | testconf = executable ('test_configuration', | ||
120 | ['test_configuration.c'], | ||
121 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
122 | include_directories: [incdir, configuration_inc], | ||
123 | install: false) | ||
124 | test('test_configuration', testconf, | ||
125 | workdir: meson.current_source_dir(), | ||
126 | suite: ['util', 'util-configuration']) | ||
127 | testcontainerbloom = executable ('test_container_bloomfilter', | ||
128 | ['test_container_bloomfilter.c'], | ||
129 | dependencies: [libgnunetutil_dep, libgnunetutil_dep], | ||
130 | include_directories: [incdir, configuration_inc], | ||
131 | install: false) | ||
132 | test('test_container_bloomfilter', testcontainerbloom, | ||
133 | workdir: meson.current_source_dir(), | ||
134 | suite: ['util', 'util-container']) | ||