[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/02: SET: Move block plugin to plugin dir
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/02: SET: Move block plugin to plugin dir |
|
Date: |
Fri, 20 Oct 2023 13:22:13 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 9629f0ed28c972c407d9a5f9621ab1fd97952e54
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Oct 20 13:15:54 2023 +0200
SET: Move block plugin to plugin dir
---
configure.ac | 2 ++
po/POTFILES.in | 4 ++--
src/plugin/meson.build | 2 ++
src/plugin/seti/Makefile.am | 25 ++++++++++++++++++++++
src/plugin/seti/meson.build | 7 ++++++
.../seti/plugin_block_seti_test.c | 0
src/plugin/setu/Makefile.am | 21 ++++++++++++++++++
src/plugin/setu/meson.build | 7 ++++++
.../setu/plugin_block_setu_test.c | 0
src/service/seti/Makefile.am | 14 ------------
src/service/seti/meson.build | 6 ------
src/service/setu/Makefile.am | 14 ------------
src/service/setu/meson.build | 6 ------
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
src/plugin/reclaim/Makefile
src/plugin/regex/Makefile
src/plugin/revocation/Makefile
+src/plugin/seti/Makefile
+src/plugin/setu/Makefile
src/service/Makefile
src/service/arm/Makefile
src/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
src/plugin/regex/plugin_block_regex.c
src/plugin/regex/regex_block_lib.c
src/plugin/revocation/plugin_block_revocation.c
+src/plugin/seti/plugin_block_seti_test.c
+src/plugin/setu/plugin_block_setu_test.c
src/service/arm/arm_api.c
src/service/arm/arm_monitor_api.c
src/service/arm/gnunet-service-arm.c
@@ -434,7 +436,6 @@ src/service/revocation/gnunet-service-revocation.c
src/service/revocation/revocation_api.c
src/service/seti/gnunet-service-seti.c
src/service/seti/gnunet-seti-profiler.c
-src/service/seti/plugin_block_seti_test.c
src/service/seti/seti_api.c
src/service/setu/gnunet-service-setu.c
src/service/setu/gnunet-service-setu_strata_estimator.c
@@ -442,7 +443,6 @@ src/service/setu/gnunet-setu-ibf-profiler.c
src/service/setu/gnunet-setu-profiler.c
src/service/setu/ibf.c
src/service/setu/ibf_sim.c
-src/service/setu/plugin_block_setu_test.c
src/service/setu/setu_api.c
src/service/statistics/gnunet-service-statistics.c
src/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')
subdir('namecache')
subdir('namestore')
subdir('dht')
+subdir('seti')
+subdir('setu')
subdir('regex')
subdir('revocation')
subdir('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 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+ AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_block_seti_test.la
+
+libgnunet_plugin_block_seti_test_la_SOURCES = \
+ plugin_block_seti_test.c
+libgnunet_plugin_block_seti_test_la_LIBADD = \
+ $(top_builddir)/src/lib/block/libgnunetblock.la \
+ $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_block_seti_test_la_LDFLAGS = \
+ $(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 @@
+shared_module('gnunet_plugin_block_seti_test',
+ ['plugin_block_seti_test.c'],
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install:true,
+ install_dir: get_option('libdir')/'gnunet')
+
diff --git a/src/service/seti/plugin_block_seti_test.c
b/src/plugin/seti/plugin_block_seti_test.c
similarity index 100%
rename from src/service/seti/plugin_block_seti_test.c
rename to 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 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_block_setu_test.la
+
+libgnunet_plugin_block_setu_test_la_SOURCES = \
+ plugin_block_setu_test.c
+libgnunet_plugin_block_setu_test_la_LIBADD = \
+ $(top_builddir)/src/lib/block/libgnunetblock.la \
+ $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_block_setu_test_la_LDFLAGS = \
+ $(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 @@
+shared_module('gnunet_plugin_block_setu_test',
+ ['plugin_block_setu_test.c'],
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install:true,
+ install_dir: get_option('libdir')/'gnunet')
+
diff --git a/src/service/setu/plugin_block_setu_test.c
b/src/plugin/setu/plugin_block_setu_test.c
similarity index 100%
rename from src/service/setu/plugin_block_setu_test.c
rename to 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 = \
$(top_builddir)/src/service/testing/libgnunettesting.la \
libgnunetseti.la
-plugin_LTLIBRARIES = \
- libgnunet_plugin_block_seti_test.la
-
-libgnunet_plugin_block_seti_test_la_SOURCES = \
- plugin_block_seti_test.c
-libgnunet_plugin_block_seti_test_la_LIBADD = \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_block_seti_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
EXTRA_DIST = \
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',
pkg.generate(libgnunetseti, url: 'https://www.gnunet.org',
description : 'Provides API for accessing the set intersection
service')
libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
-shared_module('gnunet_plugin_block_seti_test',
- ['plugin_block_seti_test.c'],
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc],
- install:true,
- install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-service-seti',
gnunetserviceseti_src,
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 = \
libgnunetsetu.la
-plugin_LTLIBRARIES = \
- libgnunet_plugin_block_setu_test.la
-
-libgnunet_plugin_block_setu_test_la_SOURCES = \
- plugin_block_setu_test.c
-libgnunet_plugin_block_setu_test_la_LIBADD = \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_block_setu_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
EXTRA_DIST = \
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',
pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
description : 'Provides API for accessing the set union service')
libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
-shared_module('gnunet_plugin_block_setu_test',
- ['plugin_block_setu_test.c'],
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc],
- install:true,
- install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-service-setu',
gnunetservicesetu_src,
dependencies: [libgnunetsetu_dep,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.