aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/meson.build4
-rw-r--r--src/peerinfo-tool/meson.build22
-rw-r--r--src/pq/meson.build16
-rw-r--r--src/scalarproduct/meson.build73
-rw-r--r--src/secretsharing/meson.build41
-rw-r--r--src/util/meson.build2
6 files changed, 132 insertions, 26 deletions
diff --git a/src/meson.build b/src/meson.build
index 64fa54ca0..40cc1ebbb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,7 +51,7 @@ subdir('set')
51subdir('seti') 51subdir('seti')
52subdir('setu') 52subdir('setu')
53subdir('consensus') 53subdir('consensus')
54#subdir('scalarproduct') 54subdir('scalarproduct')
55subdir('revocation') 55subdir('revocation')
56subdir('vpn') 56subdir('vpn')
57subdir('gns') 57subdir('gns')
@@ -61,7 +61,7 @@ subdir('fs')
61# TODO 61# TODO
62subdir('exit') 62subdir('exit')
63subdir('pt') 63subdir('pt')
64#subdir('secretsharing') 64subdir('secretsharing')
65subdir('reclaim') 65subdir('reclaim')
66subdir('messenger') 66subdir('messenger')
67##subdir('$(EXP_DIR)') 67##subdir('$(EXP_DIR)')
diff --git a/src/peerinfo-tool/meson.build b/src/peerinfo-tool/meson.build
index a16e9bcf0..f44121c29 100644
--- a/src/peerinfo-tool/meson.build
+++ b/src/peerinfo-tool/meson.build
@@ -1,13 +1,17 @@
1gnunetpeerinfotool_src = ['gnunet-peerinfo.c', 'gnunet-peerinfo_plugins.c'] 1gnunetpeerinfotool_src = ['gnunet-peerinfo.c', 'gnunet-peerinfo_plugins.c']
2 2
3 3
4if get_option('monolith') == false 4if get_option('monolith')
5 executable ('gnunet-peerinfo', 5 subdir_done()
6 gnunetpeerinfotool_src,
7 dependencies: [libgnunetutil_dep,
8 libgnunetpeerinfo_dep,
9 libgnunettransport_dep,
10 libgnunethello_dep,
11 libgnunetstatistics_dep],
12 include_directories: [incdir, configuration_inc])
13endif 6endif
7
8executable ('gnunet-peerinfo',
9 gnunetpeerinfotool_src,
10 dependencies: [libgnunetutil_dep,
11 libgnunetpeerinfo_dep,
12 libgnunettransport_dep,
13 libgnunethello_dep,
14 libgnunetstatistics_dep],
15 include_directories: [incdir, configuration_inc],
16 install: true,
17 install_dir: get_option('bindir'))
diff --git a/src/pq/meson.build b/src/pq/meson.build
index 273a0c0fb..7e9060b41 100644
--- a/src/pq/meson.build
+++ b/src/pq/meson.build
@@ -7,14 +7,18 @@ 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
10if get_option('monolith') == false 10if get_option('monolith')
11 libgnunetpq = library('gnunetpq',
12 libgnunetpq_src,
13 dependencies: [libgnunetutil_dep, pq_dep],
14 include_directories: [incdir, configuration_inc])
15 libgnunetpq_dep = declare_dependency(link_with : libgnunetpq)
16else 11else
17 foreach p : libgnunetpq_src 12 foreach p : libgnunetpq_src
18 gnunet_src += 'pq/' + p 13 gnunet_src += 'pq/' + p
19 endforeach 14 endforeach
15 subdir_done()
20endif 16endif
17
18libgnunetpq = library('gnunetpq',
19 libgnunetpq_src,
20 dependencies: [libgnunetutil_dep, pq_dep],
21 include_directories: [incdir, configuration_inc],
22 install: true,
23 install_dir: get_option('libdir'))
24libgnunetpq_dep = declare_dependency(link_with : libgnunetpq)
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
index 05e6d44f0..f158f9bc1 100644
--- a/src/scalarproduct/meson.build
+++ b/src/scalarproduct/meson.build
@@ -1,10 +1,9 @@
1libgnunetscalarproduct_src = ['scalarproduct_api.c'] 1libgnunetscalarproduct_src = ['scalarproduct_api.c']
2 2
3gnunetservicescalarproduct_src = ['gnunet-service-scalarproduct.c', 3gnunetservicescalarproducta_src = ['gnunet-service-scalarproduct_alice.c']
4 'gnunet-service-scalarproduct_union.c', 4gnunetservicescalarproductb_src = ['gnunet-service-scalarproduct_bob.c']
5 'gnunet-service-scalarproduct_intersection.c', 5gnunetservicescalarproductecca_src = ['gnunet-service-scalarproduct-ecc_alice.c']
6 'gnunet-service-scalarproduct_union_strata_estimator.c', 6gnunetservicescalarproducteccb_src = ['gnunet-service-scalarproduct-ecc_bob.c']
7 'ibf.c']
8 7
9configure_file(input : 'scalarproduct.conf.in', 8configure_file(input : 'scalarproduct.conf.in',
10 output : 'scalarproduct.conf', 9 output : 'scalarproduct.conf',
@@ -22,19 +21,77 @@ endif
22 21
23libgnunetscalarproduct = library('gnunetscalarproduct', 22libgnunetscalarproduct = library('gnunetscalarproduct',
24 libgnunetscalarproduct_src, 23 libgnunetscalarproduct_src,
25 dependencies: libgnunetutil_dep, 24 dependencies: [libgnunetutil_dep,
25 gcrypt_dep],
26 include_directories: [incdir, configuration_inc], 26 include_directories: [incdir, configuration_inc],
27 install: true, 27 install: true,
28 install_dir: get_option('libdir')) 28 install_dir: get_option('libdir'))
29pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org', 29pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org',
30 description : 'Provides API for accessing the scalarproduct service') 30 description : 'Provides API for accessing the scalarproduct service')
31libgnunetscalarproduct_dep = declare_dependency(link_with : libgnunetscalarproduct) 31libgnunetscalarproduct_dep = declare_dependency(link_with : libgnunetscalarproduct)
32executable ('gnunet-service-scalarproduct', 32
33 gnunetservicescalarproduct_src, 33executable ('gnunet-scalarproduct',
34 ['gnunet-scalarproduct.c'],
35 dependencies: [libgnunetscalarproduct_dep,
36 libgnunetutil_dep,
37 gcrypt_dep,
38 libgnunetstatistics_dep,
39 libgnunetcore_dep,
40 libgnunetcadet_dep,
41 libgnunetblock_dep],
42 include_directories: [incdir, configuration_inc],
43 install: true,
44 install_dir: get_option('bindir'))
45
46executable ('gnunet-service-scalarproduct-alice',
47 gnunetservicescalarproducta_src,
48 dependencies: [libgnunetscalarproduct_dep,
49 libgnunetutil_dep,
50 gcrypt_dep,
51 libgnunetseti_dep,
52 libgnunetstatistics_dep,
53 libgnunetcore_dep,
54 libgnunetcadet_dep,
55 libgnunetblock_dep],
56 include_directories: [incdir, configuration_inc],
57 install: true,
58 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
59executable ('gnunet-service-scalarproduct-bob',
60 gnunetservicescalarproductb_src,
61 dependencies: [libgnunetscalarproduct_dep,
62 libgnunetutil_dep,
63 gcrypt_dep,
64 libgnunetseti_dep,
65 libgnunetstatistics_dep,
66 libgnunetcore_dep,
67 libgnunetcadet_dep,
68 libgnunetblock_dep],
69 include_directories: [incdir, configuration_inc],
70 install: true,
71 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
72executable ('gnunet-service-scalarproduct-ecc-alice',
73 gnunetservicescalarproductecca_src,
74 dependencies: [libgnunetscalarproduct_dep,
75 libgnunetutil_dep,
76 libgnunetstatistics_dep,
77 libgnunetcore_dep,
78 gcrypt_dep,
79 sodium_dep,
80 libgnunetseti_dep,
81 libgnunetcadet_dep,
82 libgnunetblock_dep],
83 include_directories: [incdir, configuration_inc],
84 install: true,
85 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
86executable ('gnunet-service-scalarproduct-ecc-bob',
87 gnunetservicescalarproducteccb_src,
34 dependencies: [libgnunetscalarproduct_dep, 88 dependencies: [libgnunetscalarproduct_dep,
35 libgnunetutil_dep, 89 libgnunetutil_dep,
36 libgnunetstatistics_dep, 90 libgnunetstatistics_dep,
37 libgnunetcore_dep, 91 libgnunetcore_dep,
92 gcrypt_dep,
93 sodium_dep,
94 libgnunetseti_dep,
38 libgnunetcadet_dep, 95 libgnunetcadet_dep,
39 libgnunetblock_dep], 96 libgnunetblock_dep],
40 include_directories: [incdir, configuration_inc], 97 include_directories: [incdir, configuration_inc],
diff --git a/src/secretsharing/meson.build b/src/secretsharing/meson.build
new file mode 100644
index 000000000..07d7611b2
--- /dev/null
+++ b/src/secretsharing/meson.build
@@ -0,0 +1,41 @@
1libgnunetsecretsharing_src = ['secretsharing_api.c', 'secretsharing_common.c']
2
3gnunetservicesecretsharing_src = ['gnunet-service-secretsharing.c', 'secretsharing_common.c']
4
5configure_file(input : 'secretsharing.conf.in',
6 output : 'secretsharing.conf',
7 configuration : cdata,
8 install: true,
9 install_dir: pkgcfgdir)
10
11if get_option('monolith')
12 foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src
13 gnunet_src += 'secretsharing/' + p
14 endforeach
15endif
16
17libgnunetsecretsharing = library('gnunetsecretsharing',
18 libgnunetsecretsharing_src,
19 dependencies: [libgnunetutil_dep,
20 libgnunetstatistics_dep,
21 gcrypt_dep,
22 libgnunetdatacache_dep],
23 include_directories: [incdir, configuration_inc],
24 install: true,
25 install_dir: get_option('libdir'))
26libgnunetsecretsharing_dep = declare_dependency(link_with : libgnunetsecretsharing)
27pkg.generate(libgnunetsecretsharing, url: 'https://www.gnunet.org',
28 description : 'Provides API for the secretsharing service')
29
30executable ('gnunet-service-secretsharing',
31 gnunetservicesecretsharing_src,
32 dependencies: [libgnunetsecretsharing_dep,
33 libgnunetutil_dep,
34 gcrypt_dep,
35 libgnunetconsensus_dep,
36 libgnunetstatistics_dep,
37 libgnunetdatacache_dep],
38 include_directories: [incdir, configuration_inc],
39 install: true,
40 install_dir: get_option('libdir')/'gnunet'/'libexec')
41
diff --git a/src/util/meson.build b/src/util/meson.build
index f790a403a..c59787a93 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -23,7 +23,7 @@ libgnunetutil_src = ['bandwidth.c',
23 'crypto_cs.c', 23 'crypto_cs.c',
24 'crypto_ecc.c', 24 'crypto_ecc.c',
25 'crypto_ecc_gnsrecord.c', 25 'crypto_ecc_gnsrecord.c',
26 #'$(DLOG)', 26 'crypto_ecc_dlog.c',
27 'crypto_ecc_setup.c', 27 'crypto_ecc_setup.c',
28 'crypto_edx25519.c', 28 'crypto_edx25519.c',
29 'crypto_hash.c', 29 'crypto_hash.c',
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 10:36:25 +0000