1 files changed, 65 insertions, 8 deletions
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 @@
 libgnunetscalarproduct_src = ['scalarproduct_api.c']
-gnunetservicescalarproduct_src = ['gnunet-service-scalarproduct.c',
+gnunetservicescalarproducta_src = ['gnunet-service-scalarproduct_alice.c']
-                        'gnunet-service-scalarproduct_union.c',
+gnunetservicescalarproductb_src = ['gnunet-service-scalarproduct_bob.c']
-                        'gnunet-service-scalarproduct_intersection.c',
+gnunetservicescalarproductecca_src = ['gnunet-service-scalarproduct-ecc_alice.c']
-                        'gnunet-service-scalarproduct_union_strata_estimator.c',
+gnunetservicescalarproducteccb_src = ['gnunet-service-scalarproduct-ecc_bob.c']
-                        'ibf.c']
 configure_file(input : 'scalarproduct.conf.in',
               output : 'scalarproduct.conf',
@@ -22,19 +21,77 @@ endif
 libgnunetscalarproduct = library('gnunetscalarproduct',
        libgnunetscalarproduct_src,
-        dependencies: libgnunetutil_dep,
+        dependencies: [libgnunetutil_dep,
+                       gcrypt_dep],
        include_directories: [incdir, configuration_inc],
        install: true,
        install_dir: get_option('libdir'))
 pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org',
             description : 'Provides API for accessing the scalarproduct service')
 libgnunetscalarproduct_dep = declare_dependency(link_with : libgnunetscalarproduct)
-executable ('gnunet-service-scalarproduct',
-            gnunetservicescalarproduct_src,
+executable ('gnunet-scalarproduct',
+            ['gnunet-scalarproduct.c'],
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           gcrypt_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+executable ('gnunet-service-scalarproduct-alice',
+            gnunetservicescalarproducta_src,
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           gcrypt_dep,
+                           libgnunetseti_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-service-scalarproduct-bob',
+            gnunetservicescalarproductb_src,
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           gcrypt_dep,
+                           libgnunetseti_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-service-scalarproduct-ecc-alice',
+            gnunetservicescalarproductecca_src,
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           gcrypt_dep,
+                           sodium_dep,
+                           libgnunetseti_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-service-scalarproduct-ecc-bob',
+            gnunetservicescalarproducteccb_src,
            dependencies: [libgnunetscalarproduct_dep,
                           libgnunetutil_dep,
                           libgnunetstatistics_dep,
                           libgnunetcore_dep,
+                           gcrypt_dep,
+                           sodium_dep,
+                           libgnunetseti_dep,
                           libgnunetcadet_dep,
                           libgnunetblock_dep],
            include_directories: [incdir, configuration_inc],

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 @@
1	libgnunetscalarproduct_src = ['scalarproduct_api.c']	1	libgnunetscalarproduct_src = ['scalarproduct_api.c']
2		2
3	gnunetservicescalarproduct_src = ['gnunet-service-scalarproduct.c',	3	gnunetservicescalarproducta_src = ['gnunet-service-scalarproduct_alice.c']
4	'gnunet-service-scalarproduct_union.c',	4	gnunetservicescalarproductb_src = ['gnunet-service-scalarproduct_bob.c']
5	'gnunet-service-scalarproduct_intersection.c',	5	gnunetservicescalarproductecca_src = ['gnunet-service-scalarproduct-ecc_alice.c']
6	'gnunet-service-scalarproduct_union_strata_estimator.c',	6	gnunetservicescalarproducteccb_src = ['gnunet-service-scalarproduct-ecc_bob.c']
7	'ibf.c']
8		7
9	configure_file(input : 'scalarproduct.conf.in',	8	configure_file(input : 'scalarproduct.conf.in',
10	output : 'scalarproduct.conf',	9	output : 'scalarproduct.conf',
@@ -22,19 +21,77 @@ endif
22		21
23	libgnunetscalarproduct = library('gnunetscalarproduct',	22	libgnunetscalarproduct = 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'))
29	pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org',	29	pkg.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')
31	libgnunetscalarproduct_dep = declare_dependency(link_with : libgnunetscalarproduct)	31	libgnunetscalarproduct_dep = declare_dependency(link_with : libgnunetscalarproduct)
32	executable ('gnunet-service-scalarproduct',	32
33	gnunetservicescalarproduct_src,	33	executable ('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
		46	executable ('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')
		59	executable ('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')
		72	executable ('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')
		86	executable ('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],