1 files changed, 67 insertions, 8 deletions
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
index 05e6d44f0..183f0f784 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,79 @@ endif
 libgnunetscalarproduct = library('gnunetscalarproduct',
        libgnunetscalarproduct_src,
-        dependencies: libgnunetutil_dep,
+        soversion: '0',
+        version: '0.0.0',
+        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..183f0f784 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,79 @@ endif
22		21
23	libgnunetscalarproduct = library('gnunetscalarproduct',	22	libgnunetscalarproduct = library('gnunetscalarproduct',
24	libgnunetscalarproduct_src,	23	libgnunetscalarproduct_src,
25	dependencies: libgnunetutil_dep,	24	soversion: '0',
		25	version: '0.0.0',
		26	dependencies: [libgnunetutil_dep,
		27	gcrypt_dep],
26	include_directories: [incdir, configuration_inc],	28	include_directories: [incdir, configuration_inc],
27	install: true,	29	install: true,
28	install_dir: get_option('libdir'))	30	install_dir: get_option('libdir'))
29	pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org',	31	pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org',
30	description : 'Provides API for accessing the scalarproduct service')	32	description : 'Provides API for accessing the scalarproduct service')
31	libgnunetscalarproduct_dep = declare_dependency(link_with : libgnunetscalarproduct)	33	libgnunetscalarproduct_dep = declare_dependency(link_with : libgnunetscalarproduct)
32	executable ('gnunet-service-scalarproduct',	34
33	gnunetservicescalarproduct_src,	35	executable ('gnunet-scalarproduct',
		36	['gnunet-scalarproduct.c'],
		37	dependencies: [libgnunetscalarproduct_dep,
		38	libgnunetutil_dep,
		39	gcrypt_dep,
		40	libgnunetstatistics_dep,
		41	libgnunetcore_dep,
		42	libgnunetcadet_dep,
		43	libgnunetblock_dep],
		44	include_directories: [incdir, configuration_inc],
		45	install: true,
		46	install_dir: get_option('bindir'))
		47
		48	executable ('gnunet-service-scalarproduct-alice',
		49	gnunetservicescalarproducta_src,
		50	dependencies: [libgnunetscalarproduct_dep,
		51	libgnunetutil_dep,
		52	gcrypt_dep,
		53	libgnunetseti_dep,
		54	libgnunetstatistics_dep,
		55	libgnunetcore_dep,
		56	libgnunetcadet_dep,
		57	libgnunetblock_dep],
		58	include_directories: [incdir, configuration_inc],
		59	install: true,
		60	install_dir: get_option('libdir') / 'gnunet' / 'libexec')
		61	executable ('gnunet-service-scalarproduct-bob',
		62	gnunetservicescalarproductb_src,
		63	dependencies: [libgnunetscalarproduct_dep,
		64	libgnunetutil_dep,
		65	gcrypt_dep,
		66	libgnunetseti_dep,
		67	libgnunetstatistics_dep,
		68	libgnunetcore_dep,
		69	libgnunetcadet_dep,
		70	libgnunetblock_dep],
		71	include_directories: [incdir, configuration_inc],
		72	install: true,
		73	install_dir: get_option('libdir') / 'gnunet' / 'libexec')
		74	executable ('gnunet-service-scalarproduct-ecc-alice',
		75	gnunetservicescalarproductecca_src,
		76	dependencies: [libgnunetscalarproduct_dep,
		77	libgnunetutil_dep,
		78	libgnunetstatistics_dep,
		79	libgnunetcore_dep,
		80	gcrypt_dep,
		81	sodium_dep,
		82	libgnunetseti_dep,
		83	libgnunetcadet_dep,
		84	libgnunetblock_dep],
		85	include_directories: [incdir, configuration_inc],
		86	install: true,
		87	install_dir: get_option('libdir') / 'gnunet' / 'libexec')
		88	executable ('gnunet-service-scalarproduct-ecc-bob',
		89	gnunetservicescalarproducteccb_src,
34	dependencies: [libgnunetscalarproduct_dep,	90	dependencies: [libgnunetscalarproduct_dep,
35	libgnunetutil_dep,	91	libgnunetutil_dep,
36	libgnunetstatistics_dep,	92	libgnunetstatistics_dep,
37	libgnunetcore_dep,	93	libgnunetcore_dep,
		94	gcrypt_dep,
		95	sodium_dep,
		96	libgnunetseti_dep,
38	libgnunetcadet_dep,	97	libgnunetcadet_dep,
39	libgnunetblock_dep],	98	libgnunetblock_dep],
40	include_directories: [incdir, configuration_inc],	99	include_directories: [incdir, configuration_inc],