[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/02: MESSENGER: Move block plugin to plugin dir
|
From: |
gnunet |
|
Subject: |
[gnunet] 02/02: MESSENGER: Move block plugin to plugin dir |
|
Date: |
Fri, 20 Oct 2023 13:22:14 +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 9862fc36d1c97aaed13c8aa17ebadfca420a5943
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Oct 20 13:22:07 2023 +0200
MESSENGER: Move block plugin to plugin dir
---
configure.ac | 1 +
po/POTFILES.in | 2 +-
src/plugin/Makefile.am | 3 ++-
src/plugin/meson.build | 1 +
src/plugin/messenger/Makefile.am | 26 ++++++++++++++++++++++
src/plugin/messenger/meson.build | 7 ++++++
.../messenger/plugin_gnsrecord_messenger.c | 0
src/service/messenger/Makefile.am | 13 -----------
src/service/messenger/meson.build | 8 -------
9 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 028739808..8ebcbd4a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1253,6 +1253,7 @@ src/plugin/regex/Makefile
src/plugin/revocation/Makefile
src/plugin/seti/Makefile
src/plugin/setu/Makefile
+src/plugin/messenger/Makefile
src/service/Makefile
src/service/arm/Makefile
src/service/arm/arm.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b32c62628..a1471f455 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -222,6 +222,7 @@ src/plugin/fs/plugin_block_fs.c
src/plugin/gns/plugin_block_gns.c
src/plugin/gns/plugin_gnsrecord_gns.c
src/plugin/gnsrecord/plugin_gnsrecord_dns.c
+src/plugin/messenger/plugin_gnsrecord_messenger.c
src/plugin/namecache/plugin_namecache_flat.c
src/plugin/namecache/plugin_namecache_postgres.c
src/plugin/namecache/plugin_namecache_sqlite.c
@@ -369,7 +370,6 @@ src/service/messenger/messenger_api_list_tunnels.c
src/service/messenger/messenger_api_message.c
src/service/messenger/messenger_api_room.c
src/service/messenger/messenger_api_util.c
-src/service/messenger/plugin_gnsrecord_messenger.c
src/service/messenger/testing_messenger_barrier.c
src/service/messenger/testing_messenger_setup.c
src/service/namecache/gnunet-service-namecache.c
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index f3ca55ff0..78e06fd63 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -12,4 +12,5 @@ SUBDIRS = \
regex \
gns \
fs \
- reclaim
+ reclaim \
+ messenger
diff --git a/src/plugin/meson.build b/src/plugin/meson.build
index a978d6e42..d4f797c54 100644
--- a/src/plugin/meson.build
+++ b/src/plugin/meson.build
@@ -14,3 +14,4 @@ subdir('revocation')
subdir('gns')
subdir('fs')
subdir('reclaim')
+subdir('messenger')
diff --git a/src/plugin/messenger/Makefile.am b/src/plugin/messenger/Makefile.am
new file mode 100644
index 000000000..e3c69ea33
--- /dev/null
+++ b/src/plugin/messenger/Makefile.am
@@ -0,0 +1,26 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_gnsrecord_messenger.la
+
+
+libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
+ plugin_gnsrecord_messenger.c
+libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+plugindir = $(libdir)/gnunet
diff --git a/src/plugin/messenger/meson.build b/src/plugin/messenger/meson.build
new file mode 100644
index 000000000..17dd9bd32
--- /dev/null
+++ b/src/plugin/messenger/meson.build
@@ -0,0 +1,7 @@
+shared_module('gnunet_plugin_gnsrecord_messenger',
+ ['plugin_gnsrecord_messenger.c'],
+ dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep,
+ ],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
diff --git a/src/service/messenger/plugin_gnsrecord_messenger.c
b/src/plugin/messenger/plugin_gnsrecord_messenger.c
similarity index 100%
rename from src/service/messenger/plugin_gnsrecord_messenger.c
rename to src/plugin/messenger/plugin_gnsrecord_messenger.c
diff --git a/src/service/messenger/Makefile.am
b/src/service/messenger/Makefile.am
index d778d6e0c..c2ae65a08 100644
--- a/src/service/messenger/Makefile.am
+++ b/src/service/messenger/Makefile.am
@@ -10,19 +10,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/
libexecdir= $(pkglibdir)/libexec/
-plugin_LTLIBRARIES = \
- libgnunet_plugin_gnsrecord_messenger.la
-
-
-libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
- plugin_gnsrecord_messenger.c
-libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
pkgcfg_DATA = \
messenger.conf
diff --git a/src/service/messenger/meson.build
b/src/service/messenger/meson.build
index a6de2f516..3c05d7760 100644
--- a/src/service/messenger/meson.build
+++ b/src/service/messenger/meson.build
@@ -55,14 +55,6 @@ libgnunetmessenger_dep = declare_dependency(link_with :
libgnunetmessenger)
pkg.generate(libgnunetmessenger, url: 'https://www.gnunet.org',
description : 'Provides API to access the GNUnet Messenger
subsystem')
-shared_module('gnunet_plugin_gnsrecord_messenger',
- ['plugin_gnsrecord_messenger.c'],
- dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep,
- libgnunetmessenger_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir')/'gnunet')
-
executable ('gnunet-service-messenger',
gnunetservicemessenger_src,
dependencies: [libgnunetmessenger_dep,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.