diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-09-23 21:17:26 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-09-23 21:17:26 +0200 |
commit | 8ac5695b5e44e64d19ccc9ec1c3bc83849ec39c3 (patch) | |
tree | 53e43fed55a26c8456c67a11c61a7a47c0b5ac49 | |
parent | dca0afc851783403b26464bbfa2629fe1bd70a55 (diff) | |
download | gnunet-8ac5695b5e44e64d19ccc9ec1c3bc83849ec39c3.tar.gz gnunet-8ac5695b5e44e64d19ccc9ec1c3bc83849ec39c3.zip |
BUILD: Meson - install more files
-rw-r--r-- | src/ats/meson.build | 2 | ||||
-rw-r--r-- | src/block/meson.build | 5 | ||||
-rw-r--r-- | src/conversation/meson.build | 2 | ||||
-rw-r--r-- | src/datacache/meson.build | 14 | ||||
-rw-r--r-- | src/datastore/meson.build | 20 | ||||
-rw-r--r-- | src/dht/meson.build | 22 | ||||
-rw-r--r-- | src/dhtu/meson.build | 9 | ||||
-rw-r--r-- | src/dns/meson.build | 20 | ||||
-rw-r--r-- | src/fragmentation/meson.build | 4 | ||||
-rw-r--r-- | src/fs/meson.build | 1 | ||||
-rw-r--r-- | src/gnsrecord/meson.build | 8 | ||||
-rw-r--r-- | src/hello/meson.build | 8 | ||||
-rw-r--r-- | src/identity/meson.build | 12 | ||||
-rw-r--r-- | src/json/meson.build | 4 | ||||
-rw-r--r-- | src/namecache/meson.build | 21 | ||||
-rw-r--r-- | src/namestore/meson.build | 21 | ||||
-rw-r--r-- | src/nat/meson.build | 33 | ||||
-rw-r--r-- | src/nse/meson.build | 37 | ||||
-rw-r--r-- | src/revocation/meson.build | 6 |
19 files changed, 181 insertions, 68 deletions
diff --git a/src/ats/meson.build b/src/ats/meson.build index 123f394bf..2719ea219 100644 --- a/src/ats/meson.build +++ b/src/ats/meson.build | |||
@@ -46,7 +46,7 @@ shared_module('gnunet_plugin_ats_proportional', | |||
46 | libgnunetstatistics_dep], | 46 | libgnunetstatistics_dep], |
47 | include_directories: [incdir, configuration_inc], | 47 | include_directories: [incdir, configuration_inc], |
48 | install: true, | 48 | install: true, |
49 | install_dir: get_option('libdir')) | 49 | install_dir: get_option('libdir')/'gnunet') |
50 | 50 | ||
51 | executable ('gnunet-service-ats', | 51 | executable ('gnunet-service-ats', |
52 | gnunetserviceats_src, | 52 | gnunetserviceats_src, |
diff --git a/src/block/meson.build b/src/block/meson.build index 5b0542c19..3b0a211ab 100644 --- a/src/block/meson.build +++ b/src/block/meson.build | |||
@@ -34,11 +34,12 @@ shared_module('gnunet_plugin_block_test', | |||
34 | dependencies: plugin_dep, | 34 | dependencies: plugin_dep, |
35 | include_directories: [incdir, configuration_inc], | 35 | include_directories: [incdir, configuration_inc], |
36 | install: true, | 36 | install: true, |
37 | install_dir: get_option('libdir')) | 37 | install_dir: get_option('libdir')/'gnunet') |
38 | |||
38 | shared_module('gnunet_plugin_block_template', | 39 | shared_module('gnunet_plugin_block_template', |
39 | ['plugin_block_template.c'], | 40 | ['plugin_block_template.c'], |
40 | dependencies: plugin_dep, | 41 | dependencies: plugin_dep, |
41 | include_directories: [incdir, configuration_inc], | 42 | include_directories: [incdir, configuration_inc], |
42 | install: false, | 43 | install: false, |
43 | install_dir: get_option('libdir')) | 44 | install_dir: get_option('libdir')/'gnunet') |
44 | 45 | ||
diff --git a/src/conversation/meson.build b/src/conversation/meson.build index dc76affff..37da098d9 100644 --- a/src/conversation/meson.build +++ b/src/conversation/meson.build | |||
@@ -66,7 +66,7 @@ shared_module('gnunet_plugin_gnsrecord_conversation', | |||
66 | libgnunetidentity_dep], | 66 | libgnunetidentity_dep], |
67 | include_directories: [incdir, configuration_inc], | 67 | include_directories: [incdir, configuration_inc], |
68 | install: true, | 68 | install: true, |
69 | install_dir: get_option('libdir')) | 69 | install_dir: get_option('libdir')/'gnunet') |
70 | 70 | ||
71 | executable ('gnunet-conversation', | 71 | executable ('gnunet-conversation', |
72 | 'gnunet-conversation.c', | 72 | 'gnunet-conversation.c', |
diff --git a/src/datacache/meson.build b/src/datacache/meson.build index 8613e527f..4342c1ecf 100644 --- a/src/datacache/meson.build +++ b/src/datacache/meson.build | |||
@@ -19,7 +19,9 @@ libgnunetdatacache = library('gnunetdatacache', | |||
19 | libgnunetdatacache_src, | 19 | libgnunetdatacache_src, |
20 | soversion: '0.1.0', | 20 | soversion: '0.1.0', |
21 | dependencies: [libgnunetutil_dep, libgnunetstatistics_dep], | 21 | dependencies: [libgnunetutil_dep, libgnunetstatistics_dep], |
22 | include_directories: [incdir, configuration_inc]) | 22 | include_directories: [incdir, configuration_inc], |
23 | install: true, | ||
24 | install_dir: get_option('libdir')) | ||
23 | libgnunetdatacache_dep = declare_dependency(link_with : libgnunetdatacache) | 25 | libgnunetdatacache_dep = declare_dependency(link_with : libgnunetdatacache) |
24 | pkg.generate(libgnunetdatacache, url: 'https://www.gnunet.org', | 26 | pkg.generate(libgnunetdatacache, url: 'https://www.gnunet.org', |
25 | description : 'Provides datacache API for temporary storage to disk') | 27 | description : 'Provides datacache API for temporary storage to disk') |
@@ -30,7 +32,11 @@ shared_module('gnunet_plugin_datacache_sqlite', | |||
30 | libgnunetdatacache_dep, | 32 | libgnunetdatacache_dep, |
31 | sqlite_dep, | 33 | sqlite_dep, |
32 | libgnunetsq_dep], | 34 | libgnunetsq_dep], |
33 | include_directories: [incdir, configuration_inc]) | 35 | include_directories: [incdir, configuration_inc], |
36 | install: true, | ||
37 | install_dir: get_option('libdir')/'gnunet') | ||
38 | |||
39 | |||
34 | if pq_dep.found() | 40 | if pq_dep.found() |
35 | shared_module('gnunet_plugin_datacache_postgres', | 41 | shared_module('gnunet_plugin_datacache_postgres', |
36 | ['plugin_datacache_postgres.c'], | 42 | ['plugin_datacache_postgres.c'], |
@@ -38,5 +44,7 @@ if pq_dep.found() | |||
38 | libgnunetdatacache_dep, | 44 | libgnunetdatacache_dep, |
39 | pq_dep, | 45 | pq_dep, |
40 | libgnunetpq_dep], | 46 | libgnunetpq_dep], |
41 | include_directories: [incdir, configuration_inc]) | 47 | include_directories: [incdir, configuration_inc], |
48 | install: true, | ||
49 | install_dir: get_option('libdir')/'gnunet') | ||
42 | endif | 50 | endif |
diff --git a/src/datastore/meson.build b/src/datastore/meson.build index 6c83b228b..9fc161d4b 100644 --- a/src/datastore/meson.build +++ b/src/datastore/meson.build | |||
@@ -23,7 +23,9 @@ libgnunetdatastore = library('gnunetdatastore', | |||
23 | dependencies: [libgnunetutil_dep, | 23 | dependencies: [libgnunetutil_dep, |
24 | libgnunetstatistics_dep, | 24 | libgnunetstatistics_dep, |
25 | libgnunetdatacache_dep], | 25 | libgnunetdatacache_dep], |
26 | include_directories: [incdir, configuration_inc]) | 26 | include_directories: [incdir, configuration_inc], |
27 | install: true, | ||
28 | install_dir: get_option('libdir')) | ||
27 | libgnunetdatastore_dep = declare_dependency(link_with : libgnunetdatastore) | 29 | libgnunetdatastore_dep = declare_dependency(link_with : libgnunetdatastore) |
28 | pkg.generate(libgnunetdatastore, url: 'https://www.gnunet.org', | 30 | pkg.generate(libgnunetdatastore, url: 'https://www.gnunet.org', |
29 | description : 'Management API for the datastore for persistent storage to disk') | 31 | description : 'Management API for the datastore for persistent storage to disk') |
@@ -34,7 +36,9 @@ shared_module('gnunet_plugin_datastore_sqlite', | |||
34 | libgnunetdatastore_dep, | 36 | libgnunetdatastore_dep, |
35 | sqlite_dep, | 37 | sqlite_dep, |
36 | libgnunetsq_dep], | 38 | libgnunetsq_dep], |
37 | include_directories: [incdir, configuration_inc]) | 39 | include_directories: [incdir, configuration_inc], |
40 | install: true, | ||
41 | install_dir: get_option('libdir')/'gnunet') | ||
38 | 42 | ||
39 | if pq_dep.found() | 43 | if pq_dep.found() |
40 | shared_module('gnunet_plugin_datastore_postgres', | 44 | shared_module('gnunet_plugin_datastore_postgres', |
@@ -43,7 +47,9 @@ if pq_dep.found() | |||
43 | libgnunetdatastore_dep, | 47 | libgnunetdatastore_dep, |
44 | pq_dep, | 48 | pq_dep, |
45 | libgnunetpq_dep], | 49 | libgnunetpq_dep], |
46 | include_directories: [incdir, configuration_inc]) | 50 | include_directories: [incdir, configuration_inc], |
51 | install: true, | ||
52 | install_dir: get_option('libdir')/'gnunet') | ||
47 | endif | 53 | endif |
48 | 54 | ||
49 | executable ('gnunet-datastore', | 55 | executable ('gnunet-datastore', |
@@ -52,12 +58,16 @@ executable ('gnunet-datastore', | |||
52 | libgnunetutil_dep, | 58 | libgnunetutil_dep, |
53 | libgnunetstatistics_dep, | 59 | libgnunetstatistics_dep, |
54 | libgnunetdatacache_dep], | 60 | libgnunetdatacache_dep], |
55 | include_directories: [incdir, configuration_inc]) | 61 | include_directories: [incdir, configuration_inc], |
62 | install: true, | ||
63 | install_dir: get_option('bindir')) | ||
56 | executable ('gnunet-service-datastore', | 64 | executable ('gnunet-service-datastore', |
57 | gnunetservicedatastore_src, | 65 | gnunetservicedatastore_src, |
58 | dependencies: [libgnunetdatastore_dep, | 66 | dependencies: [libgnunetdatastore_dep, |
59 | libgnunetutil_dep, | 67 | libgnunetutil_dep, |
60 | libgnunetstatistics_dep, | 68 | libgnunetstatistics_dep, |
61 | libgnunetdatacache_dep], | 69 | libgnunetdatacache_dep], |
62 | include_directories: [incdir, configuration_inc]) | 70 | include_directories: [incdir, configuration_inc], |
71 | install: true, | ||
72 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
63 | 73 | ||
diff --git a/src/dht/meson.build b/src/dht/meson.build index 8b595a58f..572cc6e5d 100644 --- a/src/dht/meson.build +++ b/src/dht/meson.build | |||
@@ -21,7 +21,9 @@ libgnunetdht = library('gnunetdht', | |||
21 | libgnunetdht_src, | 21 | libgnunetdht_src, |
22 | soversion: '4.0.0', | 22 | soversion: '4.0.0', |
23 | dependencies: libgnunetutil_dep, | 23 | dependencies: libgnunetutil_dep, |
24 | include_directories: [incdir, configuration_inc]) | 24 | include_directories: [incdir, configuration_inc], |
25 | install: true, | ||
26 | install_dir: get_option('libdir')) | ||
25 | libgnunetdht_dep = declare_dependency(link_with : libgnunetdht) | 27 | libgnunetdht_dep = declare_dependency(link_with : libgnunetdht) |
26 | pkg.generate(libgnunetdht, url: 'https://www.gnunet.org', | 28 | pkg.generate(libgnunetdht, url: 'https://www.gnunet.org', |
27 | description : 'Provides API for the R5N distributed hash table') | 29 | description : 'Provides API for the R5N distributed hash table') |
@@ -34,6 +36,19 @@ shared_module('gnunet_plugin_block_dht', | |||
34 | libgnunetblockgroup_dep], | 36 | libgnunetblockgroup_dep], |
35 | include_directories: [incdir, configuration_inc]) | 37 | include_directories: [incdir, configuration_inc]) |
36 | 38 | ||
39 | executable ('gnunet-dht', | ||
40 | gnunetservicedht_src, | ||
41 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, | ||
42 | libgnunetblock_dep, | ||
43 | m_dep, | ||
44 | libgnunetdatacache_dep, | ||
45 | libgnunetstatistics_dep, | ||
46 | libgnunetblockgroup_dep, | ||
47 | libgnunethello_dep], | ||
48 | include_directories: [incdir, configuration_inc], | ||
49 | install: true, | ||
50 | install_dir: get_option('bindir')) | ||
51 | |||
37 | executable ('gnunet-service-dht', | 52 | executable ('gnunet-service-dht', |
38 | gnunetservicedht_src, | 53 | gnunetservicedht_src, |
39 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, | 54 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, |
@@ -43,4 +58,7 @@ executable ('gnunet-service-dht', | |||
43 | libgnunetstatistics_dep, | 58 | libgnunetstatistics_dep, |
44 | libgnunetblockgroup_dep, | 59 | libgnunetblockgroup_dep, |
45 | libgnunethello_dep], | 60 | libgnunethello_dep], |
46 | include_directories: [incdir, configuration_inc]) | 61 | include_directories: [incdir, configuration_inc], |
62 | install: true, | ||
63 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
64 | |||
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build index 155b6744c..bec4c2ec2 100644 --- a/src/dhtu/meson.build +++ b/src/dhtu/meson.build | |||
@@ -16,7 +16,9 @@ endif | |||
16 | shared_module('gnunet_plugin_dhtu_ip', | 16 | shared_module('gnunet_plugin_dhtu_ip', |
17 | libgnunetplugindhtuip_src, | 17 | libgnunetplugindhtuip_src, |
18 | dependencies: [libgnunetutil_dep, m_dep], | 18 | dependencies: [libgnunetutil_dep, m_dep], |
19 | include_directories: [incdir, configuration_inc]) | 19 | include_directories: [incdir, configuration_inc], |
20 | install: true, | ||
21 | install_dir: get_option('libdir')/'gnunet') | ||
20 | 22 | ||
21 | shared_module('gnunet_plugin_dhtu_gnunet', | 23 | shared_module('gnunet_plugin_dhtu_gnunet', |
22 | libgnunetplugindhtugnunet_src, | 24 | libgnunetplugindhtugnunet_src, |
@@ -28,4 +30,7 @@ shared_module('gnunet_plugin_dhtu_gnunet', | |||
28 | libgnunetpeerinfo_dep, | 30 | libgnunetpeerinfo_dep, |
29 | libgnunetnse_dep, | 31 | libgnunetnse_dep, |
30 | libgnunettransport_dep], | 32 | libgnunettransport_dep], |
31 | include_directories: [incdir, configuration_inc]) | 33 | include_directories: [incdir, configuration_inc], |
34 | install: true, | ||
35 | install_dir: get_option('libdir')/'gnunet') | ||
36 | |||
diff --git a/src/dns/meson.build b/src/dns/meson.build index 9cc98b24a..54d92109d 100644 --- a/src/dns/meson.build +++ b/src/dns/meson.build | |||
@@ -21,7 +21,9 @@ endif | |||
21 | libgnunetdns = library('gnunetdns', | 21 | libgnunetdns = library('gnunetdns', |
22 | libgnunetdns_src, | 22 | libgnunetdns_src, |
23 | dependencies: libgnunetutil_dep, | 23 | dependencies: libgnunetutil_dep, |
24 | include_directories: [incdir, configuration_inc]) | 24 | include_directories: [incdir, configuration_inc], |
25 | install: true, | ||
26 | install_dir: get_option('libdir')) | ||
25 | libgnunetdns_dep = declare_dependency(link_with : libgnunetdns) | 27 | libgnunetdns_dep = declare_dependency(link_with : libgnunetdns) |
26 | pkg.generate(libgnunetdns, url: 'https://www.gnunet.org', | 28 | pkg.generate(libgnunetdns, url: 'https://www.gnunet.org', |
27 | description : 'Provides API to access GNUnet\'s DNS service (to intercept and manipulate DNS queries)') | 29 | description : 'Provides API to access GNUnet\'s DNS service (to intercept and manipulate DNS queries)') |
@@ -29,19 +31,27 @@ pkg.generate(libgnunetdns, url: 'https://www.gnunet.org', | |||
29 | shared_module('gnunet_plugin_block_dns', | 31 | shared_module('gnunet_plugin_block_dns', |
30 | libgnunetpluginblockdns_src, | 32 | libgnunetpluginblockdns_src, |
31 | dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep], | 33 | dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep], |
32 | include_directories: [incdir, configuration_inc]) | 34 | include_directories: [incdir, configuration_inc], |
35 | install: true, | ||
36 | install_dir: get_option('libdir')/'gnunet') | ||
33 | 37 | ||
34 | executable ('gnunet-service-dns', | 38 | executable ('gnunet-service-dns', |
35 | gnunetservicedns_src, | 39 | gnunetservicedns_src, |
36 | dependencies: [libgnunetdns_dep, libgnunetutil_dep, | 40 | dependencies: [libgnunetdns_dep, libgnunetutil_dep, |
37 | libgnunetstatistics_dep], | 41 | libgnunetstatistics_dep], |
38 | include_directories: [incdir, configuration_inc]) | 42 | include_directories: [incdir, configuration_inc], |
43 | install: true, | ||
44 | install_dir: get_option('bindir')) | ||
39 | executable ('gnunet-dns-monitor', | 45 | executable ('gnunet-dns-monitor', |
40 | gnunetdnsmonitor_src, | 46 | gnunetdnsmonitor_src, |
41 | dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep], | 47 | dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep], |
42 | include_directories: [incdir, configuration_inc]) | 48 | include_directories: [incdir, configuration_inc], |
49 | install: true, | ||
50 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
43 | executable ('gnunet-dns-redirector', | 51 | executable ('gnunet-dns-redirector', |
44 | gnunetdnsredirector_src, | 52 | gnunetdnsredirector_src, |
45 | dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep], | 53 | dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep], |
46 | include_directories: [incdir, configuration_inc]) | 54 | include_directories: [incdir, configuration_inc], |
55 | install: true, | ||
56 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
47 | 57 | ||
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build index 486c560c2..fa3d08a0a 100644 --- a/src/fragmentation/meson.build +++ b/src/fragmentation/meson.build | |||
@@ -10,7 +10,9 @@ endif | |||
10 | libgnunetfragmentation = library('gnunetfragmentation', | 10 | libgnunetfragmentation = library('gnunetfragmentation', |
11 | libgnunetfragmentation_src, | 11 | libgnunetfragmentation_src, |
12 | dependencies: [m_dep, libgnunetutil_dep, libgnunetstatistics_dep], | 12 | dependencies: [m_dep, libgnunetutil_dep, libgnunetstatistics_dep], |
13 | include_directories: [incdir, configuration_inc]) | 13 | include_directories: [incdir, configuration_inc], |
14 | install: true, | ||
15 | install_dir: get_option('libdir')) | ||
14 | libgnunetfragmentation_dep = declare_dependency(link_with : libgnunetfragmentation) | 16 | libgnunetfragmentation_dep = declare_dependency(link_with : libgnunetfragmentation) |
15 | pkg.generate(libgnunetfragmentation, url: 'https://www.gnunet.org', | 17 | pkg.generate(libgnunetfragmentation, url: 'https://www.gnunet.org', |
16 | description : 'Provides API for sending and receiving messages that are larger than the MTU of the transport') | 18 | description : 'Provides API for sending and receiving messages that are larger than the MTU of the transport') |
diff --git a/src/fs/meson.build b/src/fs/meson.build index 855cccaea..5fb5a1ff4 100644 --- a/src/fs/meson.build +++ b/src/fs/meson.build | |||
@@ -42,6 +42,7 @@ endif | |||
42 | 42 | ||
43 | libgnunetfs = library('gnunetfs', | 43 | libgnunetfs = library('gnunetfs', |
44 | libgnunetfs_src, | 44 | libgnunetfs_src, |
45 | soversion: '3.1.1', | ||
45 | dependencies: [libgnunetutil_dep, | 46 | dependencies: [libgnunetutil_dep, |
46 | libgnunetdatastore_dep, | 47 | libgnunetdatastore_dep, |
47 | libgnunetstatistics_dep, | 48 | libgnunetstatistics_dep, |
diff --git a/src/gnsrecord/meson.build b/src/gnsrecord/meson.build index 28e211f16..e6ea8237f 100644 --- a/src/gnsrecord/meson.build +++ b/src/gnsrecord/meson.build | |||
@@ -18,7 +18,9 @@ libgnunetgnsrecord = library('gnunetgnsrecord', | |||
18 | sodium_dep, | 18 | sodium_dep, |
19 | libgnunetidentity_dep, | 19 | libgnunetidentity_dep, |
20 | gcrypt_dep], | 20 | gcrypt_dep], |
21 | include_directories: [incdir, configuration_inc]) | 21 | include_directories: [incdir, configuration_inc], |
22 | install: true, | ||
23 | install_dir: get_option('libdir')) | ||
22 | libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord) | 24 | libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord) |
23 | pkg.generate(libgnunetgnsrecord, url: 'https://www.gnunet.org', | 25 | pkg.generate(libgnunetgnsrecord, url: 'https://www.gnunet.org', |
24 | description : 'Provides API for manipulating GNS records') | 26 | description : 'Provides API for manipulating GNS records') |
@@ -28,6 +30,8 @@ libgnunetgnsrecordjson = library('gnunetgnsrecordjson', | |||
28 | libgnunetgnsrecordjson_src, | 30 | libgnunetgnsrecordjson_src, |
29 | soversion: '0.0.0', | 31 | soversion: '0.0.0', |
30 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep], | 32 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep], |
31 | include_directories: [incdir, configuration_inc]) | 33 | include_directories: [incdir, configuration_inc], |
34 | install: true, | ||
35 | install_dir: get_option('libdir')) | ||
32 | libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecord) | 36 | libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecord) |
33 | 37 | ||
diff --git a/src/hello/meson.build b/src/hello/meson.build index f2e4c446c..bac772f32 100644 --- a/src/hello/meson.build +++ b/src/hello/meson.build | |||
@@ -17,7 +17,9 @@ libgnunethello = library('gnunethello', | |||
17 | libgnunethello_src, | 17 | libgnunethello_src, |
18 | soversion: '1.0.1', | 18 | soversion: '1.0.1', |
19 | dependencies: libgnunetutil_dep, | 19 | dependencies: libgnunetutil_dep, |
20 | include_directories: [incdir, configuration_inc]) | 20 | include_directories: [incdir, configuration_inc], |
21 | install: true, | ||
22 | install_dir: get_option('libdir')) | ||
21 | libgnunethello_dep = declare_dependency(link_with : libgnunethello) | 23 | libgnunethello_dep = declare_dependency(link_with : libgnunethello) |
22 | pkg.generate(libgnunethello, url: 'https://www.gnunet.org', | 24 | pkg.generate(libgnunethello, url: 'https://www.gnunet.org', |
23 | description : 'Helper library for handling GNUnet HELLO messages') | 25 | description : 'Helper library for handling GNUnet HELLO messages') |
@@ -26,5 +28,7 @@ pkg.generate(libgnunethello, url: 'https://www.gnunet.org', | |||
26 | executable ('gnunet-hello', | 28 | executable ('gnunet-hello', |
27 | gnunethello_src, | 29 | gnunethello_src, |
28 | dependencies: [libgnunethello_dep, libgnunetutil_dep], | 30 | dependencies: [libgnunethello_dep, libgnunetutil_dep], |
29 | include_directories: [incdir, configuration_inc]) | 31 | include_directories: [incdir, configuration_inc], |
32 | install: true, | ||
33 | install_dir: get_option('bindir')) | ||
30 | 34 | ||
diff --git a/src/identity/meson.build b/src/identity/meson.build index e792752a7..b9d54fa91 100644 --- a/src/identity/meson.build +++ b/src/identity/meson.build | |||
@@ -20,7 +20,9 @@ endif | |||
20 | libgnunetidentity = library('gnunetidentity', | 20 | libgnunetidentity = library('gnunetidentity', |
21 | libgnunetidentity_src, | 21 | libgnunetidentity_src, |
22 | dependencies: [libgnunetutil_dep, sodium_dep], | 22 | dependencies: [libgnunetutil_dep, sodium_dep], |
23 | include_directories: [incdir, configuration_inc]) | 23 | include_directories: [incdir, configuration_inc], |
24 | install: true, | ||
25 | install_dir: get_option('libdir')) | ||
24 | libgnunetidentity_dep = declare_dependency(link_with : libgnunetidentity) | 26 | libgnunetidentity_dep = declare_dependency(link_with : libgnunetidentity) |
25 | pkg.generate(libgnunetidentity, url: 'https://www.gnunet.org', | 27 | pkg.generate(libgnunetidentity, url: 'https://www.gnunet.org', |
26 | description : 'API to access and organize private keys of the user egos') | 28 | description : 'API to access and organize private keys of the user egos') |
@@ -30,11 +32,15 @@ executable ('gnunet-identity', | |||
30 | dependencies: [libgnunetidentity_dep, | 32 | dependencies: [libgnunetidentity_dep, |
31 | libgnunetutil_dep, | 33 | libgnunetutil_dep, |
32 | libgnunetstatistics_dep], | 34 | libgnunetstatistics_dep], |
33 | include_directories: [incdir, configuration_inc]) | 35 | include_directories: [incdir, configuration_inc], |
36 | install: true, | ||
37 | install_dir: get_option('bindir')) | ||
34 | executable ('gnunet-service-identity', | 38 | executable ('gnunet-service-identity', |
35 | gnunetserviceidentity_src, | 39 | gnunetserviceidentity_src, |
36 | dependencies: [libgnunetidentity_dep, | 40 | dependencies: [libgnunetidentity_dep, |
37 | libgnunetutil_dep, | 41 | libgnunetutil_dep, |
38 | libgnunetstatistics_dep], | 42 | libgnunetstatistics_dep], |
39 | include_directories: [incdir, configuration_inc]) | 43 | include_directories: [incdir, configuration_inc], |
44 | install: true, | ||
45 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
40 | 46 | ||
diff --git a/src/json/meson.build b/src/json/meson.build index 3ebd10ec1..92356b5a5 100644 --- a/src/json/meson.build +++ b/src/json/meson.build | |||
@@ -15,7 +15,9 @@ libgnunetjson = library('gnunetjson', | |||
15 | libgnunetjson_src, | 15 | libgnunetjson_src, |
16 | soversion: '0.0.0', | 16 | soversion: '0.0.0', |
17 | dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep], | 17 | dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep], |
18 | include_directories: [incdir, configuration_inc]) | 18 | include_directories: [incdir, configuration_inc], |
19 | install: true, | ||
20 | install_dir: get_option('libdir')) | ||
19 | libgnunetjson_dep = declare_dependency(link_with : libgnunetjson) | 21 | libgnunetjson_dep = declare_dependency(link_with : libgnunetjson) |
20 | pkg.generate(libgnunetjson, url: 'https://www.gnunet.org', | 22 | pkg.generate(libgnunetjson, url: 'https://www.gnunet.org', |
21 | description : 'Library for JSON de/serialization') | 23 | description : 'Library for JSON de/serialization') |
diff --git a/src/namecache/meson.build b/src/namecache/meson.build index 719d94c0b..f00fbae41 100644 --- a/src/namecache/meson.build +++ b/src/namecache/meson.build | |||
@@ -22,7 +22,9 @@ libgnunetnamecache = library('gnunetnamecache', | |||
22 | soversion: '0.0.0', | 22 | soversion: '0.0.0', |
23 | dependencies: [libgnunetutil_dep, | 23 | dependencies: [libgnunetutil_dep, |
24 | libgnunetgnsrecord_dep], | 24 | libgnunetgnsrecord_dep], |
25 | include_directories: [incdir, configuration_inc]) | 25 | include_directories: [incdir, configuration_inc], |
26 | install: true, | ||
27 | install_dir: get_option('libdir')) | ||
26 | libgnunetnamecache_dep = declare_dependency(link_with : libgnunetnamecache) | 28 | libgnunetnamecache_dep = declare_dependency(link_with : libgnunetnamecache) |
27 | pkg.generate(libgnunetnamecache, url: 'https://www.gnunet.org', | 29 | pkg.generate(libgnunetnamecache, url: 'https://www.gnunet.org', |
28 | description : 'Provides API for storing GNS records to a cache') | 30 | description : 'Provides API for storing GNS records to a cache') |
@@ -33,7 +35,9 @@ shared_module('gnunet_plugin_namecache_sqlite', | |||
33 | libgnunetgnsrecord_dep, | 35 | libgnunetgnsrecord_dep, |
34 | sqlite_dep, | 36 | sqlite_dep, |
35 | libgnunetsq_dep], | 37 | libgnunetsq_dep], |
36 | include_directories: [incdir, configuration_inc]) | 38 | include_directories: [incdir, configuration_inc], |
39 | install: true, | ||
40 | install_dir: get_option('libdir')/'gnunet') | ||
37 | 41 | ||
38 | if pq_dep.found() | 42 | if pq_dep.found() |
39 | shared_module('gnunet_plugin_namecache_postgres', | 43 | shared_module('gnunet_plugin_namecache_postgres', |
@@ -42,7 +46,9 @@ if pq_dep.found() | |||
42 | libgnunetgnsrecord_dep, | 46 | libgnunetgnsrecord_dep, |
43 | pq_dep, | 47 | pq_dep, |
44 | libgnunetpq_dep], | 48 | libgnunetpq_dep], |
45 | include_directories: [incdir, configuration_inc]) | 49 | include_directories: [incdir, configuration_inc], |
50 | install: true, | ||
51 | install_dir: get_option('libdir')/'gnunet') | ||
46 | endif | 52 | endif |
47 | 53 | ||
48 | executable ('gnunet-namecache', | 54 | executable ('gnunet-namecache', |
@@ -51,11 +57,16 @@ executable ('gnunet-namecache', | |||
51 | libgnunetutil_dep, | 57 | libgnunetutil_dep, |
52 | libgnunetgnsrecord_dep, | 58 | libgnunetgnsrecord_dep, |
53 | libgnunetidentity_dep], | 59 | libgnunetidentity_dep], |
54 | include_directories: [incdir, configuration_inc]) | 60 | include_directories: [incdir, configuration_inc], |
61 | install: true, | ||
62 | install_dir: get_option('bindir')) | ||
55 | executable ('gnunet-service-namecache', | 63 | executable ('gnunet-service-namecache', |
56 | gnunetservicenamecache_src, | 64 | gnunetservicenamecache_src, |
57 | dependencies: [libgnunetnamecache_dep, | 65 | dependencies: [libgnunetnamecache_dep, |
58 | libgnunetutil_dep, | 66 | libgnunetutil_dep, |
59 | libgnunetgnsrecord_dep, | 67 | libgnunetgnsrecord_dep, |
60 | libgnunetstatistics_dep], | 68 | libgnunetstatistics_dep], |
61 | include_directories: [incdir, configuration_inc]) | 69 | include_directories: [incdir, configuration_inc], |
70 | install: true, | ||
71 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
72 | |||
diff --git a/src/namestore/meson.build b/src/namestore/meson.build index 5b20d93ae..f531158ee 100644 --- a/src/namestore/meson.build +++ b/src/namestore/meson.build | |||
@@ -24,7 +24,9 @@ libgnunetnamestore = library('gnunetnamestore', | |||
24 | dependencies: [libgnunetutil_dep, | 24 | dependencies: [libgnunetutil_dep, |
25 | libgnunetgnsrecord_dep, | 25 | libgnunetgnsrecord_dep, |
26 | libgnunetidentity_dep], | 26 | libgnunetidentity_dep], |
27 | include_directories: [incdir, configuration_inc]) | 27 | include_directories: [incdir, configuration_inc], |
28 | install: true, | ||
29 | install_dir: get_option('libdir')) | ||
28 | libgnunetnamestore_dep = declare_dependency(link_with : libgnunetnamestore) | 30 | libgnunetnamestore_dep = declare_dependency(link_with : libgnunetnamestore) |
29 | pkg.generate(libgnunetnamestore, url: 'https://www.gnunet.org', | 31 | pkg.generate(libgnunetnamestore, url: 'https://www.gnunet.org', |
30 | description : 'Provides API for storing GNS records to a database') | 32 | description : 'Provides API for storing GNS records to a database') |
@@ -37,7 +39,9 @@ shared_module('gnunet_plugin_namestore_sqlite', | |||
37 | libgnunetsq_dep, | 39 | libgnunetsq_dep, |
38 | libgnunetstatistics_dep, | 40 | libgnunetstatistics_dep, |
39 | sqlite_dep], | 41 | sqlite_dep], |
40 | include_directories: [incdir, configuration_inc]) | 42 | include_directories: [incdir, configuration_inc], |
43 | install: true, | ||
44 | install_dir: get_option('libdir')/'gnunet') | ||
41 | 45 | ||
42 | if pq_dep.found() | 46 | if pq_dep.found() |
43 | shared_module('gnunet_plugin_namestore_postgres', | 47 | shared_module('gnunet_plugin_namestore_postgres', |
@@ -48,7 +52,9 @@ if pq_dep.found() | |||
48 | libgnunetpq_dep, | 52 | libgnunetpq_dep, |
49 | libgnunetstatistics_dep, | 53 | libgnunetstatistics_dep, |
50 | pq_dep], | 54 | pq_dep], |
51 | include_directories: [incdir, configuration_inc]) | 55 | include_directories: [incdir, configuration_inc], |
56 | install: true, | ||
57 | install_dir: get_option('libdir')/'gnunet') | ||
52 | endif | 58 | endif |
53 | 59 | ||
54 | executable ('gnunet-namestore', | 60 | executable ('gnunet-namestore', |
@@ -57,7 +63,9 @@ executable ('gnunet-namestore', | |||
57 | libgnunetutil_dep, | 63 | libgnunetutil_dep, |
58 | libgnunetgnsrecord_dep, | 64 | libgnunetgnsrecord_dep, |
59 | libgnunetidentity_dep], | 65 | libgnunetidentity_dep], |
60 | include_directories: [incdir, configuration_inc]) | 66 | include_directories: [incdir, configuration_inc], |
67 | install: true, | ||
68 | install_dir: get_option('bindir')) | ||
61 | executable ('gnunet-service-namestore', | 69 | executable ('gnunet-service-namestore', |
62 | gnunetservicenamestore_src, | 70 | gnunetservicenamestore_src, |
63 | dependencies: [libgnunetnamestore_dep, | 71 | dependencies: [libgnunetnamestore_dep, |
@@ -66,4 +74,7 @@ executable ('gnunet-service-namestore', | |||
66 | libgnunetgnsrecord_dep, | 74 | libgnunetgnsrecord_dep, |
67 | libgnunetidentity_dep, | 75 | libgnunetidentity_dep, |
68 | libgnunetstatistics_dep], | 76 | libgnunetstatistics_dep], |
69 | include_directories: [incdir, configuration_inc]) | 77 | include_directories: [incdir, configuration_inc], |
78 | install: true, | ||
79 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
80 | |||
diff --git a/src/nat/meson.build b/src/nat/meson.build index 23c2bb18d..e660f59be 100644 --- a/src/nat/meson.build +++ b/src/nat/meson.build | |||
@@ -15,19 +15,28 @@ configure_file(input : 'nat.conf.in', | |||
15 | install_dir: pkgcfgdir) | 15 | install_dir: pkgcfgdir) |
16 | 16 | ||
17 | 17 | ||
18 | if get_option('monolith') == false | 18 | if get_option('monolith') |
19 | libgnunetnat = library('gnunetnat', | ||
20 | libgnunetnat_src, | ||
21 | dependencies: libgnunetutil_dep, | ||
22 | include_directories: [incdir, configuration_inc]) | ||
23 | libgnunetnat_dep = declare_dependency(link_with : libgnunetnat) | ||
24 | executable ('gnunet-service-nat', | ||
25 | gnunetservicenat_src, | ||
26 | dependencies: [libgnunetnat_dep, libgnunetutil_dep, | ||
27 | libgnunetstatistics_dep], | ||
28 | include_directories: [incdir, configuration_inc]) | ||
29 | else | ||
30 | foreach p : libgnunetnat_src + gnunetservicenat_src | 19 | foreach p : libgnunetnat_src + gnunetservicenat_src |
31 | gnunet_src += 'nat/' + p | 20 | gnunet_src += 'nat/' + p |
32 | endforeach | 21 | endforeach |
22 | subdir_done() | ||
33 | endif | 23 | endif |
24 | |||
25 | libgnunetnat = library('gnunetnat', | ||
26 | libgnunetnat_src, | ||
27 | dependencies: libgnunetutil_dep, | ||
28 | include_directories: [incdir, configuration_inc], | ||
29 | install: true, | ||
30 | install_dir: get_option('libdir')) | ||
31 | libgnunetnat_dep = declare_dependency(link_with : libgnunetnat) | ||
32 | pkg.generate(libgnunetnat, url: 'https://www.gnunet.org', | ||
33 | description : 'Provides API for accessing the NAT service') | ||
34 | |||
35 | executable ('gnunet-service-nat', | ||
36 | gnunetservicenat_src, | ||
37 | dependencies: [libgnunetnat_dep, libgnunetutil_dep, | ||
38 | libgnunetstatistics_dep], | ||
39 | include_directories: [incdir, configuration_inc], | ||
40 | install: true, | ||
41 | install_dir: get_option('libdir')/'gnunet'/'libexec') | ||
42 | |||
diff --git a/src/nse/meson.build b/src/nse/meson.build index 1fe8fe39e..0aeb9c96d 100644 --- a/src/nse/meson.build +++ b/src/nse/meson.build | |||
@@ -9,21 +9,30 @@ configure_file(input : 'nse.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 | libgnunetnse = library('gnunetnse', | ||
14 | libgnunetnse_src, | ||
15 | dependencies: libgnunetutil_dep, | ||
16 | include_directories: [incdir, configuration_inc]) | ||
17 | libgnunetnse_dep = declare_dependency(link_with : libgnunetnse) | ||
18 | executable ('gnunet-service-nse', | ||
19 | gnunetservicense_src, | ||
20 | dependencies: [libgnunetnse_dep, libgnunetutil_dep, | ||
21 | libgnunetcore_dep, | ||
22 | m_dep, | ||
23 | libgnunetstatistics_dep], | ||
24 | include_directories: [incdir, configuration_inc]) | ||
25 | else | ||
26 | foreach p : libgnunetnse_src + gnunetservicense_src | 13 | foreach p : libgnunetnse_src + gnunetservicense_src |
27 | gnunet_src += 'nse/' + p | 14 | gnunet_src += 'nse/' + p |
28 | endforeach | 15 | endforeach |
16 | subdir_done() | ||
29 | endif | 17 | endif |
18 | |||
19 | libgnunetnse = library('gnunetnse', | ||
20 | libgnunetnse_src, | ||
21 | dependencies: libgnunetutil_dep, | ||
22 | include_directories: [incdir, configuration_inc], | ||
23 | install: true, | ||
24 | install_dir: get_option('libdir')) | ||
25 | libgnunetnse_dep = declare_dependency(link_with : libgnunetnse) | ||
26 | pkg.generate(libgnunetnse, url: 'https://www.gnunet.org', | ||
27 | description : 'Provides API for accessing the NSE service') | ||
28 | |||
29 | executable ('gnunet-service-nse', | ||
30 | gnunetservicense_src, | ||
31 | dependencies: [libgnunetnse_dep, libgnunetutil_dep, | ||
32 | libgnunetcore_dep, | ||
33 | m_dep, | ||
34 | libgnunetstatistics_dep], | ||
35 | include_directories: [incdir, configuration_inc], | ||
36 | install: true, | ||
37 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
38 | |||
diff --git a/src/revocation/meson.build b/src/revocation/meson.build index f1023b00a..fda4bc6f4 100644 --- a/src/revocation/meson.build +++ b/src/revocation/meson.build | |||
@@ -20,7 +20,9 @@ libgnunetrevocation = library('gnunetrevocation', | |||
20 | libgnunetrevocation_src, | 20 | libgnunetrevocation_src, |
21 | soversion: '0.0.0', | 21 | soversion: '0.0.0', |
22 | dependencies: [libgnunetutil_dep, libgnunetidentity_dep], | 22 | dependencies: [libgnunetutil_dep, libgnunetidentity_dep], |
23 | include_directories: [incdir, configuration_inc]) | 23 | include_directories: [incdir, configuration_inc], |
24 | install: true, | ||
25 | install_dir: get_option('libdir')) | ||
24 | libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation) | 26 | libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation) |
25 | pkg.generate(libgnunetrevocation, url: 'https://www.gnunet.org', | 27 | pkg.generate(libgnunetrevocation, url: 'https://www.gnunet.org', |
26 | description : 'Provides API to perform key revocation in GNUnet') | 28 | description : 'Provides API to perform key revocation in GNUnet') |
@@ -32,7 +34,7 @@ shared_module('gnunet_plugin_block_revocation', | |||
32 | libgnunetblock_dep], | 34 | libgnunetblock_dep], |
33 | include_directories: [incdir, configuration_inc], | 35 | include_directories: [incdir, configuration_inc], |
34 | install: true, | 36 | install: true, |
35 | install_dir: get_option('libdir')) | 37 | install_dir: get_option('libdir')/'gnunet') |
36 | 38 | ||
37 | executable ('gnunet-revocation', | 39 | executable ('gnunet-revocation', |
38 | ['gnunet-revocation.c'], | 40 | ['gnunet-revocation.c'], |