diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-10-20 13:22:07 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-10-20 13:22:07 +0200 |
commit | 9862fc36d1c97aaed13c8aa17ebadfca420a5943 (patch) | |
tree | 4dd538d369dc06ffe2fc235a3b6ccb009cacc64a | |
parent | 9629f0ed28c972c407d9a5f9621ab1fd97952e54 (diff) | |
download | gnunet-9862fc36d1c97aaed13c8aa17ebadfca420a5943.tar.gz gnunet-9862fc36d1c97aaed13c8aa17ebadfca420a5943.zip |
MESSENGER: Move block plugin to plugin dir
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | po/POTFILES.in | 2 | ||||
-rw-r--r-- | src/plugin/Makefile.am | 3 | ||||
-rw-r--r-- | src/plugin/meson.build | 1 | ||||
-rw-r--r-- | src/plugin/messenger/Makefile.am | 26 | ||||
-rw-r--r-- | src/plugin/messenger/meson.build | 7 | ||||
-rw-r--r-- | src/plugin/messenger/plugin_gnsrecord_messenger.c (renamed from src/service/messenger/plugin_gnsrecord_messenger.c) | 0 | ||||
-rw-r--r-- | src/service/messenger/Makefile.am | 13 | ||||
-rw-r--r-- | 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 | |||
1253 | src/plugin/revocation/Makefile | 1253 | src/plugin/revocation/Makefile |
1254 | src/plugin/seti/Makefile | 1254 | src/plugin/seti/Makefile |
1255 | src/plugin/setu/Makefile | 1255 | src/plugin/setu/Makefile |
1256 | src/plugin/messenger/Makefile | ||
1256 | src/service/Makefile | 1257 | src/service/Makefile |
1257 | src/service/arm/Makefile | 1258 | src/service/arm/Makefile |
1258 | src/service/arm/arm.conf | 1259 | 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 | |||
222 | src/plugin/gns/plugin_block_gns.c | 222 | src/plugin/gns/plugin_block_gns.c |
223 | src/plugin/gns/plugin_gnsrecord_gns.c | 223 | src/plugin/gns/plugin_gnsrecord_gns.c |
224 | src/plugin/gnsrecord/plugin_gnsrecord_dns.c | 224 | src/plugin/gnsrecord/plugin_gnsrecord_dns.c |
225 | src/plugin/messenger/plugin_gnsrecord_messenger.c | ||
225 | src/plugin/namecache/plugin_namecache_flat.c | 226 | src/plugin/namecache/plugin_namecache_flat.c |
226 | src/plugin/namecache/plugin_namecache_postgres.c | 227 | src/plugin/namecache/plugin_namecache_postgres.c |
227 | src/plugin/namecache/plugin_namecache_sqlite.c | 228 | src/plugin/namecache/plugin_namecache_sqlite.c |
@@ -369,7 +370,6 @@ src/service/messenger/messenger_api_list_tunnels.c | |||
369 | src/service/messenger/messenger_api_message.c | 370 | src/service/messenger/messenger_api_message.c |
370 | src/service/messenger/messenger_api_room.c | 371 | src/service/messenger/messenger_api_room.c |
371 | src/service/messenger/messenger_api_util.c | 372 | src/service/messenger/messenger_api_util.c |
372 | src/service/messenger/plugin_gnsrecord_messenger.c | ||
373 | src/service/messenger/testing_messenger_barrier.c | 373 | src/service/messenger/testing_messenger_barrier.c |
374 | src/service/messenger/testing_messenger_setup.c | 374 | src/service/messenger/testing_messenger_setup.c |
375 | src/service/namecache/gnunet-service-namecache.c | 375 | 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 = \ | |||
12 | regex \ | 12 | regex \ |
13 | gns \ | 13 | gns \ |
14 | fs \ | 14 | fs \ |
15 | reclaim | 15 | reclaim \ |
16 | 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') | |||
14 | subdir('gns') | 14 | subdir('gns') |
15 | subdir('fs') | 15 | subdir('fs') |
16 | subdir('reclaim') | 16 | subdir('reclaim') |
17 | 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 @@ | |||
1 | # This Makefile.am is in the public domain | ||
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | ||
3 | |||
4 | if USE_COVERAGE | ||
5 | AM_CFLAGS = --coverage -O0 | ||
6 | XLIB = -lgcov | ||
7 | endif | ||
8 | |||
9 | pkgcfgdir= $(pkgdatadir)/config.d/ | ||
10 | |||
11 | libexecdir= $(pkglibdir)/libexec/ | ||
12 | |||
13 | plugin_LTLIBRARIES = \ | ||
14 | libgnunet_plugin_gnsrecord_messenger.la | ||
15 | |||
16 | |||
17 | libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \ | ||
18 | plugin_gnsrecord_messenger.c | ||
19 | libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \ | ||
20 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
21 | $(LTLIBINTL) | ||
22 | libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \ | ||
23 | $(GN_PLUGIN_LDFLAGS) | ||
24 | |||
25 | |||
26 | 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 @@ | |||
1 | shared_module('gnunet_plugin_gnsrecord_messenger', | ||
2 | ['plugin_gnsrecord_messenger.c'], | ||
3 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, | ||
4 | ], | ||
5 | include_directories: [incdir, configuration_inc], | ||
6 | install: true, | ||
7 | install_dir: get_option('libdir')/'gnunet') | ||
diff --git a/src/service/messenger/plugin_gnsrecord_messenger.c b/src/plugin/messenger/plugin_gnsrecord_messenger.c index e09a0330d..e09a0330d 100644 --- a/src/service/messenger/plugin_gnsrecord_messenger.c +++ b/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/ | |||
10 | 10 | ||
11 | libexecdir= $(pkglibdir)/libexec/ | 11 | libexecdir= $(pkglibdir)/libexec/ |
12 | 12 | ||
13 | plugin_LTLIBRARIES = \ | ||
14 | libgnunet_plugin_gnsrecord_messenger.la | ||
15 | |||
16 | |||
17 | libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \ | ||
18 | plugin_gnsrecord_messenger.c | ||
19 | libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \ | ||
20 | $(top_builddir)/src/lib/util/libgnunetutil.la \ | ||
21 | $(LTLIBINTL) | ||
22 | libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \ | ||
23 | $(GN_PLUGIN_LDFLAGS) | ||
24 | |||
25 | |||
26 | pkgcfg_DATA = \ | 13 | pkgcfg_DATA = \ |
27 | messenger.conf | 14 | messenger.conf |
28 | 15 | ||
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) | |||
55 | pkg.generate(libgnunetmessenger, url: 'https://www.gnunet.org', | 55 | pkg.generate(libgnunetmessenger, url: 'https://www.gnunet.org', |
56 | description : 'Provides API to access the GNUnet Messenger subsystem') | 56 | description : 'Provides API to access the GNUnet Messenger subsystem') |
57 | 57 | ||
58 | shared_module('gnunet_plugin_gnsrecord_messenger', | ||
59 | ['plugin_gnsrecord_messenger.c'], | ||
60 | dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, | ||
61 | libgnunetmessenger_dep], | ||
62 | include_directories: [incdir, configuration_inc], | ||
63 | install: true, | ||
64 | install_dir: get_option('libdir')/'gnunet') | ||
65 | |||
66 | executable ('gnunet-service-messenger', | 58 | executable ('gnunet-service-messenger', |
67 | gnunetservicemessenger_src, | 59 | gnunetservicemessenger_src, |
68 | dependencies: [libgnunetmessenger_dep, | 60 | dependencies: [libgnunetmessenger_dep, |