diff options
Diffstat (limited to 'src')
88 files changed, 759 insertions, 816 deletions
diff --git a/src/cli/arm/meson.build b/src/cli/arm/meson.build new file mode 100644 index 000000000..a50e47ee9 --- /dev/null +++ b/src/cli/arm/meson.build | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | gnunetarm_src = ['gnunet-arm.c'] | ||
| 2 | |||
| 3 | executable ('gnunet-arm', | ||
| 4 | gnunetarm_src, | ||
| 5 | dependencies: [libgnunetarm_dep, libgnunetutil_dep], | ||
| 6 | include_directories: [incdir, configuration_inc], | ||
| 7 | install: true, | ||
| 8 | install_dir: get_option('bindir')) | ||
diff --git a/src/cli/cadet/meson.build b/src/cli/cadet/meson.build new file mode 100644 index 000000000..09a1965ac --- /dev/null +++ b/src/cli/cadet/meson.build | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | executable ('gnunet-cadet', | ||
| 2 | ['gnunet-cadet.c'], | ||
| 3 | dependencies: [libgnunetcadet_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | libgnunetcore_dep, | ||
| 6 | libgnunetdht_dep, | ||
| 7 | m_dep, | ||
| 8 | libgnunetstatistics_dep, | ||
| 9 | libgnunetpeerstore_dep, | ||
| 10 | libgnunettransportapplication_dep, | ||
| 11 | libgnunethello_dep], | ||
| 12 | include_directories: [incdir, configuration_inc], | ||
| 13 | install: true, | ||
| 14 | install_dir: get_option('bindir')) | ||
| 15 | |||
diff --git a/src/cli/core/meson.build b/src/cli/core/meson.build new file mode 100644 index 000000000..db246a3c4 --- /dev/null +++ b/src/cli/core/meson.build | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | executable ('gnunet-core', | ||
| 2 | ['gnunet-core.c'], | ||
| 3 | dependencies: [libgnunetcore_dep, libgnunetutil_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('bindir')) | ||
diff --git a/src/cli/datastore/meson.build b/src/cli/datastore/meson.build new file mode 100644 index 000000000..7ec8eec47 --- /dev/null +++ b/src/cli/datastore/meson.build | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | executable ('gnunet-datastore', | ||
| 2 | ['gnunet-datastore.c'], | ||
| 3 | dependencies: [libgnunetdatastore_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | libgnunetstatistics_dep, | ||
| 6 | libgnunetdatacache_dep], | ||
| 7 | include_directories: [incdir, configuration_inc], | ||
| 8 | install: true, | ||
| 9 | install_dir: get_option('bindir')) | ||
diff --git a/src/cli/dht/meson.build b/src/cli/dht/meson.build new file mode 100644 index 000000000..d8c326513 --- /dev/null +++ b/src/cli/dht/meson.build | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | executable ('gnunet-dht-put', | ||
| 2 | ['gnunet-dht-put.c'], | ||
| 3 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('bindir')) | ||
| 7 | executable ('gnunet-dht-get', | ||
| 8 | ['gnunet-dht-get.c'], | ||
| 9 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 10 | include_directories: [incdir, configuration_inc], | ||
| 11 | install: true, | ||
| 12 | install_dir: get_option('bindir')) | ||
| 13 | executable ('gnunet-dht-monitor', | ||
| 14 | ['gnunet-dht-monitor.c'], | ||
| 15 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 16 | include_directories: [incdir, configuration_inc], | ||
| 17 | install: true, | ||
| 18 | install_dir: get_option('bindir')) | ||
| 19 | executable ('gnunet-dht-hello', | ||
| 20 | ['gnunet-dht-hello.c'], | ||
| 21 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 22 | include_directories: [incdir, configuration_inc], | ||
| 23 | install: true, | ||
| 24 | install_dir: get_option('bindir')) | ||
| 25 | |||
diff --git a/src/cli/fs/meson.build b/src/cli/fs/meson.build new file mode 100644 index 000000000..1b29dd56d --- /dev/null +++ b/src/cli/fs/meson.build | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | executable ('gnunet-search', | ||
| 2 | 'gnunet-search.c', | ||
| 3 | dependencies: [libgnunetfs_dep, | ||
| 4 | libgnunetutil_dep], | ||
| 5 | include_directories: [incdir, configuration_inc], | ||
| 6 | install: true, | ||
| 7 | install_dir: get_option('bindir')) | ||
| 8 | executable ('gnunet-unindex', | ||
| 9 | 'gnunet-unindex.c', | ||
| 10 | dependencies: [libgnunetfs_dep, | ||
| 11 | libgnunetutil_dep], | ||
| 12 | include_directories: [incdir, configuration_inc], | ||
| 13 | install: true, | ||
| 14 | install_dir: get_option('bindir')) | ||
| 15 | executable ('gnunet-auto-share', | ||
| 16 | 'gnunet-auto-share.c', | ||
| 17 | dependencies: [libgnunetfs_dep, | ||
| 18 | libgnunetutil_dep], | ||
| 19 | include_directories: [incdir, configuration_inc], | ||
| 20 | install: true, | ||
| 21 | install_dir: get_option('bindir')) | ||
| 22 | executable ('gnunet-directory', | ||
| 23 | 'gnunet-directory.c', | ||
| 24 | dependencies: [libgnunetfs_dep, | ||
| 25 | libgnunetutil_dep], | ||
| 26 | include_directories: [incdir, configuration_inc], | ||
| 27 | install: true, | ||
| 28 | install_dir: get_option('bindir')) | ||
| 29 | executable ('gnunet-download', | ||
| 30 | 'gnunet-download.c', | ||
| 31 | dependencies: [libgnunetfs_dep, | ||
| 32 | libgnunetutil_dep], | ||
| 33 | include_directories: [incdir, configuration_inc], | ||
| 34 | install: true, | ||
| 35 | install_dir: get_option('bindir')) | ||
| 36 | executable ('gnunet-fs', | ||
| 37 | 'gnunet-fs.c', | ||
| 38 | dependencies: [libgnunetfs_dep, | ||
| 39 | libgnunetutil_dep], | ||
| 40 | include_directories: [incdir, configuration_inc], | ||
| 41 | install: true, | ||
| 42 | install_dir: get_option('bindir')) | ||
| 43 | executable ('gnunet-publish', | ||
| 44 | 'gnunet-publish.c', | ||
| 45 | dependencies: [libgnunetfs_dep, | ||
| 46 | libgnunetidentity_dep, | ||
| 47 | libgnunetutil_dep], | ||
| 48 | include_directories: [incdir, configuration_inc], | ||
| 49 | install: true, | ||
| 50 | install_dir: get_option('bindir')) | ||
| 51 | |||
diff --git a/src/cli/gns/meson.build b/src/cli/gns/meson.build new file mode 100644 index 000000000..57f4f3c5f --- /dev/null +++ b/src/cli/gns/meson.build | |||
| @@ -0,0 +1,65 @@ | |||
| 1 | configure_file(input : 'gnunet-gns-proxy-setup-ca.in', | ||
| 2 | output : 'gnunet-gns-proxy-setup-ca', | ||
| 3 | configuration : cdata, | ||
| 4 | install: true, | ||
| 5 | install_dir: get_option('bindir')) | ||
| 6 | |||
| 7 | install_data('gnunet-gns-proxy-ca.template', | ||
| 8 | install_dir: get_option('datadir')/'gnunet') | ||
| 9 | |||
| 10 | executable ('gnunet-gns', | ||
| 11 | 'gnunet-gns.c', | ||
| 12 | dependencies: [libgnunetgns_dep, | ||
| 13 | libgnunetgnsrecord_dep, | ||
| 14 | idn_dep, | ||
| 15 | libgnunetutil_dep], | ||
| 16 | include_directories: [incdir, configuration_inc], | ||
| 17 | install: true, | ||
| 18 | install_dir: get_option('bindir')) | ||
| 19 | |||
| 20 | testgns = [ | ||
| 21 | 'test_dns2gns', | ||
| 22 | 'test_gns_at_lookup', | ||
| 23 | 'test_gns_caa_lookup', | ||
| 24 | 'test_gns_config_lookup', | ||
| 25 | 'test_gns_delegated_lookup', | ||
| 26 | 'test_gns_dht_lookup', | ||
| 27 | 'test_gns_gns2dns_cname_lookup', | ||
| 28 | 'test_gns_gns2dns_lookup', | ||
| 29 | 'test_gns_gns2dns_zkey_lookup', | ||
| 30 | 'test_gns_ipv6_lookup', | ||
| 31 | 'test_gns_lookup', | ||
| 32 | 'test_gns_multiple_record_lookup', | ||
| 33 | 'test_gns_mx_lookup', | ||
| 34 | 'test_gns_quickupdate', | ||
| 35 | 'test_gns_redirect_lookup', | ||
| 36 | 'test_gns_rel_expiration', | ||
| 37 | 'test_gns_revocation', | ||
| 38 | 'test_gns_soa_lookup', | ||
| 39 | 'test_gns_txt_lookup', | ||
| 40 | 'test_gns_zkey_lookup', | ||
| 41 | ] | ||
| 42 | |||
| 43 | testconfigs = [ | ||
| 44 | 'test_dns2gns.conf', | ||
| 45 | 'test_gns_defaults.conf', | ||
| 46 | 'test_gns_lookup.conf', | ||
| 47 | 'test_gns_lookup_peer1.conf', | ||
| 48 | 'test_gns_lookup_peer2.conf', | ||
| 49 | 'test_gns_proxy.conf', | ||
| 50 | 'test_gns_simple_lookup.conf' | ||
| 51 | ] | ||
| 52 | |||
| 53 | foreach f : testconfigs | ||
| 54 | configure_file(input: f, output: f, copy: true) | ||
| 55 | endforeach | ||
| 56 | |||
| 57 | foreach t : testgns | ||
| 58 | |||
| 59 | test_filename = t + '.sh' | ||
| 60 | test_file = configure_file(input : test_filename, | ||
| 61 | output : test_filename, | ||
| 62 | copy: true) | ||
| 63 | |||
| 64 | test(t, test_file, suite: 'gns', workdir: meson.current_build_dir(), is_parallel: false) | ||
| 65 | endforeach | ||
diff --git a/src/service/gns/test_dns2gns.conf b/src/cli/gns/test_dns2gns.conf index f484d4114..f484d4114 100644 --- a/src/service/gns/test_dns2gns.conf +++ b/src/cli/gns/test_dns2gns.conf | |||
diff --git a/src/service/gns/test_gns_defaults.conf b/src/cli/gns/test_gns_defaults.conf index 80a2f3c44..80a2f3c44 100644 --- a/src/service/gns/test_gns_defaults.conf +++ b/src/cli/gns/test_gns_defaults.conf | |||
diff --git a/src/service/gns/test_gns_lookup.conf b/src/cli/gns/test_gns_lookup.conf index 322af0784..322af0784 100644 --- a/src/service/gns/test_gns_lookup.conf +++ b/src/cli/gns/test_gns_lookup.conf | |||
diff --git a/src/service/gns/test_gns_lookup_peer1.conf b/src/cli/gns/test_gns_lookup_peer1.conf index 69e2f0973..69e2f0973 100644 --- a/src/service/gns/test_gns_lookup_peer1.conf +++ b/src/cli/gns/test_gns_lookup_peer1.conf | |||
diff --git a/src/service/gns/test_gns_lookup_peer2.conf b/src/cli/gns/test_gns_lookup_peer2.conf index 3de81d7f3..3de81d7f3 100644 --- a/src/service/gns/test_gns_lookup_peer2.conf +++ b/src/cli/gns/test_gns_lookup_peer2.conf | |||
diff --git a/src/service/gns/test_gns_proxy.conf b/src/cli/gns/test_gns_proxy.conf index 3dfeacafe..3dfeacafe 100644 --- a/src/service/gns/test_gns_proxy.conf +++ b/src/cli/gns/test_gns_proxy.conf | |||
diff --git a/src/service/gns/test_gns_simple_lookup.conf b/src/cli/gns/test_gns_simple_lookup.conf index 374731377..374731377 100644 --- a/src/service/gns/test_gns_simple_lookup.conf +++ b/src/cli/gns/test_gns_simple_lookup.conf | |||
diff --git a/src/cli/identity/meson.build b/src/cli/identity/meson.build new file mode 100644 index 000000000..958a4ccd5 --- /dev/null +++ b/src/cli/identity/meson.build | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | executable ('gnunet-identity', | ||
| 2 | ['gnunet-identity.c'], | ||
| 3 | dependencies: [libgnunetidentity_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | libgnunetstatistics_dep], | ||
| 6 | include_directories: [incdir, configuration_inc], | ||
| 7 | install: true, | ||
| 8 | install_dir: get_option('bindir')) | ||
| 9 | |||
diff --git a/src/cli/meson.build b/src/cli/meson.build new file mode 100644 index 000000000..cfaceab74 --- /dev/null +++ b/src/cli/meson.build | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | subdir('util') | ||
| 2 | if get_option('monolith') == false | ||
| 3 | subdir('arm') | ||
| 4 | endif | ||
| 5 | subdir('statistics') | ||
| 6 | subdir('datastore') | ||
| 7 | subdir('nat') | ||
| 8 | subdir('nat-auto') | ||
| 9 | subdir('core') | ||
| 10 | subdir('nse') | ||
| 11 | subdir('dht') | ||
| 12 | subdir('identity') | ||
| 13 | subdir('namecache') | ||
| 14 | subdir('namestore') | ||
| 15 | subdir('cadet') | ||
| 16 | subdir('revocation') | ||
| 17 | subdir('vpn') | ||
| 18 | subdir('gns') | ||
| 19 | subdir('fs') | ||
| 20 | subdir('reclaim') | ||
| 21 | subdir('messenger') | ||
diff --git a/src/cli/messenger/meson.build b/src/cli/messenger/meson.build new file mode 100644 index 000000000..69bc6af75 --- /dev/null +++ b/src/cli/messenger/meson.build | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | executable ('gnunet-messenger', | ||
| 2 | 'gnunet-messenger.c', | ||
| 3 | dependencies: [libgnunetmessenger_dep, | ||
| 4 | libgnunetutil_dep], | ||
| 5 | include_directories: [incdir, configuration_inc], | ||
| 6 | install: true, | ||
| 7 | install_dir: get_option('bindir')) | ||
| 8 | |||
diff --git a/src/cli/namecache/meson.build b/src/cli/namecache/meson.build new file mode 100644 index 000000000..99ed68bca --- /dev/null +++ b/src/cli/namecache/meson.build | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | executable ('gnunet-namecache', | ||
| 2 | gnunetnamecache_src, | ||
| 3 | dependencies: [libgnunetnamecache_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | libgnunetgnsrecord_dep, | ||
| 6 | libgnunetidentity_dep], | ||
| 7 | include_directories: [incdir, configuration_inc], | ||
| 8 | install: true, | ||
| 9 | install_dir: get_option('bindir')) | ||
| 10 | |||
diff --git a/src/cli/namestore/meson.build b/src/cli/namestore/meson.build new file mode 100644 index 000000000..2bad795b9 --- /dev/null +++ b/src/cli/namestore/meson.build | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | executable ('gnunet-namestore', | ||
| 2 | gnunetnamestore_src, | ||
| 3 | dependencies: [libgnunetnamestore_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | libgnunetgnsrecord_dep, | ||
| 6 | libgnunetidentity_dep], | ||
| 7 | include_directories: [incdir, configuration_inc], | ||
| 8 | install: true, | ||
| 9 | install_dir: get_option('bindir')) | ||
| 10 | executable ('gnunet-namestore-dbtool', | ||
| 11 | ['gnunet-namestore-dbtool.c'], | ||
| 12 | dependencies: [libgnunetnamestore_dep, | ||
| 13 | libgnunetutil_dep, | ||
| 14 | libgnunetgnsrecord_dep, | ||
| 15 | libgnunetidentity_dep], | ||
| 16 | include_directories: [incdir, configuration_inc], | ||
| 17 | install: true, | ||
| 18 | install_dir: get_option('bindir')) | ||
| 19 | executable ('gnunet-namestore-zonefile', | ||
| 20 | ['gnunet-namestore-zonefile.c'], | ||
| 21 | dependencies: [libgnunetnamestore_dep, | ||
| 22 | libgnunetutil_dep, | ||
| 23 | libgnunetgnsrecord_dep, | ||
| 24 | libgnunetidentity_dep], | ||
| 25 | include_directories: [incdir, configuration_inc], | ||
| 26 | install: true, | ||
| 27 | install_dir: get_option('bindir')) | ||
| 28 | executable ('gnunet-zoneimport', | ||
| 29 | ['gnunet-zoneimport.c'], | ||
| 30 | dependencies: [libgnunetnamestore_dep, | ||
| 31 | libgnunetutil_dep, | ||
| 32 | libgnunetstatistics_dep, | ||
| 33 | libgnunetgnsrecord_dep, | ||
| 34 | libgnunetidentity_dep], | ||
| 35 | include_directories: [incdir, configuration_inc], | ||
| 36 | install: true, | ||
| 37 | install_dir: get_option('bindir')) | ||
| 38 | |||
diff --git a/src/cli/nat-auto/meson.build b/src/cli/nat-auto/meson.build new file mode 100644 index 000000000..69e719126 --- /dev/null +++ b/src/cli/nat-auto/meson.build | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | executable ('gnunet-nat-auto', | ||
| 2 | ['gnunet-nat-auto.c'], | ||
| 3 | dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, | ||
| 4 | libgnunetnat_dep], | ||
| 5 | include_directories: [incdir, configuration_inc], | ||
| 6 | install: true, | ||
| 7 | install_dir: get_option('bindir')) | ||
| 8 | executable ('gnunet-nat-server', | ||
| 9 | ['gnunet-nat-server.c'], | ||
| 10 | dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, libgnunetnat_dep], | ||
| 11 | include_directories: [incdir, configuration_inc], | ||
| 12 | install: true, | ||
| 13 | install_dir: get_option('bindir')) | ||
| 14 | |||
diff --git a/src/cli/nat/meson.build b/src/cli/nat/meson.build new file mode 100644 index 000000000..41af0c087 --- /dev/null +++ b/src/cli/nat/meson.build | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | executable ('gnunet-nat', | ||
| 2 | ['gnunet-nat.c'], | ||
| 3 | dependencies: [libgnunetnat_dep, libgnunetutil_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('bindir')) | ||
| 7 | |||
diff --git a/src/cli/nse/meson.build b/src/cli/nse/meson.build new file mode 100644 index 000000000..584c7eb71 --- /dev/null +++ b/src/cli/nse/meson.build | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | executable ('gnunet-nse', | ||
| 2 | ['gnunet-nse.c'], | ||
| 3 | dependencies: [libgnunetnse_dep, m_dep, libgnunetutil_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('bindir')) | ||
| 7 | |||
diff --git a/src/cli/reclaim/meson.build b/src/cli/reclaim/meson.build new file mode 100644 index 000000000..53ce13edb --- /dev/null +++ b/src/cli/reclaim/meson.build | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | executable ('gnunet-reclaim', | ||
| 2 | 'gnunet-reclaim.c', | ||
| 3 | dependencies: [libgnunetreclaim_dep, | ||
| 4 | libgnunetidentity_dep, | ||
| 5 | libgnunetutil_dep], | ||
| 6 | include_directories: [incdir, configuration_inc], | ||
| 7 | install: true, | ||
| 8 | install_dir: get_option('bindir')) | ||
| 9 | executable ('gnunet-did', | ||
| 10 | 'gnunet-did.c', | ||
| 11 | dependencies: [libgnunetreclaim_dep, | ||
| 12 | libgnunetdid_dep, | ||
| 13 | libgnunetgns_dep, | ||
| 14 | libgnunetnamestore_dep, | ||
| 15 | libgnunetidentity_dep, | ||
| 16 | libgnunetutil_dep], | ||
| 17 | include_directories: [incdir, | ||
| 18 | configuration_inc, | ||
| 19 | include_directories ('../../service/reclaim')], | ||
| 20 | install: true, | ||
| 21 | install_dir: get_option('bindir')) | ||
| 22 | |||
diff --git a/src/cli/revocation/meson.build b/src/cli/revocation/meson.build new file mode 100644 index 000000000..83923c278 --- /dev/null +++ b/src/cli/revocation/meson.build | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | executable ('gnunet-revocation', | ||
| 2 | ['gnunet-revocation.c'], | ||
| 3 | dependencies: [libgnunetrevocation_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | libgnunetstatistics_dep, | ||
| 6 | libgnunetcore_dep, | ||
| 7 | libgnunetsetu_dep, | ||
| 8 | libgnunetidentity_dep], | ||
| 9 | include_directories: [incdir, configuration_inc], | ||
| 10 | install: true, | ||
| 11 | install_dir: get_option('bindir')) | ||
| 12 | |||
diff --git a/src/cli/statistics/meson.build b/src/cli/statistics/meson.build new file mode 100644 index 000000000..ea0af10c7 --- /dev/null +++ b/src/cli/statistics/meson.build | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | executable ('gnunet-statistics', | ||
| 2 | ['gnunet-statistics.c'], | ||
| 3 | dependencies: [libgnunetstatistics_dep, libgnunetutil_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('bindir')) | ||
| 7 | |||
| 8 | |||
diff --git a/src/cli/util/meson.build b/src/cli/util/meson.build new file mode 100644 index 000000000..ed9c3105c --- /dev/null +++ b/src/cli/util/meson.build | |||
| @@ -0,0 +1,62 @@ | |||
| 1 | executable ('gnunet-base32', | ||
| 2 | ['gnunet-base32.c'], | ||
| 3 | dependencies: [libgnunetutil_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('bindir')) | ||
| 7 | executable ('gnunet-config', | ||
| 8 | ['gnunet-config.c'], | ||
| 9 | dependencies: [libgnunetutil_dep], | ||
| 10 | include_directories: [incdir, configuration_inc], | ||
| 11 | install: true, | ||
| 12 | install_dir: get_option('bindir')) | ||
| 13 | executable ('gnunet-resolver', | ||
| 14 | ['gnunet-resolver.c'], | ||
| 15 | dependencies: [libgnunetutil_dep], | ||
| 16 | include_directories: [incdir, configuration_inc], | ||
| 17 | install: true, | ||
| 18 | install_dir: get_option('bindir')) | ||
| 19 | executable ('gnunet-ecc', | ||
| 20 | ['gnunet-ecc.c'], | ||
| 21 | dependencies: [libgnunetutil_dep, gcrypt_dep, m_dep], | ||
| 22 | include_directories: [incdir, configuration_inc], | ||
| 23 | install: true, | ||
| 24 | install_dir: get_option('bindir')) | ||
| 25 | executable ('gnunet-scrypt', | ||
| 26 | ['gnunet-scrypt.c'], | ||
| 27 | dependencies: [libgnunetutil_dep], | ||
| 28 | include_directories: [incdir, configuration_inc], | ||
| 29 | install: true, | ||
| 30 | install_dir: get_option('bindir')) | ||
| 31 | executable ('gnunet-uri', | ||
| 32 | ['gnunet-uri.c'], | ||
| 33 | dependencies: [libgnunetutil_dep], | ||
| 34 | include_directories: [incdir, configuration_inc], | ||
| 35 | install: true, | ||
| 36 | install_dir: get_option('bindir')) | ||
| 37 | if zbar_dep.found() | ||
| 38 | executable ('gnunet-qr', | ||
| 39 | ['gnunet-qr.c'], | ||
| 40 | dependencies: [zbar_dep, libgnunetutil_dep], | ||
| 41 | include_directories: [incdir, configuration_inc], | ||
| 42 | install: true, | ||
| 43 | install_dir: get_option('bindir')) | ||
| 44 | endif | ||
| 45 | executable ('gnunet-config-diff', | ||
| 46 | ['gnunet-config-diff.c'], | ||
| 47 | dependencies: [libgnunetutil_dep], | ||
| 48 | include_directories: [incdir, configuration_inc], | ||
| 49 | install: false) | ||
| 50 | |||
| 51 | executable ('gnunet-timeout', | ||
| 52 | ['gnunet-timeout.c'], | ||
| 53 | dependencies: [libgnunetutil_dep], | ||
| 54 | include_directories: [incdir, configuration_inc], | ||
| 55 | install: true, | ||
| 56 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
| 57 | executable ('gnunet-crypto-tvg', | ||
| 58 | ['gnunet-crypto-tvg.c'], | ||
| 59 | dependencies: [libgnunetutil_dep, json_dep], | ||
| 60 | include_directories: [incdir, configuration_inc], | ||
| 61 | install: false) | ||
| 62 | |||
diff --git a/src/cli/vpn/meson.build b/src/cli/vpn/meson.build new file mode 100644 index 000000000..477551f1d --- /dev/null +++ b/src/cli/vpn/meson.build | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | executable ('gnunet-vpn', | ||
| 2 | ['gnunet-vpn.c'], | ||
| 3 | dependencies: [libgnunetvpn_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | libgnunetstatistics_dep, | ||
| 6 | libgnunetregex_dep, | ||
| 7 | libgnunetcore_dep, | ||
| 8 | libgnunetcadet_dep, | ||
| 9 | libgnunetblock_dep], | ||
| 10 | include_directories: [incdir, configuration_inc, exitdir], | ||
| 11 | install: true, | ||
| 12 | install_dir: get_option('bindir')) | ||
| 13 | |||
diff --git a/src/contrib/cli/meson.build b/src/contrib/cli/meson.build new file mode 100644 index 000000000..26b120864 --- /dev/null +++ b/src/contrib/cli/meson.build | |||
| @@ -0,0 +1 @@ | |||
| subdir('template') | |||
diff --git a/src/contrib/cli/template/meson.build b/src/contrib/cli/template/meson.build new file mode 100644 index 000000000..f5adc97b3 --- /dev/null +++ b/src/contrib/cli/template/meson.build | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | executable ('gnunet-template', | ||
| 2 | ['gnunet-template.c'], | ||
| 3 | dependencies: [libgnunetutil_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('bindir')) | ||
diff --git a/src/contrib/meson.build b/src/contrib/meson.build new file mode 100644 index 000000000..e856ea7ef --- /dev/null +++ b/src/contrib/meson.build | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | #subdir('lib') | ||
| 2 | subdir('service') | ||
| 3 | #subdir('plugin') | ||
| 4 | #subdir('rest-plugin') | ||
| 5 | subdir('cli') | ||
diff --git a/src/contrib/service/meson.build b/src/contrib/service/meson.build new file mode 100644 index 000000000..eae7b7c8e --- /dev/null +++ b/src/contrib/service/meson.build | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | subdir('template') | ||
| 2 | subdir('set') | ||
| 3 | subdir('consensus') | ||
| 4 | #subdir('auction') | ||
| 5 | #subdir('abd') | ||
| 6 | #subdir('rps') | ||
| 7 | subdir('scalarproduct') | ||
| 8 | if conversation_backend != 'none' | ||
| 9 | subdir('conversation') | ||
| 10 | endif | ||
| 11 | subdir('secretsharing') | ||
diff --git a/src/contrib/service/template/meson.build b/src/contrib/service/template/meson.build index cffaa9f14..b17b86709 100644 --- a/src/contrib/service/template/meson.build +++ b/src/contrib/service/template/meson.build | |||
| @@ -6,16 +6,6 @@ configure_file(input : 'template.conf', | |||
| 6 | install: true, | 6 | install: true, |
| 7 | install_dir: pkgcfgdir) | 7 | install_dir: pkgcfgdir) |
| 8 | 8 | ||
| 9 | if get_option('monolith') | ||
| 10 | subdir_done() | ||
| 11 | endif | ||
| 12 | |||
| 13 | executable ('gnunet-template', | ||
| 14 | ['gnunet-template.c'], | ||
| 15 | dependencies: [libgnunetutil_dep], | ||
| 16 | include_directories: [incdir, configuration_inc], | ||
| 17 | install: true, | ||
| 18 | install_dir: get_option('bindir')) | ||
| 19 | executable ('gnunet-service-template', | 9 | executable ('gnunet-service-template', |
| 20 | gnunetservicetemplate_src, | 10 | gnunetservicetemplate_src, |
| 21 | dependencies: [libgnunetutil_dep], | 11 | dependencies: [libgnunetutil_dep], |
diff --git a/src/lib/block/meson.build b/src/lib/block/meson.build index b9bde48f6..999391c27 100644 --- a/src/lib/block/meson.build +++ b/src/lib/block/meson.build | |||
| @@ -1,13 +1,6 @@ | |||
| 1 | libgnunetblock_src = ['block.c'] | 1 | libgnunetblock_src = ['block.c'] |
| 2 | libgnunetblockgroup_src = ['bg_bf.c'] | 2 | libgnunetblockgroup_src = ['bg_bf.c'] |
| 3 | 3 | ||
| 4 | if get_option('monolith') | ||
| 5 | foreach p : libgnunetblock_src + libgnunetblockgroup_src | ||
| 6 | gnunet_src += 'block/' + p | ||
| 7 | endforeach | ||
| 8 | subdir_done() | ||
| 9 | endif | ||
| 10 | |||
| 11 | libgnunetblock = library('gnunetblock', | 4 | libgnunetblock = library('gnunetblock', |
| 12 | libgnunetblock_src, | 5 | libgnunetblock_src, |
| 13 | dependencies: libgnunetutil_dep, | 6 | dependencies: libgnunetutil_dep, |
| @@ -29,19 +22,3 @@ libgnunetblockgroup = library('gnunetblockgroup', | |||
| 29 | soversion: '0', | 22 | soversion: '0', |
| 30 | install_dir: get_option('libdir')) | 23 | install_dir: get_option('libdir')) |
| 31 | libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup) | 24 | libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup) |
| 32 | |||
| 33 | plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep] | ||
| 34 | shared_module('gnunet_plugin_block_test', | ||
| 35 | ['plugin_block_test.c'], | ||
| 36 | dependencies: plugin_dep, | ||
| 37 | include_directories: [incdir, configuration_inc], | ||
| 38 | install: true, | ||
| 39 | install_dir: get_option('libdir')/'gnunet') | ||
| 40 | |||
| 41 | shared_module('gnunet_plugin_block_template', | ||
| 42 | ['plugin_block_template.c'], | ||
| 43 | dependencies: plugin_dep, | ||
| 44 | include_directories: [incdir, configuration_inc], | ||
| 45 | install: false, | ||
| 46 | install_dir: get_option('libdir')/'gnunet') | ||
| 47 | |||
diff --git a/src/lib/curl/meson.build b/src/lib/curl/meson.build index 00f35aa20..77594d6c1 100644 --- a/src/lib/curl/meson.build +++ b/src/lib/curl/meson.build | |||
| @@ -1,13 +1,6 @@ | |||
| 1 | libgnunetcurl_src = ['curl.c', | 1 | libgnunetcurl_src = ['curl.c', |
| 2 | 'curl_reschedule.c'] | 2 | 'curl_reschedule.c'] |
| 3 | 3 | ||
| 4 | if get_option('monolith') | ||
| 5 | foreach p : libgnunetcurl_src | ||
| 6 | gnunet_src += 'curl/' + p | ||
| 7 | endforeach | ||
| 8 | subdir_done() | ||
| 9 | endif | ||
| 10 | |||
| 11 | libgnunetcurl = library('gnunetcurl', | 4 | libgnunetcurl = library('gnunetcurl', |
| 12 | libgnunetcurl_src, | 5 | libgnunetcurl_src, |
| 13 | soversion: '0', | 6 | soversion: '0', |
diff --git a/src/lib/gnsrecord/meson.build b/src/lib/gnsrecord/meson.build index 11b355796..3e35e0caf 100644 --- a/src/lib/gnsrecord/meson.build +++ b/src/lib/gnsrecord/meson.build | |||
| @@ -4,20 +4,12 @@ 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') | ||
| 8 | foreach p : libgnunetgnsrecord_src + libgnunetgnsrecordjson_src | ||
| 9 | gnunet_src += 'gnsrecord/' + p | ||
| 10 | endforeach | ||
| 11 | subdir_done() | ||
| 12 | endif | ||
| 13 | |||
| 14 | libgnunetgnsrecord = library('gnunetgnsrecord', | 7 | libgnunetgnsrecord = library('gnunetgnsrecord', |
| 15 | libgnunetgnsrecord_src, | 8 | libgnunetgnsrecord_src, |
| 16 | soversion: '0', | 9 | soversion: '0', |
| 17 | version: '0.0.0', | 10 | version: '0.0.0', |
| 18 | dependencies: [libgnunetutil_dep, | 11 | dependencies: [libgnunetutil_dep, |
| 19 | sodium_dep, | 12 | sodium_dep, |
| 20 | libgnunetidentity_dep, | ||
| 21 | gcrypt_dep], | 13 | gcrypt_dep], |
| 22 | include_directories: [incdir, configuration_inc], | 14 | include_directories: [incdir, configuration_inc], |
| 23 | install: true, | 15 | install: true, |
| @@ -36,10 +28,3 @@ libgnunetgnsrecordjson = library('gnunetgnsrecordjson', | |||
| 36 | install: true, | 28 | install: true, |
| 37 | install_dir: get_option('libdir')) | 29 | install_dir: get_option('libdir')) |
| 38 | libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecordjson) | 30 | libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecordjson) |
| 39 | |||
| 40 | shared_module('gnunet_plugin_gnsrecord_dns', | ||
| 41 | ['plugin_gnsrecord_dns.c'], | ||
| 42 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep], | ||
| 43 | include_directories: [incdir, configuration_inc], | ||
| 44 | install: true, | ||
| 45 | install_dir: get_option('libdir')/'gnunet') | ||
diff --git a/src/lib/hello/meson.build b/src/lib/hello/meson.build index c0df8b76c..1986316ac 100644 --- a/src/lib/hello/meson.build +++ b/src/lib/hello/meson.build | |||
| @@ -3,13 +3,6 @@ libgnunethello_src = [#'hello.c', | |||
| 3 | 'hello-ng.c', | 3 | 'hello-ng.c', |
| 4 | 'hello-uri.c'] | 4 | 'hello-uri.c'] |
| 5 | 5 | ||
| 6 | if get_option('monolith') | ||
| 7 | foreach p : libgnunethello_src | ||
| 8 | gnunet_src += 'hello/' + p | ||
| 9 | endforeach | ||
| 10 | subdir_done() | ||
| 11 | endif | ||
| 12 | |||
| 13 | libgnunethello = library('gnunethello', | 6 | libgnunethello = library('gnunethello', |
| 14 | libgnunethello_src, | 7 | libgnunethello_src, |
| 15 | soversion: '0', | 8 | soversion: '0', |
diff --git a/src/lib/json/meson.build b/src/lib/json/meson.build index 98385163e..804b2516f 100644 --- a/src/lib/json/meson.build +++ b/src/lib/json/meson.build | |||
| @@ -4,13 +4,6 @@ libgnunetjson_src = ['json.c', | |||
| 4 | 'json_mhd.c', | 4 | 'json_mhd.c', |
| 5 | 'json_pack.c'] | 5 | 'json_pack.c'] |
| 6 | 6 | ||
| 7 | if get_option('monolith') | ||
| 8 | foreach p : libgnunetjson_src | ||
| 9 | gnunet_src += 'json/' + p | ||
| 10 | endforeach | ||
| 11 | subdir_done() | ||
| 12 | endif | ||
| 13 | |||
| 14 | libgnunetjson = library('gnunetjson', | 7 | libgnunetjson = library('gnunetjson', |
| 15 | libgnunetjson_src, | 8 | libgnunetjson_src, |
| 16 | soversion: '0', | 9 | soversion: '0', |
diff --git a/src/lib/meson.build b/src/lib/meson.build new file mode 100644 index 000000000..41c662a4f --- /dev/null +++ b/src/lib/meson.build | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | subdir('util') | ||
| 2 | subdir('hello') | ||
| 3 | subdir('block') | ||
| 4 | subdir('json', if_found : json_dep) | ||
| 5 | subdir('curl', if_found : [curl_dep]) | ||
| 6 | subdir('sq', if_found : [sqlite_dep]) | ||
| 7 | subdir('pq', if_found : [pq_dep]) | ||
| 8 | subdir('gnsrecord') | ||
diff --git a/src/lib/pq/meson.build b/src/lib/pq/meson.build index b9b20d93c..5b4372b70 100644 --- a/src/lib/pq/meson.build +++ b/src/lib/pq/meson.build | |||
| @@ -7,13 +7,6 @@ libgnunetpq_src = ['pq.c', | |||
| 7 | 'pq_query_helper.c', | 7 | 'pq_query_helper.c', |
| 8 | 'pq_result_helper.c'] | 8 | 'pq_result_helper.c'] |
| 9 | 9 | ||
| 10 | if get_option('monolith') | ||
| 11 | foreach p : libgnunetpq_src | ||
| 12 | gnunet_src += 'pq/' + p | ||
| 13 | endforeach | ||
| 14 | subdir_done() | ||
| 15 | endif | ||
| 16 | |||
| 17 | libgnunetpq = library('gnunetpq', | 10 | libgnunetpq = library('gnunetpq', |
| 18 | libgnunetpq_src, | 11 | libgnunetpq_src, |
| 19 | soversion: '4', | 12 | soversion: '4', |
diff --git a/src/lib/sq/meson.build b/src/lib/sq/meson.build index 482d1c40a..dffda7872 100644 --- a/src/lib/sq/meson.build +++ b/src/lib/sq/meson.build | |||
| @@ -4,13 +4,6 @@ libgnunetsq_src = ['sq.c', | |||
| 4 | 'sq_query_helper.c', | 4 | 'sq_query_helper.c', |
| 5 | 'sq_result_helper.c'] | 5 | 'sq_result_helper.c'] |
| 6 | 6 | ||
| 7 | if get_option('monolith') | ||
| 8 | foreach p : libgnunetsq_src | ||
| 9 | gnunet_src += 'sq/' + p | ||
| 10 | endforeach | ||
| 11 | subdir_done() | ||
| 12 | endif | ||
| 13 | |||
| 14 | libgnunetsq = library('gnunetsq', | 7 | libgnunetsq = library('gnunetsq', |
| 15 | libgnunetsq_src, | 8 | libgnunetsq_src, |
| 16 | soversion: '0', | 9 | soversion: '0', |
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index 5d92dfdd6..d1b6f8287 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am | |||
| @@ -10,8 +10,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/ | |||
| 10 | dist_pkgcfg_DATA = \ | 10 | dist_pkgcfg_DATA = \ |
| 11 | util.conf | 11 | util.conf |
| 12 | 12 | ||
| 13 | pkgcfg_DATA = \ | ||
| 14 | resolver.conf | ||
| 15 | 13 | ||
| 16 | TEST_CLIENT_UNIX_NC = test_client_unix.nc | 14 | TEST_CLIENT_UNIX_NC = test_client_unix.nc |
| 17 | 15 | ||
diff --git a/src/lib/util/meson.build b/src/lib/util/meson.build index 48a70cf0c..70ff201bc 100644 --- a/src/lib/util/meson.build +++ b/src/lib/util/meson.build | |||
| @@ -32,6 +32,7 @@ libgnunetutil_src = ['bandwidth.c', | |||
| 32 | 'crypto_kdf.c', | 32 | 'crypto_kdf.c', |
| 33 | 'crypto_mpi.c', | 33 | 'crypto_mpi.c', |
| 34 | 'crypto_paillier.c', | 34 | 'crypto_paillier.c', |
| 35 | 'crypto_pkey.c', | ||
| 35 | 'crypto_pow.c', | 36 | 'crypto_pow.c', |
| 36 | 'crypto_random.c', | 37 | 'crypto_random.c', |
| 37 | 'crypto_rsa.c', | 38 | 'crypto_rsa.c', |
| @@ -70,26 +71,11 @@ libgnunetutil_src = ['bandwidth.c', | |||
| 70 | 'proc_compat.c', | 71 | 'proc_compat.c', |
| 71 | 'gnunet_error_codes.c'] | 72 | 'gnunet_error_codes.c'] |
| 72 | 73 | ||
| 73 | gnunetserviceresolver_src = ['gnunet-service-resolver.c'] | ||
| 74 | |||
| 75 | configure_file(input : 'util.conf', | 74 | configure_file(input : 'util.conf', |
| 76 | output : 'util.conf', | 75 | output : 'util.conf', |
| 77 | configuration : cdata, | 76 | configuration : cdata, |
| 78 | install: true, | 77 | install: true, |
| 79 | install_dir: pkgcfgdir) | 78 | install_dir: pkgcfgdir) |
| 80 | configure_file(input : 'resolver.conf.in', | ||
| 81 | output : 'resolver.conf', | ||
| 82 | configuration : cdata, | ||
| 83 | install: true, | ||
| 84 | install_dir: pkgcfgdir) | ||
| 85 | |||
| 86 | |||
| 87 | if get_option('monolith') | ||
| 88 | foreach p : libgnunetutil_src + gnunetserviceresolver_src | ||
| 89 | gnunet_src += 'util/' + p | ||
| 90 | endforeach | ||
| 91 | subdir_done() | ||
| 92 | endif | ||
| 93 | 79 | ||
| 94 | libgnunetutil = library('gnunetutil', | 80 | libgnunetutil = library('gnunetutil', |
| 95 | libgnunetutil_src, | 81 | libgnunetutil_src, |
| @@ -103,87 +89,11 @@ libgnunetutil_dep = declare_dependency(link_with : libgnunetutil) | |||
| 103 | pkg.generate(libgnunetutil, url: 'https://www.gnunet.org', | 89 | pkg.generate(libgnunetutil, url: 'https://www.gnunet.org', |
| 104 | description : 'Provides miscellaneous utility functions and API for GNUnet') | 90 | description : 'Provides miscellaneous utility functions and API for GNUnet') |
| 105 | 91 | ||
| 106 | shared_module('gnunet_plugin_utiltest', | ||
| 107 | ['test_plugin_plug.c'], | ||
| 108 | dependencies: [libgnunetutil_dep], | ||
| 109 | include_directories: [incdir, configuration_inc], | ||
| 110 | install: true, | ||
| 111 | install_dir: get_option('libdir')/'gnunet') | ||
| 112 | |||
| 113 | executable ('gnunet-base32', | ||
| 114 | ['gnunet-base32.c'], | ||
| 115 | dependencies: [libgnunetutil_dep], | ||
| 116 | include_directories: [incdir, configuration_inc], | ||
| 117 | install: true, | ||
| 118 | install_dir: get_option('bindir')) | ||
| 119 | executable ('gnunet-config', | ||
| 120 | ['gnunet-config.c'], | ||
| 121 | dependencies: [libgnunetutil_dep], | ||
| 122 | include_directories: [incdir, configuration_inc], | ||
| 123 | install: true, | ||
| 124 | install_dir: get_option('bindir')) | ||
| 125 | executable ('gnunet-resolver', | ||
| 126 | ['gnunet-resolver.c'], | ||
| 127 | dependencies: [libgnunetutil_dep], | ||
| 128 | include_directories: [incdir, configuration_inc], | ||
| 129 | install: true, | ||
| 130 | install_dir: get_option('bindir')) | ||
| 131 | executable ('gnunet-ecc', | ||
| 132 | ['gnunet-ecc.c'], | ||
| 133 | dependencies: [libgnunetutil_dep, gcrypt_dep, m_dep], | ||
| 134 | include_directories: [incdir, configuration_inc], | ||
| 135 | install: true, | ||
| 136 | install_dir: get_option('bindir')) | ||
| 137 | executable ('gnunet-scrypt', | ||
| 138 | ['gnunet-scrypt.c'], | ||
| 139 | dependencies: [libgnunetutil_dep], | ||
| 140 | include_directories: [incdir, configuration_inc], | ||
| 141 | install: true, | ||
| 142 | install_dir: get_option('bindir')) | ||
| 143 | executable ('gnunet-uri', | ||
| 144 | ['gnunet-uri.c'], | ||
| 145 | dependencies: [libgnunetutil_dep], | ||
| 146 | include_directories: [incdir, configuration_inc], | ||
| 147 | install: true, | ||
| 148 | install_dir: get_option('bindir')) | ||
| 149 | if zbar_dep.found() | ||
| 150 | executable ('gnunet-qr', | ||
| 151 | ['gnunet-qr.c'], | ||
| 152 | dependencies: [zbar_dep, libgnunetutil_dep], | ||
| 153 | include_directories: [incdir, configuration_inc], | ||
| 154 | install: true, | ||
| 155 | install_dir: get_option('bindir')) | ||
| 156 | endif | ||
| 157 | executable ('gnunet-config-diff', | ||
| 158 | ['gnunet-config-diff.c'], | ||
| 159 | dependencies: [libgnunetutil_dep], | ||
| 160 | include_directories: [incdir, configuration_inc], | ||
| 161 | install: false) | ||
| 162 | |||
| 163 | executable ('gnunet-service-resolver', | ||
| 164 | gnunetserviceresolver_src, | ||
| 165 | dependencies: [libgnunetutil_dep], | ||
| 166 | include_directories: [incdir, configuration_inc], | ||
| 167 | install: true, | ||
| 168 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
| 169 | executable ('gnunet-timeout', | ||
| 170 | ['gnunet-timeout.c'], | ||
| 171 | dependencies: [libgnunetutil_dep], | ||
| 172 | include_directories: [incdir, configuration_inc], | ||
| 173 | install: true, | ||
| 174 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
| 175 | |||
| 176 | |||
| 177 | executable ('test_common_logging_dummy', | 92 | executable ('test_common_logging_dummy', |
| 178 | ['test_common_logging_dummy.c'], | 93 | ['test_common_logging_dummy.c'], |
| 179 | dependencies: [libgnunetutil_dep], | 94 | dependencies: [libgnunetutil_dep], |
| 180 | include_directories: [incdir, configuration_inc], | 95 | include_directories: [incdir, configuration_inc], |
| 181 | install: false) | 96 | install: false) |
| 182 | executable ('gnunet-crypto-tvg', | ||
| 183 | ['gnunet-crypto-tvg.c'], | ||
| 184 | dependencies: [libgnunetutil_dep, json_dep], | ||
| 185 | include_directories: [incdir, configuration_inc], | ||
| 186 | install: false) | ||
| 187 | 97 | ||
| 188 | test_bio = executable ('test_bio', | 98 | test_bio = executable ('test_bio', |
| 189 | ['test_bio.c'], | 99 | ['test_bio.c'], |
diff --git a/src/meson.build b/src/meson.build index 251e135f4..5efd7e97a 100644 --- a/src/meson.build +++ b/src/meson.build | |||
| @@ -3,70 +3,9 @@ if get_option('monolith') == true | |||
| 3 | endif | 3 | endif |
| 4 | 4 | ||
| 5 | subdir('include') | 5 | subdir('include') |
| 6 | subdir('util') | 6 | subdir('lib') |
| 7 | subdir('hello') | 7 | subdir('service') |
| 8 | subdir('block') | 8 | subdir('plugin') |
| 9 | if get_option('monolith') == false | 9 | subdir('rest-plugin') |
| 10 | subdir('arm') | 10 | subdir('cli') |
| 11 | endif | 11 | subdir('contrib') |
| 12 | subdir('statistics') | ||
| 13 | subdir('testing') | ||
| 14 | subdir('json', if_found : json_dep) | ||
| 15 | subdir('curl', if_found : [curl_dep]) | ||
| 16 | if get_option('monolith') == false | ||
| 17 | subdir('rest') | ||
| 18 | endif | ||
| 19 | subdir('sq', if_found : [sqlite_dep]) | ||
| 20 | subdir('pq', if_found : [pq_dep]) | ||
| 21 | subdir('datacache') | ||
| 22 | subdir('datastore') | ||
| 23 | subdir('template') | ||
| 24 | subdir('peerstore') | ||
| 25 | subdir('nat') | ||
| 26 | subdir('nat-auto') | ||
| 27 | subdir('transport') | ||
| 28 | subdir('core') | ||
| 29 | subdir('nse') | ||
| 30 | subdir('dhtu') | ||
| 31 | subdir('dht') | ||
| 32 | subdir('hostlist') | ||
| 33 | subdir('regex') | ||
| 34 | subdir('dns') | ||
| 35 | subdir('identity') | ||
| 36 | subdir('gnsrecord') | ||
| 37 | subdir('namecache') | ||
| 38 | subdir('namestore') | ||
| 39 | subdir('cadet') | ||
| 40 | subdir('set') | ||
| 41 | subdir('seti') | ||
| 42 | subdir('setu') | ||
| 43 | subdir('consensus') | ||
| 44 | subdir('scalarproduct') | ||
| 45 | subdir('revocation') | ||
| 46 | subdir('vpn') | ||
| 47 | subdir('gns') | ||
| 48 | subdir('zonemaster') | ||
| 49 | if conversation_backend != 'none' | ||
| 50 | subdir('conversation') | ||
| 51 | endif | ||
| 52 | subdir('fs') | ||
| 53 | subdir('exit') | ||
| 54 | subdir('pt') | ||
| 55 | subdir('secretsharing') | ||
| 56 | subdir('reclaim') | ||
| 57 | subdir('messenger') | ||
| 58 | ##subdir('$(EXP_DIR)') | ||
| 59 | |||
| 60 | if not get_option('monolith') | ||
| 61 | subdir_done() | ||
| 62 | endif | ||
| 63 | libgnunet = library('gnunet', | ||
| 64 | gnunet_src, | ||
| 65 | dependencies: gnunetdeps, | ||
| 66 | include_directories: [incdir, configuration_inc, exitdir]) | ||
| 67 | libgnunet_dep = declare_dependency(link_with : libgnunet) | ||
| 68 | |||
| 69 | # FIXME here we need to re-enter all that need to link against libgnunet | ||
| 70 | # For example: dload plugins | ||
| 71 | # We also need a logic that handles this | ||
| 72 | # subdir('block') | ||
diff --git a/src/plugin/block/meson.build b/src/plugin/block/meson.build new file mode 100644 index 000000000..480a9f4ca --- /dev/null +++ b/src/plugin/block/meson.build | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep] | ||
| 2 | shared_module('gnunet_plugin_block_test', | ||
| 3 | ['plugin_block_test.c'], | ||
| 4 | dependencies: plugin_dep, | ||
| 5 | include_directories: [incdir, configuration_inc], | ||
| 6 | install: true, | ||
| 7 | install_dir: get_option('libdir')/'gnunet') | ||
| 8 | |||
| 9 | shared_module('gnunet_plugin_block_template', | ||
| 10 | ['plugin_block_template.c'], | ||
| 11 | dependencies: plugin_dep, | ||
| 12 | include_directories: [incdir, configuration_inc], | ||
| 13 | install: false, | ||
| 14 | install_dir: get_option('libdir')/'gnunet') | ||
| 15 | |||
diff --git a/src/plugin/fs/meson.build b/src/plugin/fs/meson.build new file mode 100644 index 000000000..7978070f9 --- /dev/null +++ b/src/plugin/fs/meson.build | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | shared_module('gnunet_plugin_block_fs', | ||
| 2 | ['plugin_block_fs.c'], | ||
| 3 | dependencies: [libgnunetutil_dep, | ||
| 4 | libgnunetblockgroup_dep], | ||
| 5 | include_directories: [incdir, configuration_inc], | ||
| 6 | install:true, | ||
| 7 | install_dir: get_option('libdir')/'gnunet') | ||
| 8 | |||
diff --git a/src/plugin/gns/meson.build b/src/plugin/gns/meson.build new file mode 100644 index 000000000..0e551b22e --- /dev/null +++ b/src/plugin/gns/meson.build | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | shared_module('gnunet_plugin_gnsrecord_gns', | ||
| 2 | ['plugin_gnsrecord_gns.c'], | ||
| 3 | dependencies: [libgnunetutil_dep, | ||
| 4 | libgnunetgnsrecord_dep, | ||
| 5 | libgnunetidentity_dep], | ||
| 6 | include_directories: [incdir, configuration_inc], | ||
| 7 | install: true, | ||
| 8 | install_dir: get_option('libdir')/'gnunet') | ||
| 9 | shared_module('gnunet_plugin_block_gns', | ||
| 10 | ['plugin_block_gns.c'], | ||
| 11 | dependencies: [libgnunetutil_dep, | ||
| 12 | libgnunetgnsrecord_dep, | ||
| 13 | libgnunetblockgroup_dep], | ||
| 14 | include_directories: [incdir, configuration_inc], | ||
| 15 | install:true, | ||
| 16 | install_dir: get_option('libdir')/'gnunet') | ||
| 17 | |||
diff --git a/src/plugin/gnsrecord/meson.build b/src/plugin/gnsrecord/meson.build new file mode 100644 index 000000000..0778fb233 --- /dev/null +++ b/src/plugin/gnsrecord/meson.build | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | shared_module('gnunet_plugin_gnsrecord_dns', | ||
| 2 | ['plugin_gnsrecord_dns.c'], | ||
| 3 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('libdir')/'gnunet') | ||
diff --git a/src/plugin/meson.build b/src/plugin/meson.build new file mode 100644 index 000000000..6ebae59d7 --- /dev/null +++ b/src/plugin/meson.build | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | subdir('block') | ||
| 2 | subdir('dhtu') | ||
| 3 | subdir('gnsrecord') | ||
| 4 | subdir('namecache') | ||
| 5 | subdir('namestore') | ||
| 6 | subdir('revocation') | ||
| 7 | subdir('gns') | ||
| 8 | subdir('fs') | ||
| 9 | subdir('reclaim') | ||
diff --git a/src/plugin/namecache/meson.build b/src/plugin/namecache/meson.build new file mode 100644 index 000000000..51504314d --- /dev/null +++ b/src/plugin/namecache/meson.build | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | shared_module('gnunet_plugin_namecache_sqlite', | ||
| 2 | ['plugin_namecache_sqlite.c'], | ||
| 3 | dependencies: [libgnunetutil_dep, | ||
| 4 | libgnunetgnsrecord_dep, | ||
| 5 | sqlite_dep, | ||
| 6 | libgnunetsq_dep], | ||
| 7 | include_directories: [incdir, configuration_inc], | ||
| 8 | install: true, | ||
| 9 | install_dir: get_option('libdir')/'gnunet') | ||
| 10 | |||
| 11 | if pq_dep.found() | ||
| 12 | shared_module('gnunet_plugin_namecache_postgres', | ||
| 13 | ['plugin_namecache_postgres.c'], | ||
| 14 | dependencies: [libgnunetutil_dep, | ||
| 15 | libgnunetgnsrecord_dep, | ||
| 16 | pq_dep, | ||
| 17 | libgnunetpq_dep], | ||
| 18 | include_directories: [incdir, configuration_inc], | ||
| 19 | install: true, | ||
| 20 | install_dir: get_option('libdir')/'gnunet') | ||
| 21 | endif | ||
| 22 | |||
diff --git a/src/plugin/namestore/meson.build b/src/plugin/namestore/meson.build new file mode 100644 index 000000000..32db8c104 --- /dev/null +++ b/src/plugin/namestore/meson.build | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | shared_module('gnunet_plugin_rest_namestore', | ||
| 2 | ['plugin_rest_namestore.c'], | ||
| 3 | dependencies: [libgnunetrest_dep, | ||
| 4 | libgnunetidentity_dep, | ||
| 5 | libgnunetgnsrecordjson_dep, | ||
| 6 | libgnunetgnsrecord_dep, | ||
| 7 | libgnunetnamestore_dep, | ||
| 8 | libgnunetjson_dep, | ||
| 9 | libgnunetutil_dep, | ||
| 10 | json_dep, | ||
| 11 | mhd_dep], | ||
| 12 | include_directories: [incdir, configuration_inc], | ||
| 13 | install: true, | ||
| 14 | install_dir: get_option('libdir') / 'gnunet') | ||
| 15 | |||
| 16 | |||
| 17 | shared_module('gnunet_plugin_namestore_sqlite', | ||
| 18 | libgnunetpluginnamestore_sqlite_src, | ||
| 19 | dependencies: [libgnunetutil_dep, | ||
| 20 | libgnunetgnsrecord_dep, | ||
| 21 | libgnunetidentity_dep, | ||
| 22 | libgnunetsq_dep, | ||
| 23 | libgnunetstatistics_dep, | ||
| 24 | sqlite_dep], | ||
| 25 | include_directories: [incdir, configuration_inc], | ||
| 26 | install: true, | ||
| 27 | install_dir: get_option('libdir')/'gnunet') | ||
| 28 | |||
| 29 | if pq_dep.found() | ||
| 30 | shared_module('gnunet_plugin_namestore_postgres', | ||
| 31 | ['plugin_namestore_postgres.c'], | ||
| 32 | dependencies: [libgnunetutil_dep, | ||
| 33 | libgnunetgnsrecord_dep, | ||
| 34 | libgnunetidentity_dep, | ||
| 35 | libgnunetpq_dep, | ||
| 36 | libgnunetstatistics_dep, | ||
| 37 | pq_dep], | ||
| 38 | include_directories: [incdir, configuration_inc], | ||
| 39 | install: true, | ||
| 40 | install_dir: get_option('libdir')/'gnunet') | ||
| 41 | endif | ||
| 42 | |||
diff --git a/src/plugin/reclaim/meson.build b/src/plugin/reclaim/meson.build new file mode 100644 index 000000000..51346b108 --- /dev/null +++ b/src/plugin/reclaim/meson.build | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | shared_module('gnunet_plugin_gnsrecord_reclaim', | ||
| 2 | ['plugin_gnsrecord_reclaim.c'], | ||
| 3 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep], | ||
| 4 | include_directories: [incdir, configuration_inc], | ||
| 5 | install: true, | ||
| 6 | install_dir: get_option('libdir')/'gnunet') | ||
| 7 | |||
| 8 | shared_module('gnunet_plugin_reclaim_attribute_basic', | ||
| 9 | ['plugin_reclaim_attribute_basic.c'], | ||
| 10 | dependencies: [libgnunetrest_dep, | ||
| 11 | libgnunetidentity_dep, | ||
| 12 | libgnunetreclaim_dep, | ||
| 13 | libgnunetjson_dep, | ||
| 14 | libgnunetutil_dep, | ||
| 15 | json_dep], | ||
| 16 | include_directories: [incdir, configuration_inc], | ||
| 17 | install: true, | ||
| 18 | install_dir: get_option('libdir') / 'gnunet') | ||
| 19 | shared_module('gnunet_plugin_reclaim_credential_jwt', | ||
| 20 | ['plugin_reclaim_credential_jwt.c'], | ||
| 21 | dependencies: [libgnunetrest_dep, | ||
| 22 | libgnunetidentity_dep, | ||
| 23 | libgnunetreclaim_dep, | ||
| 24 | libgnunetjson_dep, | ||
| 25 | libgnunetutil_dep, | ||
| 26 | json_dep], | ||
| 27 | include_directories: [incdir, configuration_inc], | ||
| 28 | install: true, | ||
| 29 | install_dir: get_option('libdir') / 'gnunet') | ||
| 30 | |||
diff --git a/src/plugin/revocation/meson.build b/src/plugin/revocation/meson.build new file mode 100644 index 000000000..7f8c8ec5e --- /dev/null +++ b/src/plugin/revocation/meson.build | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | shared_module('gnunet_plugin_block_revocation', | ||
| 2 | ['plugin_block_revocation.c'], | ||
| 3 | dependencies: [libgnunetutil_dep, | ||
| 4 | libgnunetidentity_dep, | ||
| 5 | libgnunetrevocation_dep, | ||
| 6 | libgnunetblock_dep], | ||
| 7 | include_directories: [incdir, configuration_inc], | ||
| 8 | install: true, | ||
| 9 | install_dir: get_option('libdir')/'gnunet') | ||
| 10 | |||
diff --git a/src/rest-plugin/gns/meson.build b/src/rest-plugin/gns/meson.build new file mode 100644 index 000000000..7a4deffed --- /dev/null +++ b/src/rest-plugin/gns/meson.build | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | shared_module('gnunet_plugin_rest_gns', | ||
| 2 | ['plugin_rest_gns.c'], | ||
| 3 | dependencies: [libgnunetrest_dep, | ||
| 4 | libgnunetgnsrecord_dep, | ||
| 5 | libgnunetgnsrecordjson_dep, | ||
| 6 | libgnunetgns_dep, | ||
| 7 | libgnunetutil_dep, | ||
| 8 | json_dep, | ||
| 9 | mhd_dep], | ||
| 10 | include_directories: [incdir, configuration_inc], | ||
| 11 | install: true, | ||
| 12 | install_dir: get_option('libdir') / 'gnunet') | ||
| 13 | |||
diff --git a/src/rest-plugin/identity/meson.build b/src/rest-plugin/identity/meson.build new file mode 100644 index 000000000..f459918db --- /dev/null +++ b/src/rest-plugin/identity/meson.build | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | shared_module('gnunet_plugin_rest_identity', | ||
| 2 | ['plugin_rest_identity.c'], | ||
| 3 | dependencies: [libgnunetrest_dep, | ||
| 4 | libgnunetidentity_dep, | ||
| 5 | libgnunetutil_dep, | ||
| 6 | json_dep, | ||
| 7 | mhd_dep], | ||
| 8 | include_directories: [incdir, configuration_inc], | ||
| 9 | install: true, | ||
| 10 | install_dir: get_option('libdir') / 'gnunet') | ||
| 11 | |||
diff --git a/src/rest-plugin/meson.build b/src/rest-plugin/meson.build new file mode 100644 index 000000000..31d49864e --- /dev/null +++ b/src/rest-plugin/meson.build | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | if get_option('monolith') == false | ||
| 2 | subdir('rest') | ||
| 3 | endif | ||
| 4 | subdir('identity') | ||
| 5 | subdir('gns') | ||
| 6 | subdir('reclaim') | ||
diff --git a/src/rest-plugin/reclaim/meson.build b/src/rest-plugin/reclaim/meson.build new file mode 100644 index 000000000..da4406850 --- /dev/null +++ b/src/rest-plugin/reclaim/meson.build | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | shared_module('gnunet_plugin_rest_reclaim', | ||
| 2 | ['plugin_rest_reclaim.c', 'json_reclaim.c'], | ||
| 3 | dependencies: [libgnunetrest_dep, | ||
| 4 | libgnunetidentity_dep, | ||
| 5 | libgnunetreclaim_dep, | ||
| 6 | libgnunetjson_dep, | ||
| 7 | libgnunetutil_dep, | ||
| 8 | json_dep, | ||
| 9 | mhd_dep], | ||
| 10 | include_directories: [incdir, configuration_inc], | ||
| 11 | install: true, | ||
| 12 | install_dir: get_option('libdir') / 'gnunet') | ||
| 13 | |||
| 14 | shared_module('gnunet_plugin_rest_openid_connect', | ||
| 15 | ['plugin_rest_openid_connect.c', 'oidc_helper.c'], | ||
| 16 | dependencies: [libgnunetrest_dep, | ||
| 17 | libgnunetreclaim_dep, | ||
| 18 | libgnunetidentity_dep, | ||
| 19 | libgnunetgns_dep, | ||
| 20 | libgnunetutil_dep, | ||
| 21 | jose_dep, | ||
| 22 | gcrypt_dep, | ||
| 23 | json_dep, | ||
| 24 | mhd_dep], | ||
| 25 | include_directories: [incdir, configuration_inc], | ||
| 26 | install: true, | ||
| 27 | install_dir: get_option('libdir') / 'gnunet') | ||
| 28 | |||
| 29 | |||
diff --git a/src/rest-plugin/rest/meson.build b/src/rest-plugin/rest/meson.build new file mode 100644 index 000000000..0c7219327 --- /dev/null +++ b/src/rest-plugin/rest/meson.build | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | shared_module('gnunet_plugin_rest_config', | ||
| 2 | ['plugin_rest_config.c'], | ||
| 3 | dependencies: [libgnunetrest_dep, | ||
| 4 | libgnunetutil_dep, | ||
| 5 | json_dep, | ||
| 6 | mhd_dep], | ||
| 7 | include_directories: [incdir, configuration_inc], | ||
| 8 | install: true, | ||
| 9 | install_dir: get_option('libdir') / 'gnunet') | ||
| 10 | shared_module('gnunet_plugin_rest_copying', | ||
| 11 | ['plugin_rest_copying.c'], | ||
| 12 | dependencies: [libgnunetrest_dep, | ||
| 13 | libgnunetutil_dep, | ||
| 14 | json_dep, | ||
| 15 | mhd_dep], | ||
| 16 | include_directories: [incdir, configuration_inc], | ||
| 17 | install: true, | ||
| 18 | install_dir: get_option('libdir') / 'gnunet') | ||
diff --git a/src/service/arm/meson.build b/src/service/arm/meson.build index bfeb0b31f..db37c7424 100644 --- a/src/service/arm/meson.build +++ b/src/service/arm/meson.build | |||
| @@ -3,8 +3,6 @@ libgnunetarm_src = ['arm_api.c', | |||
| 3 | 3 | ||
| 4 | gnunetservicearm_src = ['gnunet-service-arm.c'] | 4 | gnunetservicearm_src = ['gnunet-service-arm.c'] |
| 5 | 5 | ||
| 6 | gnunetarm_src = ['gnunet-arm.c'] | ||
| 7 | |||
| 8 | testarmapi_src = ['test_arm_api.c'] | 6 | testarmapi_src = ['test_arm_api.c'] |
| 9 | testexpbo_src = ['test_exponential_backoff.c'] | 7 | testexpbo_src = ['test_exponential_backoff.c'] |
| 10 | testgnunetservice_src = ['test_gnunet_service_arm.c'] | 8 | testgnunetservice_src = ['test_gnunet_service_arm.c'] |
| @@ -15,13 +13,6 @@ configure_file(input : 'arm.conf.in', | |||
| 15 | install: true, | 13 | install: true, |
| 16 | install_dir: pkgcfgdir) | 14 | install_dir: pkgcfgdir) |
| 17 | 15 | ||
| 18 | if get_option('monolith') | ||
| 19 | foreach p : libgnunetarm_src + gnunetservicearm_src | ||
| 20 | gnunet_src += 'arm/' + p | ||
| 21 | endforeach | ||
| 22 | subdir_done() | ||
| 23 | endif | ||
| 24 | |||
| 25 | libgnunetarm = library('gnunetarm', | 16 | libgnunetarm = library('gnunetarm', |
| 26 | libgnunetarm_src, | 17 | libgnunetarm_src, |
| 27 | dependencies: libgnunetutil_dep, | 18 | dependencies: libgnunetutil_dep, |
| @@ -33,12 +24,6 @@ libgnunetarm = library('gnunetarm', | |||
| 33 | pkg.generate(libgnunetarm, url: 'https://www.gnunet.org', | 24 | pkg.generate(libgnunetarm, url: 'https://www.gnunet.org', |
| 34 | description : 'Provides API for accessing the Automated Restart Manager service') | 25 | description : 'Provides API for accessing the Automated Restart Manager service') |
| 35 | libgnunetarm_dep = declare_dependency(link_with : libgnunetarm) | 26 | libgnunetarm_dep = declare_dependency(link_with : libgnunetarm) |
| 36 | executable ('gnunet-arm', | ||
| 37 | gnunetarm_src, | ||
| 38 | dependencies: [libgnunetarm_dep, libgnunetutil_dep], | ||
| 39 | include_directories: [incdir, configuration_inc], | ||
| 40 | install: true, | ||
| 41 | install_dir: get_option('bindir')) | ||
| 42 | 27 | ||
| 43 | executable ('gnunet-service-arm', | 28 | executable ('gnunet-service-arm', |
| 44 | gnunetservicearm_src, | 29 | gnunetservicearm_src, |
diff --git a/src/service/cadet/meson.build b/src/service/cadet/meson.build index a961c8e76..0f465e0e2 100644 --- a/src/service/cadet/meson.build +++ b/src/service/cadet/meson.build | |||
| @@ -27,7 +27,6 @@ if get_option('monolith') | |||
| 27 | foreach p : libgnunetcadet_src + gnunetservicecadet_src | 27 | foreach p : libgnunetcadet_src + gnunetservicecadet_src |
| 28 | gnunet_src += 'cadet/' + p | 28 | gnunet_src += 'cadet/' + p |
| 29 | endforeach | 29 | endforeach |
| 30 | subdir_done() | ||
| 31 | endif | 30 | endif |
| 32 | 31 | ||
| 33 | libgnunetcadet = library('gnunetcadet', | 32 | libgnunetcadet = library('gnunetcadet', |
| @@ -42,20 +41,6 @@ libgnunetcadet_dep = declare_dependency(link_with : libgnunetcadet) | |||
| 42 | pkg.generate(libgnunetcadet, url: 'https://www.gnunet.org', | 41 | pkg.generate(libgnunetcadet, url: 'https://www.gnunet.org', |
| 43 | description : 'API for multicast and multi-hop routing between GNUnet peers') | 42 | description : 'API for multicast and multi-hop routing between GNUnet peers') |
| 44 | 43 | ||
| 45 | executable ('gnunet-cadet', | ||
| 46 | gnunetservicecadet_src, | ||
| 47 | dependencies: [libgnunetcadet_dep, | ||
| 48 | libgnunetutil_dep, | ||
| 49 | libgnunetcore_dep, | ||
| 50 | libgnunetdht_dep, | ||
| 51 | m_dep, | ||
| 52 | libgnunetstatistics_dep, | ||
| 53 | libgnunetpeerstore_dep, | ||
| 54 | libgnunettransportapplication_dep, | ||
| 55 | libgnunethello_dep], | ||
| 56 | include_directories: [incdir, configuration_inc], | ||
| 57 | install: true, | ||
| 58 | install_dir: get_option('bindir')) | ||
| 59 | executable ('gnunet-service-cadet', | 44 | executable ('gnunet-service-cadet', |
| 60 | gnunetservicecadet_src, | 45 | gnunetservicecadet_src, |
| 61 | dependencies: [libgnunetcadet_dep, | 46 | dependencies: [libgnunetcadet_dep, |
diff --git a/src/service/core/meson.build b/src/service/core/meson.build index 2e3e958af..6de15cd6d 100644 --- a/src/service/core/meson.build +++ b/src/service/core/meson.build | |||
| @@ -17,7 +17,6 @@ if get_option('monolith') | |||
| 17 | foreach p : libgnunetcore_src + gnunetservicecore_src | 17 | foreach p : libgnunetcore_src + gnunetservicecore_src |
| 18 | gnunet_src += 'core/' + p | 18 | gnunet_src += 'core/' + p |
| 19 | endforeach | 19 | endforeach |
| 20 | subdir_done() | ||
| 21 | endif | 20 | endif |
| 22 | 21 | ||
| 23 | libgnunetcore = library('gnunetcore', | 22 | libgnunetcore = library('gnunetcore', |
| @@ -64,13 +63,6 @@ shared_module('gnunet_test_core_plugin_cmd_just_run', | |||
| 64 | install: true, | 63 | install: true, |
| 65 | install_dir: get_option('libdir')/'gnunet') | 64 | install_dir: get_option('libdir')/'gnunet') |
| 66 | 65 | ||
| 67 | executable ('gnunet-core', | ||
| 68 | ['gnunet-core.c'], | ||
| 69 | dependencies: [libgnunetcore_dep, libgnunetutil_dep], | ||
| 70 | include_directories: [incdir, configuration_inc], | ||
| 71 | install: true, | ||
| 72 | install_dir: get_option('bindir')) | ||
| 73 | |||
| 74 | executable ('gnunet-service-core', | 66 | executable ('gnunet-service-core', |
| 75 | gnunetservicecore_src, | 67 | gnunetservicecore_src, |
| 76 | dependencies: [libgnunetcore_dep, libgnunetutil_dep, | 68 | dependencies: [libgnunetcore_dep, libgnunetutil_dep, |
diff --git a/src/service/datacache/meson.build b/src/service/datacache/meson.build index 91bf1a02d..528885c0d 100644 --- a/src/service/datacache/meson.build +++ b/src/service/datacache/meson.build | |||
| @@ -13,7 +13,6 @@ if get_option('monolith') | |||
| 13 | foreach p : libgnunetdatacache_src | 13 | foreach p : libgnunetdatacache_src |
| 14 | gnunet_src += 'datacache/' + p | 14 | gnunet_src += 'datacache/' + p |
| 15 | endforeach | 15 | endforeach |
| 16 | subdir_done() | ||
| 17 | endif | 16 | endif |
| 18 | 17 | ||
| 19 | libgnunetdatacache = library('gnunetdatacache', | 18 | libgnunetdatacache = library('gnunetdatacache', |
diff --git a/src/service/datastore/meson.build b/src/service/datastore/meson.build index c49bfe449..9dde488a0 100644 --- a/src/service/datastore/meson.build +++ b/src/service/datastore/meson.build | |||
| @@ -16,7 +16,6 @@ if get_option('monolith') | |||
| 16 | foreach p : libgnunetdatastore_src + gnunetservicedatastore_src | 16 | foreach p : libgnunetdatastore_src + gnunetservicedatastore_src |
| 17 | gnunet_src += 'datastore/' + p | 17 | gnunet_src += 'datastore/' + p |
| 18 | endforeach | 18 | endforeach |
| 19 | subdir_done() | ||
| 20 | endif | 19 | endif |
| 21 | 20 | ||
| 22 | libgnunetdatastore = library('gnunetdatastore', | 21 | libgnunetdatastore = library('gnunetdatastore', |
| @@ -63,15 +62,6 @@ if pq_dep.found() | |||
| 63 | install_dir: get_option('libdir')/'gnunet') | 62 | install_dir: get_option('libdir')/'gnunet') |
| 64 | endif | 63 | endif |
| 65 | 64 | ||
| 66 | executable ('gnunet-datastore', | ||
| 67 | ['gnunet-datastore.c'], | ||
| 68 | dependencies: [libgnunetdatastore_dep, | ||
| 69 | libgnunetutil_dep, | ||
| 70 | libgnunetstatistics_dep, | ||
| 71 | libgnunetdatacache_dep], | ||
| 72 | include_directories: [incdir, configuration_inc], | ||
| 73 | install: true, | ||
| 74 | install_dir: get_option('bindir')) | ||
| 75 | executable ('gnunet-service-datastore', | 65 | executable ('gnunet-service-datastore', |
| 76 | gnunetservicedatastore_src, | 66 | gnunetservicedatastore_src, |
| 77 | dependencies: [libgnunetdatastore_dep, | 67 | dependencies: [libgnunetdatastore_dep, |
diff --git a/src/service/dht/meson.build b/src/service/dht/meson.build index ad5b183fa..49ace7e0b 100644 --- a/src/service/dht/meson.build +++ b/src/service/dht/meson.build | |||
| @@ -15,7 +15,6 @@ if get_option('monolith') | |||
| 15 | foreach p : libgnunetdht_src + gnunetservicedht_src | 15 | foreach p : libgnunetdht_src + gnunetservicedht_src |
| 16 | gnunet_src += 'dht/' + p | 16 | gnunet_src += 'dht/' + p |
| 17 | endforeach | 17 | endforeach |
| 18 | subdir_done() | ||
| 19 | endif | 18 | endif |
| 20 | 19 | ||
| 21 | libgnunetdht = library('gnunetdht', | 20 | libgnunetdht = library('gnunetdht', |
| @@ -40,42 +39,6 @@ shared_module('gnunet_plugin_block_dht', | |||
| 40 | install:true, | 39 | install:true, |
| 41 | install_dir: get_option('libdir')/'gnunet') | 40 | install_dir: get_option('libdir')/'gnunet') |
| 42 | 41 | ||
| 43 | executable ('gnunet-dht', | ||
| 44 | gnunetservicedht_src, | ||
| 45 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, | ||
| 46 | libgnunetblock_dep, | ||
| 47 | m_dep, | ||
| 48 | libgnunetdatacache_dep, | ||
| 49 | libgnunetstatistics_dep, | ||
| 50 | libgnunetblockgroup_dep, | ||
| 51 | libgnunethello_dep], | ||
| 52 | include_directories: [incdir, configuration_inc], | ||
| 53 | install: true, | ||
| 54 | install_dir: get_option('bindir')) | ||
| 55 | executable ('gnunet-dht-put', | ||
| 56 | ['gnunet-dht-put.c'], | ||
| 57 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 58 | include_directories: [incdir, configuration_inc], | ||
| 59 | install: true, | ||
| 60 | install_dir: get_option('bindir')) | ||
| 61 | executable ('gnunet-dht-get', | ||
| 62 | ['gnunet-dht-get.c'], | ||
| 63 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 64 | include_directories: [incdir, configuration_inc], | ||
| 65 | install: true, | ||
| 66 | install_dir: get_option('bindir')) | ||
| 67 | executable ('gnunet-dht-monitor', | ||
| 68 | ['gnunet-dht-monitor.c'], | ||
| 69 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 70 | include_directories: [incdir, configuration_inc], | ||
| 71 | install: true, | ||
| 72 | install_dir: get_option('bindir')) | ||
| 73 | executable ('gnunet-dht-hello', | ||
| 74 | ['gnunet-dht-hello.c'], | ||
| 75 | dependencies: [libgnunetdht_dep, libgnunetutil_dep], | ||
| 76 | include_directories: [incdir, configuration_inc], | ||
| 77 | install: true, | ||
| 78 | install_dir: get_option('bindir')) | ||
| 79 | executable ('gnunet-service-dht', | 42 | executable ('gnunet-service-dht', |
| 80 | gnunetservicedht_src, | 43 | gnunetservicedht_src, |
| 81 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, | 44 | dependencies: [libgnunetdht_dep, libgnunetutil_dep, |
diff --git a/src/service/dns/meson.build b/src/service/dns/meson.build index e1ac0bf29..fe0f6e954 100644 --- a/src/service/dns/meson.build +++ b/src/service/dns/meson.build | |||
| @@ -15,7 +15,6 @@ if get_option('monolith') | |||
| 15 | foreach p : libgnunetdns_src + gnunetservicedns_src + libgnunetpluginblockdns_src | 15 | foreach p : libgnunetdns_src + gnunetservicedns_src + libgnunetpluginblockdns_src |
| 16 | gnunet_src += 'dns/' + p | 16 | gnunet_src += 'dns/' + p |
| 17 | endforeach | 17 | endforeach |
| 18 | subdir_done() | ||
| 19 | endif | 18 | endif |
| 20 | 19 | ||
| 21 | libgnunetdns = library('gnunetdns', | 20 | libgnunetdns = library('gnunetdns', |
diff --git a/src/service/fs/meson.build b/src/service/fs/meson.build index 4246e4fcf..9e3e05cf7 100644 --- a/src/service/fs/meson.build +++ b/src/service/fs/meson.build | |||
| @@ -38,7 +38,6 @@ if get_option('monolith') | |||
| 38 | foreach p : libgnunetfs_src + gnunetservicefs_src | 38 | foreach p : libgnunetfs_src + gnunetservicefs_src |
| 39 | gnunet_src += 'fs/' + p | 39 | gnunet_src += 'fs/' + p |
| 40 | endforeach | 40 | endforeach |
| 41 | subdir_done() | ||
| 42 | endif | 41 | endif |
| 43 | 42 | ||
| 44 | libgnunetfs = library('gnunetfs', | 43 | libgnunetfs = library('gnunetfs', |
| @@ -56,64 +55,6 @@ libgnunetfs_dep = declare_dependency(link_with : libgnunetfs) | |||
| 56 | pkg.generate(libgnunetfs, url: 'https://www.gnunet.org', | 55 | pkg.generate(libgnunetfs, url: 'https://www.gnunet.org', |
| 57 | description : 'Provides API for GNUnet File-Sharing service') | 56 | description : 'Provides API for GNUnet File-Sharing service') |
| 58 | 57 | ||
| 59 | shared_module('gnunet_plugin_block_fs', | ||
| 60 | ['plugin_block_fs.c'], | ||
| 61 | dependencies: [libgnunetutil_dep, | ||
| 62 | libgnunetblockgroup_dep], | ||
| 63 | include_directories: [incdir, configuration_inc], | ||
| 64 | install:true, | ||
| 65 | install_dir: get_option('libdir')/'gnunet') | ||
| 66 | |||
| 67 | executable ('gnunet-search', | ||
| 68 | 'gnunet-search.c', | ||
| 69 | dependencies: [libgnunetfs_dep, | ||
| 70 | libgnunetutil_dep], | ||
| 71 | include_directories: [incdir, configuration_inc], | ||
| 72 | install: true, | ||
| 73 | install_dir: get_option('bindir')) | ||
| 74 | executable ('gnunet-unindex', | ||
| 75 | 'gnunet-unindex.c', | ||
| 76 | dependencies: [libgnunetfs_dep, | ||
| 77 | libgnunetutil_dep], | ||
| 78 | include_directories: [incdir, configuration_inc], | ||
| 79 | install: true, | ||
| 80 | install_dir: get_option('bindir')) | ||
| 81 | executable ('gnunet-auto-share', | ||
| 82 | 'gnunet-auto-share.c', | ||
| 83 | dependencies: [libgnunetfs_dep, | ||
| 84 | libgnunetutil_dep], | ||
| 85 | include_directories: [incdir, configuration_inc], | ||
| 86 | install: true, | ||
| 87 | install_dir: get_option('bindir')) | ||
| 88 | executable ('gnunet-directory', | ||
| 89 | 'gnunet-directory.c', | ||
| 90 | dependencies: [libgnunetfs_dep, | ||
| 91 | libgnunetutil_dep], | ||
| 92 | include_directories: [incdir, configuration_inc], | ||
| 93 | install: true, | ||
| 94 | install_dir: get_option('bindir')) | ||
| 95 | executable ('gnunet-download', | ||
| 96 | 'gnunet-download.c', | ||
| 97 | dependencies: [libgnunetfs_dep, | ||
| 98 | libgnunetutil_dep], | ||
| 99 | include_directories: [incdir, configuration_inc], | ||
| 100 | install: true, | ||
| 101 | install_dir: get_option('bindir')) | ||
| 102 | executable ('gnunet-fs', | ||
| 103 | 'gnunet-fs.c', | ||
| 104 | dependencies: [libgnunetfs_dep, | ||
| 105 | libgnunetutil_dep], | ||
| 106 | include_directories: [incdir, configuration_inc], | ||
| 107 | install: true, | ||
| 108 | install_dir: get_option('bindir')) | ||
| 109 | executable ('gnunet-publish', | ||
| 110 | 'gnunet-publish.c', | ||
| 111 | dependencies: [libgnunetfs_dep, | ||
| 112 | libgnunetidentity_dep, | ||
| 113 | libgnunetutil_dep], | ||
| 114 | include_directories: [incdir, configuration_inc], | ||
| 115 | install: true, | ||
| 116 | install_dir: get_option('bindir')) | ||
| 117 | executable ('gnunet-service-fs', | 58 | executable ('gnunet-service-fs', |
| 118 | gnunetservicefs_src, | 59 | gnunetservicefs_src, |
| 119 | dependencies: [libgnunetfs_dep, | 60 | dependencies: [libgnunetfs_dep, |
diff --git a/src/service/gns/meson.build b/src/service/gns/meson.build index b82694026..fb70a72b0 100644 --- a/src/service/gns/meson.build +++ b/src/service/gns/meson.build | |||
| @@ -17,20 +17,10 @@ configure_file(input : 'tlds.conf', | |||
| 17 | install: true, | 17 | install: true, |
| 18 | install_dir: pkgcfgdir) | 18 | install_dir: pkgcfgdir) |
| 19 | 19 | ||
| 20 | configure_file(input : 'gnunet-gns-proxy-setup-ca.in', | ||
| 21 | output : 'gnunet-gns-proxy-setup-ca', | ||
| 22 | configuration : cdata, | ||
| 23 | install: true, | ||
| 24 | install_dir: get_option('bindir')) | ||
| 25 | |||
| 26 | install_data('gnunet-gns-proxy-ca.template', | ||
| 27 | install_dir: get_option('datadir')/'gnunet') | ||
| 28 | |||
| 29 | if get_option('monolith') | 20 | if get_option('monolith') |
| 30 | foreach p : libgnunetgns_src + gnunetservicegns_src | 21 | foreach p : libgnunetgns_src + gnunetservicegns_src |
| 31 | gnunet_src += 'gns/' + p | 22 | gnunet_src += 'gns/' + p |
| 32 | endforeach | 23 | endforeach |
| 33 | subdir_done() | ||
| 34 | endif | 24 | endif |
| 35 | 25 | ||
| 36 | libgnunetgns = library('gnunetgns', | 26 | libgnunetgns = library('gnunetgns', |
| @@ -47,45 +37,6 @@ libgnunetgns_dep = declare_dependency(link_with : libgnunetgns) | |||
| 47 | pkg.generate(libgnunetgns, url: 'https://www.gnunet.org', | 37 | pkg.generate(libgnunetgns, url: 'https://www.gnunet.org', |
| 48 | description : 'Provides API to access the GNU Name System') | 38 | description : 'Provides API to access the GNU Name System') |
| 49 | 39 | ||
| 50 | shared_module('gnunet_plugin_gnsrecord_gns', | ||
| 51 | ['plugin_gnsrecord_gns.c'], | ||
| 52 | dependencies: [libgnunetutil_dep, | ||
| 53 | libgnunetgnsrecord_dep, | ||
| 54 | libgnunetidentity_dep], | ||
| 55 | include_directories: [incdir, configuration_inc], | ||
| 56 | install: true, | ||
| 57 | install_dir: get_option('libdir')/'gnunet') | ||
| 58 | shared_module('gnunet_plugin_block_gns', | ||
| 59 | ['plugin_block_gns.c'], | ||
| 60 | dependencies: [libgnunetutil_dep, | ||
| 61 | libgnunetgnsrecord_dep, | ||
| 62 | libgnunetblockgroup_dep], | ||
| 63 | include_directories: [incdir, configuration_inc], | ||
| 64 | install:true, | ||
| 65 | install_dir: get_option('libdir')/'gnunet') | ||
| 66 | shared_module('gnunet_plugin_rest_gns', | ||
| 67 | ['plugin_rest_gns.c'], | ||
| 68 | dependencies: [libgnunetrest_dep, | ||
| 69 | libgnunetgnsrecord_dep, | ||
| 70 | libgnunetgnsrecordjson_dep, | ||
| 71 | libgnunetgns_dep, | ||
| 72 | libgnunetutil_dep, | ||
| 73 | json_dep, | ||
| 74 | mhd_dep], | ||
| 75 | include_directories: [incdir, configuration_inc], | ||
| 76 | install: true, | ||
| 77 | install_dir: get_option('libdir') / 'gnunet') | ||
| 78 | |||
| 79 | |||
| 80 | executable ('gnunet-gns', | ||
| 81 | 'gnunet-gns.c', | ||
| 82 | dependencies: [libgnunetgns_dep, | ||
| 83 | libgnunetgnsrecord_dep, | ||
| 84 | idn_dep, | ||
| 85 | libgnunetutil_dep], | ||
| 86 | include_directories: [incdir, configuration_inc], | ||
| 87 | install: true, | ||
| 88 | install_dir: get_option('bindir')) | ||
| 89 | executable ('gnunet-gns-proxy', | 40 | executable ('gnunet-gns-proxy', |
| 90 | gnunetgnsproxy_src, | 41 | gnunetgnsproxy_src, |
| 91 | dependencies: [libgnunetgns_dep, | 42 | dependencies: [libgnunetgns_dep, |
| @@ -160,51 +111,3 @@ executable ('gnunet-dns2gns', | |||
| 160 | if have_nss | 111 | if have_nss |
| 161 | subdir('nss') | 112 | subdir('nss') |
| 162 | endif | 113 | endif |
| 163 | |||
| 164 | testgns = [ | ||
| 165 | 'test_dns2gns', | ||
| 166 | 'test_gns_at_lookup', | ||
| 167 | 'test_gns_caa_lookup', | ||
| 168 | 'test_gns_config_lookup', | ||
| 169 | 'test_gns_delegated_lookup', | ||
| 170 | 'test_gns_dht_lookup', | ||
| 171 | 'test_gns_gns2dns_cname_lookup', | ||
| 172 | 'test_gns_gns2dns_lookup', | ||
| 173 | 'test_gns_gns2dns_zkey_lookup', | ||
| 174 | 'test_gns_ipv6_lookup', | ||
| 175 | 'test_gns_lookup', | ||
| 176 | 'test_gns_multiple_record_lookup', | ||
| 177 | 'test_gns_mx_lookup', | ||
| 178 | 'test_gns_quickupdate', | ||
| 179 | 'test_gns_redirect_lookup', | ||
| 180 | 'test_gns_rel_expiration', | ||
| 181 | 'test_gns_revocation', | ||
| 182 | 'test_gns_soa_lookup', | ||
| 183 | 'test_gns_txt_lookup', | ||
| 184 | 'test_gns_zkey_lookup', | ||
| 185 | 'test_plugin_rest_gns', | ||
| 186 | ] | ||
| 187 | |||
| 188 | testconfigs = [ | ||
| 189 | 'test_dns2gns.conf', | ||
| 190 | 'test_gns_defaults.conf', | ||
| 191 | 'test_gns_lookup.conf', | ||
| 192 | 'test_gns_lookup_peer1.conf', | ||
| 193 | 'test_gns_lookup_peer2.conf', | ||
| 194 | 'test_gns_proxy.conf', | ||
| 195 | 'test_gns_simple_lookup.conf' | ||
| 196 | ] | ||
| 197 | |||
| 198 | foreach f : testconfigs | ||
| 199 | configure_file(input: f, output: f, copy: true) | ||
| 200 | endforeach | ||
| 201 | |||
| 202 | foreach t : testgns | ||
| 203 | |||
| 204 | test_filename = t + '.sh' | ||
| 205 | test_file = configure_file(input : test_filename, | ||
| 206 | output : test_filename, | ||
| 207 | copy: true) | ||
| 208 | |||
| 209 | test(t, test_file, suite: 'gns', workdir: meson.current_build_dir(), is_parallel: false) | ||
| 210 | endforeach | ||
diff --git a/src/service/identity/meson.build b/src/service/identity/meson.build index c9e4f9bb4..961badbbc 100644 --- a/src/service/identity/meson.build +++ b/src/service/identity/meson.build | |||
| @@ -15,7 +15,6 @@ if get_option('monolith') | |||
| 15 | foreach p : libgnunetidentity_src + gnunetserviceidentity_src | 15 | foreach p : libgnunetidentity_src + gnunetserviceidentity_src |
| 16 | gnunet_src += 'identity/' + p | 16 | gnunet_src += 'identity/' + p |
| 17 | endforeach | 17 | endforeach |
| 18 | subdir_done() | ||
| 19 | endif | 18 | endif |
| 20 | 19 | ||
| 21 | libgnunetidentity = library('gnunetidentity', | 20 | libgnunetidentity = library('gnunetidentity', |
| @@ -29,26 +28,7 @@ libgnunetidentity = library('gnunetidentity', | |||
| 29 | libgnunetidentity_dep = declare_dependency(link_with : libgnunetidentity) | 28 | libgnunetidentity_dep = declare_dependency(link_with : libgnunetidentity) |
| 30 | pkg.generate(libgnunetidentity, url: 'https://www.gnunet.org', | 29 | pkg.generate(libgnunetidentity, url: 'https://www.gnunet.org', |
| 31 | description : 'API to access and organize private keys of the user egos') | 30 | description : 'API to access and organize private keys of the user egos') |
| 32 | shared_module('gnunet_plugin_rest_identity', | ||
| 33 | ['plugin_rest_identity.c'], | ||
| 34 | dependencies: [libgnunetrest_dep, | ||
| 35 | libgnunetidentity_dep, | ||
| 36 | libgnunetutil_dep, | ||
| 37 | json_dep, | ||
| 38 | mhd_dep], | ||
| 39 | include_directories: [incdir, configuration_inc], | ||
| 40 | install: true, | ||
| 41 | install_dir: get_option('libdir') / 'gnunet') | ||
| 42 | 31 | ||
| 43 | |||
| 44 | executable ('gnunet-identity', | ||
| 45 | ['gnunet-identity.c'], | ||
| 46 | dependencies: [libgnunetidentity_dep, | ||
| 47 | libgnunetutil_dep, | ||
| 48 | libgnunetstatistics_dep], | ||
| 49 | include_directories: [incdir, configuration_inc], | ||
| 50 | install: true, | ||
| 51 | install_dir: get_option('bindir')) | ||
| 52 | executable ('gnunet-service-identity', | 32 | executable ('gnunet-service-identity', |
| 53 | gnunetserviceidentity_src, | 33 | gnunetserviceidentity_src, |
| 54 | dependencies: [libgnunetidentity_dep, | 34 | dependencies: [libgnunetidentity_dep, |
diff --git a/src/service/meson.build b/src/service/meson.build new file mode 100644 index 000000000..6acbc3b10 --- /dev/null +++ b/src/service/meson.build | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | subdir('util') | ||
| 2 | subdir('arm') | ||
| 3 | subdir('statistics') | ||
| 4 | subdir('testing') | ||
| 5 | subdir('rest') | ||
| 6 | subdir('datacache') | ||
| 7 | subdir('datastore') | ||
| 8 | subdir('peerstore') | ||
| 9 | subdir('nat') | ||
| 10 | subdir('nat-auto') | ||
| 11 | subdir('transport') | ||
| 12 | subdir('core') | ||
| 13 | subdir('nse') | ||
| 14 | subdir('dht') | ||
| 15 | subdir('hostlist') | ||
| 16 | subdir('regex') | ||
| 17 | subdir('dns') | ||
| 18 | subdir('identity') | ||
| 19 | subdir('namecache') | ||
| 20 | subdir('namestore') | ||
| 21 | subdir('cadet') | ||
| 22 | subdir('seti') | ||
| 23 | subdir('setu') | ||
| 24 | subdir('revocation') | ||
| 25 | subdir('vpn') | ||
| 26 | subdir('gns') | ||
| 27 | subdir('zonemaster') | ||
| 28 | subdir('fs') | ||
| 29 | subdir('exit') | ||
| 30 | subdir('pt') | ||
| 31 | subdir('reclaim') | ||
| 32 | subdir('messenger') | ||
| 33 | |||
| 34 | if not get_option('monolith') | ||
| 35 | subdir_done() | ||
| 36 | endif | ||
| 37 | libgnunet = library('gnunet', | ||
| 38 | gnunet_src, | ||
| 39 | dependencies: [gnunetdeps, | ||
| 40 | libgnunetutil_dep, | ||
| 41 | libgnunethello_dep, | ||
| 42 | libgnunetjson_dep, | ||
| 43 | libgnunetblock_dep, | ||
| 44 | libgnunetblockgroup_dep, | ||
| 45 | libgnunetgnsrecord_dep, | ||
| 46 | libgnunetcurl_dep], | ||
| 47 | c_args: ['-DHAVE_GNUNET_MONOLITH=1'], | ||
| 48 | include_directories: [incdir, configuration_inc, exitdir]) | ||
| 49 | libgnunet_dep = declare_dependency(link_with : libgnunet) | ||
diff --git a/src/service/messenger/meson.build b/src/service/messenger/meson.build index c855b45e4..a6de2f516 100644 --- a/src/service/messenger/meson.build +++ b/src/service/messenger/meson.build | |||
| @@ -39,7 +39,6 @@ if get_option('monolith') | |||
| 39 | foreach p : libgnunetmessenger_src + gnunetservicemessenger_src | 39 | foreach p : libgnunetmessenger_src + gnunetservicemessenger_src |
| 40 | gnunet_src += 'messenger/' + p | 40 | gnunet_src += 'messenger/' + p |
| 41 | endforeach | 41 | endforeach |
| 42 | subdir_done() | ||
| 43 | endif | 42 | endif |
| 44 | 43 | ||
| 45 | libgnunetmessenger = library('gnunetmessenger', | 44 | libgnunetmessenger = library('gnunetmessenger', |
| @@ -64,13 +63,6 @@ shared_module('gnunet_plugin_gnsrecord_messenger', | |||
| 64 | install: true, | 63 | install: true, |
| 65 | install_dir: get_option('libdir')/'gnunet') | 64 | install_dir: get_option('libdir')/'gnunet') |
| 66 | 65 | ||
| 67 | executable ('gnunet-messenger', | ||
| 68 | 'gnunet-messenger.c', | ||
| 69 | dependencies: [libgnunetmessenger_dep, | ||
| 70 | libgnunetutil_dep], | ||
| 71 | include_directories: [incdir, configuration_inc], | ||
| 72 | install: true, | ||
| 73 | install_dir: get_option('bindir')) | ||
| 74 | executable ('gnunet-service-messenger', | 66 | executable ('gnunet-service-messenger', |
| 75 | gnunetservicemessenger_src, | 67 | gnunetservicemessenger_src, |
| 76 | dependencies: [libgnunetmessenger_dep, | 68 | dependencies: [libgnunetmessenger_dep, |
diff --git a/src/service/namecache/meson.build b/src/service/namecache/meson.build index ee6988a99..72dafcd9d 100644 --- a/src/service/namecache/meson.build +++ b/src/service/namecache/meson.build | |||
| @@ -14,7 +14,6 @@ if get_option('monolith') | |||
| 14 | foreach p : libgnunetnamecache_src + gnunetservicenamecache_src | 14 | foreach p : libgnunetnamecache_src + gnunetservicenamecache_src |
| 15 | gnunet_src += 'namecache/' + p | 15 | gnunet_src += 'namecache/' + p |
| 16 | endforeach | 16 | endforeach |
| 17 | subdir_done() | ||
| 18 | endif | 17 | endif |
| 19 | 18 | ||
| 20 | libgnunetnamecache = library('gnunetnamecache', | 19 | libgnunetnamecache = library('gnunetnamecache', |
| @@ -30,37 +29,6 @@ libgnunetnamecache_dep = declare_dependency(link_with : libgnunetnamecache) | |||
| 30 | pkg.generate(libgnunetnamecache, url: 'https://www.gnunet.org', | 29 | pkg.generate(libgnunetnamecache, url: 'https://www.gnunet.org', |
| 31 | description : 'Provides API for storing GNS records to a cache') | 30 | description : 'Provides API for storing GNS records to a cache') |
| 32 | 31 | ||
| 33 | shared_module('gnunet_plugin_namecache_sqlite', | ||
| 34 | ['plugin_namecache_sqlite.c'], | ||
| 35 | dependencies: [libgnunetutil_dep, | ||
| 36 | libgnunetgnsrecord_dep, | ||
| 37 | sqlite_dep, | ||
| 38 | libgnunetsq_dep], | ||
| 39 | include_directories: [incdir, configuration_inc], | ||
| 40 | install: true, | ||
| 41 | install_dir: get_option('libdir')/'gnunet') | ||
| 42 | |||
| 43 | if pq_dep.found() | ||
| 44 | shared_module('gnunet_plugin_namecache_postgres', | ||
| 45 | ['plugin_namecache_postgres.c'], | ||
| 46 | dependencies: [libgnunetutil_dep, | ||
| 47 | libgnunetgnsrecord_dep, | ||
| 48 | pq_dep, | ||
| 49 | libgnunetpq_dep], | ||
| 50 | include_directories: [incdir, configuration_inc], | ||
| 51 | install: true, | ||
| 52 | install_dir: get_option('libdir')/'gnunet') | ||
| 53 | endif | ||
| 54 | |||
| 55 | executable ('gnunet-namecache', | ||
| 56 | gnunetnamecache_src, | ||
| 57 | dependencies: [libgnunetnamecache_dep, | ||
| 58 | libgnunetutil_dep, | ||
| 59 | libgnunetgnsrecord_dep, | ||
| 60 | libgnunetidentity_dep], | ||
| 61 | include_directories: [incdir, configuration_inc], | ||
| 62 | install: true, | ||
| 63 | install_dir: get_option('bindir')) | ||
| 64 | executable ('gnunet-service-namecache', | 32 | executable ('gnunet-service-namecache', |
| 65 | gnunetservicenamecache_src, | 33 | gnunetservicenamecache_src, |
| 66 | dependencies: [libgnunetnamecache_dep, | 34 | dependencies: [libgnunetnamecache_dep, |
diff --git a/src/service/namestore/meson.build b/src/service/namestore/meson.build index fd7cfe553..879eaef09 100644 --- a/src/service/namestore/meson.build +++ b/src/service/namestore/meson.build | |||
| @@ -12,10 +12,9 @@ configure_file(input : 'namestore.conf.in', | |||
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | if get_option('monolith') | 14 | if get_option('monolith') |
| 15 | foreach p : libgnunetnamestore_src + libgnunetpluginnamestore_sqlite_src + gnunetservicenamestore_src | 15 | foreach p : libgnunetnamestore_src + gnunetservicenamestore_src |
| 16 | gnunet_src += 'namestore/' + p | 16 | gnunet_src += 'namestore/' + p |
| 17 | endforeach | 17 | endforeach |
| 18 | subdir_done() | ||
| 19 | endif | 18 | endif |
| 20 | 19 | ||
| 21 | libgnunetnamestore = library('gnunetnamestore', | 20 | libgnunetnamestore = library('gnunetnamestore', |
| @@ -32,85 +31,6 @@ libgnunetnamestore_dep = declare_dependency(link_with : libgnunetnamestore) | |||
| 32 | pkg.generate(libgnunetnamestore, url: 'https://www.gnunet.org', | 31 | pkg.generate(libgnunetnamestore, url: 'https://www.gnunet.org', |
| 33 | description : 'Provides API for storing GNS records to a database') | 32 | description : 'Provides API for storing GNS records to a database') |
| 34 | 33 | ||
| 35 | shared_module('gnunet_plugin_rest_namestore', | ||
| 36 | ['plugin_rest_namestore.c'], | ||
| 37 | dependencies: [libgnunetrest_dep, | ||
| 38 | libgnunetidentity_dep, | ||
| 39 | libgnunetgnsrecordjson_dep, | ||
| 40 | libgnunetgnsrecord_dep, | ||
| 41 | libgnunetnamestore_dep, | ||
| 42 | libgnunetjson_dep, | ||
| 43 | libgnunetutil_dep, | ||
| 44 | json_dep, | ||
| 45 | mhd_dep], | ||
| 46 | include_directories: [incdir, configuration_inc], | ||
| 47 | install: true, | ||
| 48 | install_dir: get_option('libdir') / 'gnunet') | ||
| 49 | |||
| 50 | |||
| 51 | shared_module('gnunet_plugin_namestore_sqlite', | ||
| 52 | libgnunetpluginnamestore_sqlite_src, | ||
| 53 | dependencies: [libgnunetutil_dep, | ||
| 54 | libgnunetgnsrecord_dep, | ||
| 55 | libgnunetidentity_dep, | ||
| 56 | libgnunetsq_dep, | ||
| 57 | libgnunetstatistics_dep, | ||
| 58 | sqlite_dep], | ||
| 59 | include_directories: [incdir, configuration_inc], | ||
| 60 | install: true, | ||
| 61 | install_dir: get_option('libdir')/'gnunet') | ||
| 62 | |||
| 63 | if pq_dep.found() | ||
| 64 | shared_module('gnunet_plugin_namestore_postgres', | ||
| 65 | ['plugin_namestore_postgres.c'], | ||
| 66 | dependencies: [libgnunetutil_dep, | ||
| 67 | libgnunetgnsrecord_dep, | ||
| 68 | libgnunetidentity_dep, | ||
| 69 | libgnunetpq_dep, | ||
| 70 | libgnunetstatistics_dep, | ||
| 71 | pq_dep], | ||
| 72 | include_directories: [incdir, configuration_inc], | ||
| 73 | install: true, | ||
| 74 | install_dir: get_option('libdir')/'gnunet') | ||
| 75 | endif | ||
| 76 | |||
| 77 | executable ('gnunet-namestore', | ||
| 78 | gnunetnamestore_src, | ||
| 79 | dependencies: [libgnunetnamestore_dep, | ||
| 80 | libgnunetutil_dep, | ||
| 81 | libgnunetgnsrecord_dep, | ||
| 82 | libgnunetidentity_dep], | ||
| 83 | include_directories: [incdir, configuration_inc], | ||
| 84 | install: true, | ||
| 85 | install_dir: get_option('bindir')) | ||
| 86 | executable ('gnunet-namestore-dbtool', | ||
| 87 | ['gnunet-namestore-dbtool.c'], | ||
| 88 | dependencies: [libgnunetnamestore_dep, | ||
| 89 | libgnunetutil_dep, | ||
| 90 | libgnunetgnsrecord_dep, | ||
| 91 | libgnunetidentity_dep], | ||
| 92 | include_directories: [incdir, configuration_inc], | ||
| 93 | install: true, | ||
| 94 | install_dir: get_option('bindir')) | ||
| 95 | executable ('gnunet-namestore-zonefile', | ||
| 96 | ['gnunet-namestore-zonefile.c'], | ||
| 97 | dependencies: [libgnunetnamestore_dep, | ||
| 98 | libgnunetutil_dep, | ||
| 99 | libgnunetgnsrecord_dep, | ||
| 100 | libgnunetidentity_dep], | ||
| 101 | include_directories: [incdir, configuration_inc], | ||
| 102 | install: true, | ||
| 103 | install_dir: get_option('bindir')) | ||
| 104 | executable ('gnunet-zoneimport', | ||
| 105 | ['gnunet-zoneimport.c'], | ||
| 106 | dependencies: [libgnunetnamestore_dep, | ||
| 107 | libgnunetutil_dep, | ||
| 108 | libgnunetstatistics_dep, | ||
| 109 | libgnunetgnsrecord_dep, | ||
| 110 | libgnunetidentity_dep], | ||
| 111 | include_directories: [incdir, configuration_inc], | ||
| 112 | install: true, | ||
| 113 | install_dir: get_option('bindir')) | ||
| 114 | executable ('gnunet-service-namestore', | 34 | executable ('gnunet-service-namestore', |
| 115 | gnunetservicenamestore_src, | 35 | gnunetservicenamestore_src, |
| 116 | dependencies: [libgnunetnamestore_dep, | 36 | dependencies: [libgnunetnamestore_dep, |
diff --git a/src/service/nat-auto/meson.build b/src/service/nat-auto/meson.build index 9b5ff4cdf..f0e780254 100644 --- a/src/service/nat-auto/meson.build +++ b/src/service/nat-auto/meson.build | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | libgnunetnatauto_src = ['nat_auto_api.c', | 1 | libgnunetnatauto_src = ['nat_auto_api.c', |
| 2 | 'nat_auto_api_test.c'] | 2 | 'nat_auto_api_test.c'] |
| 3 | 3 | ||
| 4 | gnunetservernat_src = ['gnunet-nat-server.c'] | ||
| 5 | gnunetservicenatauto_src = ['gnunet-service-nat-auto.c'] | 4 | gnunetservicenatauto_src = ['gnunet-service-nat-auto.c'] |
| 6 | 5 | ||
| 7 | configure_file(input : 'nat-auto.conf.in', | 6 | configure_file(input : 'nat-auto.conf.in', |
| @@ -11,10 +10,9 @@ configure_file(input : 'nat-auto.conf.in', | |||
| 11 | install_dir: pkgcfgdir) | 10 | install_dir: pkgcfgdir) |
| 12 | 11 | ||
| 13 | if get_option('monolith') | 12 | if get_option('monolith') |
| 14 | foreach p : libgnunetnatauto_src + gnunetservernat_src + gnunetservicenatauto_src | 13 | foreach p : libgnunetnatauto_src + gnunetservicenatauto_src |
| 15 | gnunet_src += 'nat-auto/' + p | 14 | gnunet_src += 'nat-auto/' + p |
| 16 | endforeach | 15 | endforeach |
| 17 | subdir_done() | ||
| 18 | endif | 16 | endif |
| 19 | 17 | ||
| 20 | libgnunetnatauto = library('gnunetnatauto', | 18 | libgnunetnatauto = library('gnunetnatauto', |
| @@ -27,19 +25,6 @@ libgnunetnatauto = library('gnunetnatauto', | |||
| 27 | install_dir: get_option('libdir')) | 25 | install_dir: get_option('libdir')) |
| 28 | libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto) | 26 | libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto) |
| 29 | 27 | ||
| 30 | executable ('gnunet-nat-auto', | ||
| 31 | ['gnunet-nat-auto.c'], | ||
| 32 | dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, | ||
| 33 | libgnunetnat_dep], | ||
| 34 | include_directories: [incdir, configuration_inc], | ||
| 35 | install: true, | ||
| 36 | install_dir: get_option('bindir')) | ||
| 37 | executable ('gnunet-nat-server', | ||
| 38 | gnunetservernat_src, | ||
| 39 | dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, libgnunetnat_dep], | ||
| 40 | include_directories: [incdir, configuration_inc], | ||
| 41 | install: true, | ||
| 42 | install_dir: get_option('bindir')) | ||
| 43 | executable ('gnunet-service-nat-auto', | 28 | executable ('gnunet-service-nat-auto', |
| 44 | gnunetservicenatauto_src, | 29 | gnunetservicenatauto_src, |
| 45 | dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, | 30 | dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, |
diff --git a/src/service/nat/meson.build b/src/service/nat/meson.build index e629f6411..6cf204d34 100644 --- a/src/service/nat/meson.build +++ b/src/service/nat/meson.build | |||
| @@ -19,7 +19,6 @@ if get_option('monolith') | |||
| 19 | foreach p : libgnunetnat_src + gnunetservicenat_src | 19 | foreach p : libgnunetnat_src + gnunetservicenat_src |
| 20 | gnunet_src += 'nat/' + p | 20 | gnunet_src += 'nat/' + p |
| 21 | endforeach | 21 | endforeach |
| 22 | subdir_done() | ||
| 23 | endif | 22 | endif |
| 24 | 23 | ||
| 25 | libgnunetnat = library('gnunetnat', | 24 | libgnunetnat = library('gnunetnat', |
| @@ -44,13 +43,6 @@ libgnunetnat = library('gnunetnatnew', | |||
| 44 | install_dir: get_option('libdir')) | 43 | install_dir: get_option('libdir')) |
| 45 | libgnunetnat_dep = declare_dependency(link_with : libgnunetnat) | 44 | libgnunetnat_dep = declare_dependency(link_with : libgnunetnat) |
| 46 | 45 | ||
| 47 | executable ('gnunet-nat', | ||
| 48 | ['gnunet-nat.c'], | ||
| 49 | dependencies: [libgnunetnat_dep, libgnunetutil_dep], | ||
| 50 | include_directories: [incdir, configuration_inc], | ||
| 51 | install: true, | ||
| 52 | install_dir: get_option('bindir')) | ||
| 53 | |||
| 54 | executable ('gnunet-service-nat', | 46 | executable ('gnunet-service-nat', |
| 55 | gnunetservicenat_src, | 47 | gnunetservicenat_src, |
| 56 | dependencies: [libgnunetnat_dep, libgnunetutil_dep, | 48 | dependencies: [libgnunetnat_dep, libgnunetutil_dep, |
diff --git a/src/service/nse/meson.build b/src/service/nse/meson.build index 7490214a3..146cedcf9 100644 --- a/src/service/nse/meson.build +++ b/src/service/nse/meson.build | |||
| @@ -13,7 +13,6 @@ if get_option('monolith') | |||
| 13 | foreach p : libgnunetnse_src + gnunetservicense_src | 13 | foreach p : libgnunetnse_src + gnunetservicense_src |
| 14 | gnunet_src += 'nse/' + p | 14 | gnunet_src += 'nse/' + p |
| 15 | endforeach | 15 | endforeach |
| 16 | subdir_done() | ||
| 17 | endif | 16 | endif |
| 18 | 17 | ||
| 19 | libgnunetnse = library('gnunetnse', | 18 | libgnunetnse = library('gnunetnse', |
| @@ -28,13 +27,6 @@ libgnunetnse_dep = declare_dependency(link_with : libgnunetnse) | |||
| 28 | pkg.generate(libgnunetnse, url: 'https://www.gnunet.org', | 27 | pkg.generate(libgnunetnse, url: 'https://www.gnunet.org', |
| 29 | description : 'Provides API for accessing the NSE service') | 28 | description : 'Provides API for accessing the NSE service') |
| 30 | 29 | ||
| 31 | executable ('gnunet-nse', | ||
| 32 | ['gnunet-nse.c'], | ||
| 33 | dependencies: [libgnunetnse_dep, m_dep, libgnunetutil_dep], | ||
| 34 | include_directories: [incdir, configuration_inc], | ||
| 35 | install: true, | ||
| 36 | install_dir: get_option('bindir')) | ||
| 37 | |||
| 38 | executable ('gnunet-service-nse', | 30 | executable ('gnunet-service-nse', |
| 39 | gnunetservicense_src, | 31 | gnunetservicense_src, |
| 40 | dependencies: [libgnunetnse_dep, libgnunetutil_dep, | 32 | dependencies: [libgnunetnse_dep, libgnunetutil_dep, |
diff --git a/src/service/peerstore/meson.build b/src/service/peerstore/meson.build index 6c9853852..7d8710c4b 100644 --- a/src/service/peerstore/meson.build +++ b/src/service/peerstore/meson.build | |||
| @@ -14,7 +14,6 @@ if get_option('monolith') | |||
| 14 | foreach p : libgnunetpeerstore_src + gnunetservicepeerstore_src | 14 | foreach p : libgnunetpeerstore_src + gnunetservicepeerstore_src |
| 15 | gnunet_src += 'peerstore/' + p | 15 | gnunet_src += 'peerstore/' + p |
| 16 | endforeach | 16 | endforeach |
| 17 | subdir_done() | ||
| 18 | endif | 17 | endif |
| 19 | 18 | ||
| 20 | libgnunetpeerstore = library('gnunetpeerstore', | 19 | libgnunetpeerstore = library('gnunetpeerstore', |
diff --git a/src/service/reclaim/meson.build b/src/service/reclaim/meson.build index fafc68a92..17f83f204 100644 --- a/src/service/reclaim/meson.build +++ b/src/service/reclaim/meson.build | |||
| @@ -18,7 +18,6 @@ if get_option('monolith') | |||
| 18 | foreach p : libgnunetreclaim_src + gnunetservicereclaim_src | 18 | foreach p : libgnunetreclaim_src + gnunetservicereclaim_src |
| 19 | gnunet_src += 'reclaim/' + p | 19 | gnunet_src += 'reclaim/' + p |
| 20 | endforeach | 20 | endforeach |
| 21 | subdir_done() | ||
| 22 | endif | 21 | endif |
| 23 | 22 | ||
| 24 | libgnunetreclaim = library('gnunetreclaim', | 23 | libgnunetreclaim = library('gnunetreclaim', |
| @@ -34,13 +33,6 @@ libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim) | |||
| 34 | pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org', | 33 | pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org', |
| 35 | description : 'Provides API to access reclaimID') | 34 | description : 'Provides API to access reclaimID') |
| 36 | 35 | ||
| 37 | shared_module('gnunet_plugin_gnsrecord_reclaim', | ||
| 38 | ['plugin_gnsrecord_reclaim.c'], | ||
| 39 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep], | ||
| 40 | include_directories: [incdir, configuration_inc], | ||
| 41 | install: true, | ||
| 42 | install_dir: get_option('libdir')/'gnunet') | ||
| 43 | |||
| 44 | libgnunetdid = library('gnunetdid', | 36 | libgnunetdid = library('gnunetdid', |
| 45 | libgnunetdid_src, | 37 | libgnunetdid_src, |
| 46 | soversion: '0', | 38 | soversion: '0', |
| @@ -58,77 +50,6 @@ libgnunetdid_dep = declare_dependency(link_with : libgnunetdid) | |||
| 58 | pkg.generate(libgnunetdid, url: 'https://www.gnunet.org', | 50 | pkg.generate(libgnunetdid, url: 'https://www.gnunet.org', |
| 59 | description : 'Provides API to manipulate DID') | 51 | description : 'Provides API to manipulate DID') |
| 60 | 52 | ||
| 61 | shared_module('gnunet_plugin_rest_reclaim', | ||
| 62 | ['plugin_rest_reclaim.c', 'json_reclaim.c'], | ||
| 63 | dependencies: [libgnunetrest_dep, | ||
| 64 | libgnunetidentity_dep, | ||
| 65 | libgnunetreclaim_dep, | ||
| 66 | libgnunetjson_dep, | ||
| 67 | libgnunetutil_dep, | ||
| 68 | json_dep, | ||
| 69 | mhd_dep], | ||
| 70 | include_directories: [incdir, configuration_inc], | ||
| 71 | install: true, | ||
| 72 | install_dir: get_option('libdir') / 'gnunet') | ||
| 73 | shared_module('gnunet_plugin_reclaim_attribute_basic', | ||
| 74 | ['plugin_reclaim_attribute_basic.c'], | ||
| 75 | dependencies: [libgnunetrest_dep, | ||
| 76 | libgnunetidentity_dep, | ||
| 77 | libgnunetreclaim_dep, | ||
| 78 | libgnunetjson_dep, | ||
| 79 | libgnunetutil_dep, | ||
| 80 | json_dep], | ||
| 81 | include_directories: [incdir, configuration_inc], | ||
| 82 | install: true, | ||
| 83 | install_dir: get_option('libdir') / 'gnunet') | ||
| 84 | shared_module('gnunet_plugin_reclaim_credential_jwt', | ||
| 85 | ['plugin_reclaim_credential_jwt.c'], | ||
| 86 | dependencies: [libgnunetrest_dep, | ||
| 87 | libgnunetidentity_dep, | ||
| 88 | libgnunetreclaim_dep, | ||
| 89 | libgnunetjson_dep, | ||
| 90 | libgnunetutil_dep, | ||
| 91 | json_dep], | ||
| 92 | include_directories: [incdir, configuration_inc], | ||
| 93 | install: true, | ||
| 94 | install_dir: get_option('libdir') / 'gnunet') | ||
| 95 | |||
| 96 | |||
| 97 | shared_module('gnunet_plugin_rest_openid_connect', | ||
| 98 | ['plugin_rest_openid_connect.c', 'oidc_helper.c'], | ||
| 99 | dependencies: [libgnunetrest_dep, | ||
| 100 | libgnunetreclaim_dep, | ||
| 101 | libgnunetidentity_dep, | ||
| 102 | libgnunetgns_dep, | ||
| 103 | libgnunetutil_dep, | ||
| 104 | jose_dep, | ||
| 105 | gcrypt_dep, | ||
| 106 | json_dep, | ||
| 107 | mhd_dep], | ||
| 108 | include_directories: [incdir, configuration_inc], | ||
| 109 | install: true, | ||
| 110 | install_dir: get_option('libdir') / 'gnunet') | ||
| 111 | |||
| 112 | |||
| 113 | executable ('gnunet-reclaim', | ||
| 114 | 'gnunet-reclaim.c', | ||
| 115 | dependencies: [libgnunetreclaim_dep, | ||
| 116 | libgnunetidentity_dep, | ||
| 117 | libgnunetutil_dep], | ||
| 118 | include_directories: [incdir, configuration_inc], | ||
| 119 | install: true, | ||
| 120 | install_dir: get_option('bindir')) | ||
| 121 | executable ('gnunet-did', | ||
| 122 | 'gnunet-did.c', | ||
| 123 | dependencies: [libgnunetreclaim_dep, | ||
| 124 | libgnunetdid_dep, | ||
| 125 | libgnunetgns_dep, | ||
| 126 | libgnunetnamestore_dep, | ||
| 127 | libgnunetidentity_dep, | ||
| 128 | libgnunetutil_dep], | ||
| 129 | include_directories: [incdir, configuration_inc], | ||
| 130 | install: true, | ||
| 131 | install_dir: get_option('bindir')) | ||
| 132 | executable ('gnunet-service-reclaim', | 53 | executable ('gnunet-service-reclaim', |
| 133 | gnunetservicereclaim_src, | 54 | gnunetservicereclaim_src, |
| 134 | dependencies: [libgnunetreclaim_dep, | 55 | dependencies: [libgnunetreclaim_dep, |
diff --git a/src/service/regex/meson.build b/src/service/regex/meson.build index 24bc8e31e..da607ca47 100644 --- a/src/service/regex/meson.build +++ b/src/service/regex/meson.build | |||
| @@ -17,7 +17,6 @@ if get_option('monolith') | |||
| 17 | foreach p : libgnunetregex_src + libgnunetregexblock_src + gnunetserviceregex_src | 17 | foreach p : libgnunetregex_src + libgnunetregexblock_src + gnunetserviceregex_src |
| 18 | gnunet_src += 'regex/' + p | 18 | gnunet_src += 'regex/' + p |
| 19 | endforeach | 19 | endforeach |
| 20 | subdir_done() | ||
| 21 | endif | 20 | endif |
| 22 | 21 | ||
| 23 | libgnunetregex = library('gnunetregex', | 22 | libgnunetregex = library('gnunetregex', |
diff --git a/src/service/rest/meson.build b/src/service/rest/meson.build index 2dd3d8de4..316724fdb 100644 --- a/src/service/rest/meson.build +++ b/src/service/rest/meson.build | |||
| @@ -13,7 +13,6 @@ if get_option('monolith') | |||
| 13 | foreach p : libgnunetrest_src + gnunetservicerest_src | 13 | foreach p : libgnunetrest_src + gnunetservicerest_src |
| 14 | gnunet_src += 'rest/' + p | 14 | gnunet_src += 'rest/' + p |
| 15 | endforeach | 15 | endforeach |
| 16 | subdir_done() | ||
| 17 | endif | 16 | endif |
| 18 | 17 | ||
| 19 | 18 | ||
| @@ -29,26 +28,6 @@ pkg.generate(libgnunetrest, url: 'https://www.gnunet.org', | |||
| 29 | description : 'Provides API for accessing the REST service') | 28 | description : 'Provides API for accessing the REST service') |
| 30 | libgnunetrest_dep = declare_dependency(link_with : libgnunetrest) | 29 | libgnunetrest_dep = declare_dependency(link_with : libgnunetrest) |
| 31 | 30 | ||
| 32 | shared_module('gnunet_plugin_rest_config', | ||
| 33 | ['plugin_rest_config.c'], | ||
| 34 | dependencies: [libgnunetrest_dep, | ||
| 35 | libgnunetutil_dep, | ||
| 36 | json_dep, | ||
| 37 | mhd_dep], | ||
| 38 | include_directories: [incdir, configuration_inc], | ||
| 39 | install: true, | ||
| 40 | install_dir: get_option('libdir') / 'gnunet') | ||
| 41 | shared_module('gnunet_plugin_rest_copying', | ||
| 42 | ['plugin_rest_copying.c'], | ||
| 43 | dependencies: [libgnunetrest_dep, | ||
| 44 | libgnunetutil_dep, | ||
| 45 | json_dep, | ||
| 46 | mhd_dep], | ||
| 47 | include_directories: [incdir, configuration_inc], | ||
| 48 | install: true, | ||
| 49 | install_dir: get_option('libdir') / 'gnunet') | ||
| 50 | |||
| 51 | |||
| 52 | executable ('gnunet-rest-server', | 31 | executable ('gnunet-rest-server', |
| 53 | gnunetservicerest_src, | 32 | gnunetservicerest_src, |
| 54 | dependencies: [libgnunetrest_dep, libgnunetutil_dep, mhd_dep], | 33 | dependencies: [libgnunetrest_dep, libgnunetutil_dep, mhd_dep], |
diff --git a/src/service/revocation/meson.build b/src/service/revocation/meson.build index 9a526af36..14e352ffa 100644 --- a/src/service/revocation/meson.build +++ b/src/service/revocation/meson.build | |||
| @@ -13,7 +13,6 @@ if get_option('monolith') | |||
| 13 | foreach p : libgnunetrevocation_src + gnunetservicerevocation_src | 13 | foreach p : libgnunetrevocation_src + gnunetservicerevocation_src |
| 14 | gnunet_src += 'revocation/' + p | 14 | gnunet_src += 'revocation/' + p |
| 15 | endforeach | 15 | endforeach |
| 16 | subdir_done() | ||
| 17 | endif | 16 | endif |
| 18 | 17 | ||
| 19 | libgnunetrevocation = library('gnunetrevocation', | 18 | libgnunetrevocation = library('gnunetrevocation', |
| @@ -28,27 +27,6 @@ libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation) | |||
| 28 | pkg.generate(libgnunetrevocation, url: 'https://www.gnunet.org', | 27 | pkg.generate(libgnunetrevocation, url: 'https://www.gnunet.org', |
| 29 | description : 'Provides API to perform key revocation in GNUnet') | 28 | description : 'Provides API to perform key revocation in GNUnet') |
| 30 | 29 | ||
| 31 | shared_module('gnunet_plugin_block_revocation', | ||
| 32 | ['plugin_block_revocation.c'], | ||
| 33 | dependencies: [libgnunetutil_dep, | ||
| 34 | libgnunetidentity_dep, | ||
| 35 | libgnunetrevocation_dep, | ||
| 36 | libgnunetblock_dep], | ||
| 37 | include_directories: [incdir, configuration_inc], | ||
| 38 | install: true, | ||
| 39 | install_dir: get_option('libdir')/'gnunet') | ||
| 40 | |||
| 41 | executable ('gnunet-revocation', | ||
| 42 | ['gnunet-revocation.c'], | ||
| 43 | dependencies: [libgnunetrevocation_dep, | ||
| 44 | libgnunetutil_dep, | ||
| 45 | libgnunetstatistics_dep, | ||
| 46 | libgnunetcore_dep, | ||
| 47 | libgnunetsetu_dep, | ||
| 48 | libgnunetidentity_dep], | ||
| 49 | include_directories: [incdir, configuration_inc], | ||
| 50 | install: true, | ||
| 51 | install_dir: get_option('bindir')) | ||
| 52 | executable ('gnunet-service-revocation', | 30 | executable ('gnunet-service-revocation', |
| 53 | gnunetservicerevocation_src, | 31 | gnunetservicerevocation_src, |
| 54 | dependencies: [libgnunetrevocation_dep, | 32 | dependencies: [libgnunetrevocation_dep, |
diff --git a/src/service/seti/meson.build b/src/service/seti/meson.build index e5d3812ce..8538917d8 100644 --- a/src/service/seti/meson.build +++ b/src/service/seti/meson.build | |||
| @@ -13,7 +13,6 @@ if get_option('monolith') | |||
| 13 | foreach p : libgnunetseti_src + gnunetserviceseti_src | 13 | foreach p : libgnunetseti_src + gnunetserviceseti_src |
| 14 | gnunet_src += 'seti/' + p | 14 | gnunet_src += 'seti/' + p |
| 15 | endforeach | 15 | endforeach |
| 16 | subdir_done() | ||
| 17 | endif | 16 | endif |
| 18 | 17 | ||
| 19 | libgnunetseti = library('gnunetseti', | 18 | libgnunetseti = library('gnunetseti', |
diff --git a/src/service/setu/meson.build b/src/service/setu/meson.build index fe5611fd2..974f16274 100644 --- a/src/service/setu/meson.build +++ b/src/service/setu/meson.build | |||
| @@ -15,7 +15,6 @@ if get_option('monolith') | |||
| 15 | foreach p : libgnunetsetu_src + gnunetservicesetu_src | 15 | foreach p : libgnunetsetu_src + gnunetservicesetu_src |
| 16 | gnunet_src += 'setu/' + p | 16 | gnunet_src += 'setu/' + p |
| 17 | endforeach | 17 | endforeach |
| 18 | subdir_done() | ||
| 19 | endif | 18 | endif |
| 20 | 19 | ||
| 21 | libgnunetsetu = library('gnunetsetu', | 20 | libgnunetsetu = library('gnunetsetu', |
diff --git a/src/service/statistics/meson.build b/src/service/statistics/meson.build index 14cdb0ac3..9c4d8c649 100644 --- a/src/service/statistics/meson.build +++ b/src/service/statistics/meson.build | |||
| @@ -13,7 +13,6 @@ if get_option('monolith') | |||
| 13 | foreach p : libgnunetstatistics_src + gnunetservicestatistics_src | 13 | foreach p : libgnunetstatistics_src + gnunetservicestatistics_src |
| 14 | gnunet_src += 'statistics/' + p | 14 | gnunet_src += 'statistics/' + p |
| 15 | endforeach | 15 | endforeach |
| 16 | subdir_done() | ||
| 17 | endif | 16 | endif |
| 18 | 17 | ||
| 19 | libgnunetstatistics = library('gnunetstatistics', | 18 | libgnunetstatistics = library('gnunetstatistics', |
| @@ -34,11 +33,3 @@ executable ('gnunet-service-statistics', | |||
| 34 | include_directories: [incdir, configuration_inc], | 33 | include_directories: [incdir, configuration_inc], |
| 35 | install: true, | 34 | install: true, |
| 36 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | 35 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') |
| 37 | executable ('gnunet-statistics', | ||
| 38 | ['gnunet-statistics.c'], | ||
| 39 | dependencies: [libgnunetstatistics_dep, libgnunetutil_dep], | ||
| 40 | include_directories: [incdir, configuration_inc], | ||
| 41 | install: true, | ||
| 42 | install_dir: get_option('bindir')) | ||
| 43 | |||
| 44 | |||
diff --git a/src/service/testing/meson.build b/src/service/testing/meson.build index 68b5f5149..7e2069fb0 100644 --- a/src/service/testing/meson.build +++ b/src/service/testing/meson.build | |||
| @@ -27,13 +27,6 @@ configure_file(input : 'testing.conf', | |||
| 27 | install_dir: pkgcfgdir) | 27 | install_dir: pkgcfgdir) |
| 28 | 28 | ||
| 29 | 29 | ||
| 30 | if get_option('monolith') | ||
| 31 | # foreach p : libgnunettesting_src | ||
| 32 | # gnunet_src += 'testing/' + p | ||
| 33 | # endforeach | ||
| 34 | subdir_done() | ||
| 35 | endif | ||
| 36 | |||
| 37 | libgnunettesting = library('gnunettesting', | 30 | libgnunettesting = library('gnunettesting', |
| 38 | libgnunettesting_src, | 31 | libgnunettesting_src, |
| 39 | soversion: '1', | 32 | soversion: '1', |
diff --git a/src/service/transport/meson.build b/src/service/transport/meson.build index 65a2beeb3..4f8b592fd 100644 --- a/src/service/transport/meson.build +++ b/src/service/transport/meson.build | |||
| @@ -24,7 +24,6 @@ if get_option('monolith') | |||
| 24 | foreach p : libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src | 24 | foreach p : libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src |
| 25 | gnunet_src += 'transport/' + p | 25 | gnunet_src += 'transport/' + p |
| 26 | endforeach | 26 | endforeach |
| 27 | subdir_done() | ||
| 28 | endif | 27 | endif |
| 29 | 28 | ||
| 30 | libgnunettransportapplication = library('gnunettransportapplication', | 29 | libgnunettransportapplication = library('gnunettransportapplication', |
diff --git a/src/service/util/Makefile.am b/src/service/util/Makefile.am index ecd1f5e1b..990c2b41d 100644 --- a/src/service/util/Makefile.am +++ b/src/service/util/Makefile.am | |||
| @@ -7,6 +7,9 @@ libexecdir= $(pkglibdir)/libexec/ | |||
| 7 | 7 | ||
| 8 | pkgcfgdir= $(pkgdatadir)/config.d/ | 8 | pkgcfgdir= $(pkgdatadir)/config.d/ |
| 9 | 9 | ||
| 10 | pkgcfg_DATA = \ | ||
| 11 | resolver.conf | ||
| 12 | |||
| 10 | if USE_COVERAGE | 13 | if USE_COVERAGE |
| 11 | AM_CFLAGS = --coverage -O0 | 14 | AM_CFLAGS = --coverage -O0 |
| 12 | XLIB = -lgcov | 15 | XLIB = -lgcov |
diff --git a/src/service/util/meson.build b/src/service/util/meson.build new file mode 100644 index 000000000..a7199fa4b --- /dev/null +++ b/src/service/util/meson.build | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | gnunetserviceresolver_src = ['gnunet-service-resolver.c'] | ||
| 2 | |||
| 3 | configure_file(input : 'resolver.conf.in', | ||
| 4 | output : 'resolver.conf', | ||
| 5 | configuration : cdata, | ||
| 6 | install: true, | ||
| 7 | install_dir: pkgcfgdir) | ||
| 8 | |||
| 9 | |||
| 10 | if get_option('monolith') | ||
| 11 | foreach p : gnunetserviceresolver_src | ||
| 12 | gnunet_src += 'util/' + p | ||
| 13 | endforeach | ||
| 14 | endif | ||
| 15 | |||
| 16 | executable ('gnunet-service-resolver', | ||
| 17 | gnunetserviceresolver_src, | ||
| 18 | dependencies: [libgnunetutil_dep], | ||
| 19 | include_directories: [incdir, configuration_inc], | ||
| 20 | install: true, | ||
| 21 | install_dir: get_option('libdir') / 'gnunet' / 'libexec') | ||
diff --git a/src/lib/util/resolver.conf.in b/src/service/util/resolver.conf.in index 6e2b9a869..6e2b9a869 100644 --- a/src/lib/util/resolver.conf.in +++ b/src/service/util/resolver.conf.in | |||
diff --git a/src/service/vpn/meson.build b/src/service/vpn/meson.build index e77b88432..ededbc68e 100644 --- a/src/service/vpn/meson.build +++ b/src/service/vpn/meson.build | |||
| @@ -15,7 +15,6 @@ if get_option('monolith') | |||
| 15 | foreach p : libgnunetvpn_src + gnunetservicevpn_src | 15 | foreach p : libgnunetvpn_src + gnunetservicevpn_src |
| 16 | gnunet_src += 'vpn/' + p | 16 | gnunet_src += 'vpn/' + p |
| 17 | endforeach | 17 | endforeach |
| 18 | subdir_done() | ||
| 19 | endif | 18 | endif |
| 20 | 19 | ||
| 21 | libgnunetvpn = library('gnunetvpn', | 20 | libgnunetvpn = library('gnunetvpn', |
| @@ -30,19 +29,6 @@ pkg.generate(libgnunetvpn, url: 'https://www.gnunet.org', | |||
| 30 | description : 'Provides API for accessing the VPN service') | 29 | description : 'Provides API for accessing the VPN service') |
| 31 | libgnunetvpn_dep = declare_dependency(link_with : libgnunetvpn) | 30 | libgnunetvpn_dep = declare_dependency(link_with : libgnunetvpn) |
| 32 | 31 | ||
| 33 | executable ('gnunet-vpn', | ||
| 34 | ['gnunet-vpn.c'], | ||
| 35 | dependencies: [libgnunetvpn_dep, | ||
| 36 | libgnunetutil_dep, | ||
| 37 | libgnunetstatistics_dep, | ||
| 38 | libgnunetregex_dep, | ||
| 39 | libgnunetcore_dep, | ||
| 40 | libgnunetcadet_dep, | ||
| 41 | libgnunetblock_dep], | ||
| 42 | include_directories: [incdir, configuration_inc, exitdir], | ||
| 43 | install: true, | ||
| 44 | install_dir: get_option('bindir')) | ||
| 45 | |||
| 46 | executable ('gnunet-service-vpn', | 32 | executable ('gnunet-service-vpn', |
| 47 | gnunetservicevpn_src, | 33 | gnunetservicevpn_src, |
| 48 | dependencies: [libgnunetvpn_dep, | 34 | dependencies: [libgnunetvpn_dep, |