aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac2
-rw-r--r--po/POTFILES.in4
-rw-r--r--src/plugin/meson.build2
-rw-r--r--src/plugin/seti/Makefile.am25
-rw-r--r--src/plugin/seti/meson.build7
-rw-r--r--src/plugin/seti/plugin_block_seti_test.c (renamed from src/service/seti/plugin_block_seti_test.c)0
-rw-r--r--src/plugin/setu/Makefile.am21
-rw-r--r--src/plugin/setu/meson.build7
-rw-r--r--src/plugin/setu/plugin_block_setu_test.c (renamed from src/service/setu/plugin_block_setu_test.c)0
-rw-r--r--src/service/seti/Makefile.am14
-rw-r--r--src/service/seti/meson.build6
-rw-r--r--src/service/setu/Makefile.am14
-rw-r--r--src/service/setu/meson.build6
13 files changed, 66 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac
index ebb37bb2b..028739808 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1251,6 +1251,8 @@ src/plugin/peerstore/Makefile
1251src/plugin/reclaim/Makefile 1251src/plugin/reclaim/Makefile
1252src/plugin/regex/Makefile 1252src/plugin/regex/Makefile
1253src/plugin/revocation/Makefile 1253src/plugin/revocation/Makefile
1254src/plugin/seti/Makefile
1255src/plugin/setu/Makefile
1254src/service/Makefile 1256src/service/Makefile
1255src/service/arm/Makefile 1257src/service/arm/Makefile
1256src/service/arm/arm.conf 1258src/service/arm/arm.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cb4748f10..b32c62628 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -238,6 +238,8 @@ src/plugin/reclaim/plugin_reclaim_credential_pabc.c
238src/plugin/regex/plugin_block_regex.c 238src/plugin/regex/plugin_block_regex.c
239src/plugin/regex/regex_block_lib.c 239src/plugin/regex/regex_block_lib.c
240src/plugin/revocation/plugin_block_revocation.c 240src/plugin/revocation/plugin_block_revocation.c
241src/plugin/seti/plugin_block_seti_test.c
242src/plugin/setu/plugin_block_setu_test.c
241src/service/arm/arm_api.c 243src/service/arm/arm_api.c
242src/service/arm/arm_monitor_api.c 244src/service/arm/arm_monitor_api.c
243src/service/arm/gnunet-service-arm.c 245src/service/arm/gnunet-service-arm.c
@@ -434,7 +436,6 @@ src/service/revocation/gnunet-service-revocation.c
434src/service/revocation/revocation_api.c 436src/service/revocation/revocation_api.c
435src/service/seti/gnunet-service-seti.c 437src/service/seti/gnunet-service-seti.c
436src/service/seti/gnunet-seti-profiler.c 438src/service/seti/gnunet-seti-profiler.c
437src/service/seti/plugin_block_seti_test.c
438src/service/seti/seti_api.c 439src/service/seti/seti_api.c
439src/service/setu/gnunet-service-setu.c 440src/service/setu/gnunet-service-setu.c
440src/service/setu/gnunet-service-setu_strata_estimator.c 441src/service/setu/gnunet-service-setu_strata_estimator.c
@@ -442,7 +443,6 @@ src/service/setu/gnunet-setu-ibf-profiler.c
442src/service/setu/gnunet-setu-profiler.c 443src/service/setu/gnunet-setu-profiler.c
443src/service/setu/ibf.c 444src/service/setu/ibf.c
444src/service/setu/ibf_sim.c 445src/service/setu/ibf_sim.c
445src/service/setu/plugin_block_setu_test.c
446src/service/setu/setu_api.c 446src/service/setu/setu_api.c
447src/service/statistics/gnunet-service-statistics.c 447src/service/statistics/gnunet-service-statistics.c
448src/service/statistics/statistics_api.c 448src/service/statistics/statistics_api.c
diff --git a/src/plugin/meson.build b/src/plugin/meson.build
index 867e53f93..a978d6e42 100644
--- a/src/plugin/meson.build
+++ b/src/plugin/meson.build
@@ -7,6 +7,8 @@ subdir('peerstore')
7subdir('namecache') 7subdir('namecache')
8subdir('namestore') 8subdir('namestore')
9subdir('dht') 9subdir('dht')
10subdir('seti')
11subdir('setu')
10subdir('regex') 12subdir('regex')
11subdir('revocation') 13subdir('revocation')
12subdir('gns') 14subdir('gns')
diff --git a/src/plugin/seti/Makefile.am b/src/plugin/seti/Makefile.am
new file mode 100644
index 000000000..e6f579a65
--- /dev/null
+++ b/src/plugin/seti/Makefile.am
@@ -0,0 +1,25 @@
1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include
3
4pkgcfgdir= $(pkgdatadir)/config.d/
5
6libexecdir= $(pkglibdir)/libexec/
7
8plugindir = $(libdir)/gnunet
9
10if USE_COVERAGE
11 AM_CFLAGS = -fprofile-arcs -ftest-coverage
12endif
13
14plugin_LTLIBRARIES = \
15 libgnunet_plugin_block_seti_test.la
16
17libgnunet_plugin_block_seti_test_la_SOURCES = \
18 plugin_block_seti_test.c
19libgnunet_plugin_block_seti_test_la_LIBADD = \
20 $(top_builddir)/src/lib/block/libgnunetblock.la \
21 $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
22 $(top_builddir)/src/lib/util/libgnunetutil.la \
23 $(LTLIBINTL)
24libgnunet_plugin_block_seti_test_la_LDFLAGS = \
25 $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/seti/meson.build b/src/plugin/seti/meson.build
new file mode 100644
index 000000000..880936164
--- /dev/null
+++ b/src/plugin/seti/meson.build
@@ -0,0 +1,7 @@
1shared_module('gnunet_plugin_block_seti_test',
2 ['plugin_block_seti_test.c'],
3 dependencies: libgnunetutil_dep,
4 include_directories: [incdir, configuration_inc],
5 install:true,
6 install_dir: get_option('libdir')/'gnunet')
7
diff --git a/src/service/seti/plugin_block_seti_test.c b/src/plugin/seti/plugin_block_seti_test.c
index 5b9196cef..5b9196cef 100644
--- a/src/service/seti/plugin_block_seti_test.c
+++ b/src/plugin/seti/plugin_block_seti_test.c
diff --git a/src/plugin/setu/Makefile.am b/src/plugin/setu/Makefile.am
new file mode 100644
index 000000000..90a14cce0
--- /dev/null
+++ b/src/plugin/setu/Makefile.am
@@ -0,0 +1,21 @@
1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include
3
4pkgcfgdir= $(pkgdatadir)/config.d/
5
6libexecdir= $(pkglibdir)/libexec/
7
8plugindir = $(libdir)/gnunet
9
10plugin_LTLIBRARIES = \
11 libgnunet_plugin_block_setu_test.la
12
13libgnunet_plugin_block_setu_test_la_SOURCES = \
14 plugin_block_setu_test.c
15libgnunet_plugin_block_setu_test_la_LIBADD = \
16 $(top_builddir)/src/lib/block/libgnunetblock.la \
17 $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
18 $(top_builddir)/src/lib/util/libgnunetutil.la \
19 $(LTLIBINTL)
20libgnunet_plugin_block_setu_test_la_LDFLAGS = \
21 $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/setu/meson.build b/src/plugin/setu/meson.build
new file mode 100644
index 000000000..e22738ab6
--- /dev/null
+++ b/src/plugin/setu/meson.build
@@ -0,0 +1,7 @@
1shared_module('gnunet_plugin_block_setu_test',
2 ['plugin_block_setu_test.c'],
3 dependencies: libgnunetutil_dep,
4 include_directories: [incdir, configuration_inc],
5 install:true,
6 install_dir: get_option('libdir')/'gnunet')
7
diff --git a/src/service/setu/plugin_block_setu_test.c b/src/plugin/setu/plugin_block_setu_test.c
index 178ad3314..178ad3314 100644
--- a/src/service/setu/plugin_block_setu_test.c
+++ b/src/plugin/setu/plugin_block_setu_test.c
diff --git a/src/service/seti/Makefile.am b/src/service/seti/Makefile.am
index c2d31df9c..00923d56d 100644
--- a/src/service/seti/Makefile.am
+++ b/src/service/seti/Makefile.am
@@ -68,19 +68,5 @@ test_seti_api_LDADD = \
68 $(top_builddir)/src/service/testing/libgnunettesting.la \ 68 $(top_builddir)/src/service/testing/libgnunettesting.la \
69 libgnunetseti.la 69 libgnunetseti.la
70 70
71plugin_LTLIBRARIES = \
72 libgnunet_plugin_block_seti_test.la
73
74libgnunet_plugin_block_seti_test_la_SOURCES = \
75 plugin_block_seti_test.c
76libgnunet_plugin_block_seti_test_la_LIBADD = \
77 $(top_builddir)/src/lib/block/libgnunetblock.la \
78 $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
79 $(top_builddir)/src/lib/util/libgnunetutil.la \
80 $(LTLIBINTL)
81libgnunet_plugin_block_seti_test_la_LDFLAGS = \
82 $(GN_PLUGIN_LDFLAGS)
83
84
85EXTRA_DIST = \ 71EXTRA_DIST = \
86 test_seti.conf 72 test_seti.conf
diff --git a/src/service/seti/meson.build b/src/service/seti/meson.build
index 8538917d8..1743e327d 100644
--- a/src/service/seti/meson.build
+++ b/src/service/seti/meson.build
@@ -26,12 +26,6 @@ libgnunetseti = library('gnunetseti',
26pkg.generate(libgnunetseti, url: 'https://www.gnunet.org', 26pkg.generate(libgnunetseti, url: 'https://www.gnunet.org',
27 description : 'Provides API for accessing the set intersection service') 27 description : 'Provides API for accessing the set intersection service')
28libgnunetseti_dep = declare_dependency(link_with : libgnunetseti) 28libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
29shared_module('gnunet_plugin_block_seti_test',
30 ['plugin_block_seti_test.c'],
31 dependencies: libgnunetutil_dep,
32 include_directories: [incdir, configuration_inc],
33 install:true,
34 install_dir: get_option('libdir')/'gnunet')
35executable ('gnunet-service-seti', 29executable ('gnunet-service-seti',
36 gnunetserviceseti_src, 30 gnunetserviceseti_src,
37 dependencies: [libgnunetseti_dep, 31 dependencies: [libgnunetseti_dep,
diff --git a/src/service/setu/Makefile.am b/src/service/setu/Makefile.am
index f7f8ed394..f0cf9fdbc 100644
--- a/src/service/setu/Makefile.am
+++ b/src/service/setu/Makefile.am
@@ -88,19 +88,5 @@ perf_setu_api_LDADD = \
88 libgnunetsetu.la 88 libgnunetsetu.la
89 89
90 90
91plugin_LTLIBRARIES = \
92 libgnunet_plugin_block_setu_test.la
93
94libgnunet_plugin_block_setu_test_la_SOURCES = \
95 plugin_block_setu_test.c
96libgnunet_plugin_block_setu_test_la_LIBADD = \
97 $(top_builddir)/src/lib/block/libgnunetblock.la \
98 $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
99 $(top_builddir)/src/lib/util/libgnunetutil.la \
100 $(LTLIBINTL)
101libgnunet_plugin_block_setu_test_la_LDFLAGS = \
102 $(GN_PLUGIN_LDFLAGS)
103
104
105EXTRA_DIST = \ 91EXTRA_DIST = \
106 test_setu.conf 92 test_setu.conf
diff --git a/src/service/setu/meson.build b/src/service/setu/meson.build
index 974f16274..ccfa5762b 100644
--- a/src/service/setu/meson.build
+++ b/src/service/setu/meson.build
@@ -28,12 +28,6 @@ libgnunetsetu = library('gnunetsetu',
28pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org', 28pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
29 description : 'Provides API for accessing the set union service') 29 description : 'Provides API for accessing the set union service')
30libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu) 30libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
31shared_module('gnunet_plugin_block_setu_test',
32 ['plugin_block_setu_test.c'],
33 dependencies: libgnunetutil_dep,
34 include_directories: [incdir, configuration_inc],
35 install:true,
36 install_dir: get_option('libdir')/'gnunet')
37executable ('gnunet-service-setu', 31executable ('gnunet-service-setu',
38 gnunetservicesetu_src, 32 gnunetservicesetu_src,
39 dependencies: [libgnunetsetu_dep, 33 dependencies: [libgnunetsetu_dep,
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 05:54:50 +0000