[gnunet] branch master updated: BUILD: Add more subsystems to meson build

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 3a2f24fe6 BUILD: Add more subsystems to meson build
3a2f24fe6 is described below

commit 3a2f24fe60abaa99428914771b304190dbe70c0e
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Sep 21 16:45:58 2023 +0200

    BUILD: Add more subsystems to meson build
---
 src/meson.build           |  5 ++--
 src/messenger/meson.build | 61 +++++++++++++++++++++++++++++++++++++++++++++++
 src/reclaim/meson.build   | 42 ++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 9ae2df0d8..076a8d99e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -63,11 +63,12 @@ subdir('gns')
 subdir('zonemaster')
 ##subdir('$(CONVERSATION_DIR)')
 subdir('fs')
+# TODO
 #subdir('exit')
 #subdir('pt')
 #subdir('secretsharing')
-#subdir('reclaim')
-#subdir('messenger')
+subdir('reclaim')
+subdir('messenger')
 ##subdir('$(EXP_DIR)')
 #subdir('integration-tests')
 
diff --git a/src/messenger/meson.build b/src/messenger/meson.build
new file mode 100644
index 000000000..7555328e1
--- /dev/null
+++ b/src/messenger/meson.build
@@ -0,0 +1,61 @@
+libgnunetmessenger_src = ['messenger_api.c',
+                          'messenger_api_contact.c',
+                          'messenger_api_contact_store.c',
+                          'messenger_api_message.c',
+                          'messenger_api_list_tunnels.c',
+                          'messenger_api_util.c',
+                          'messenger_api_handle.c',
+                          'messenger_api_room.c']
+
+gnunetservicemessenger_src = ['gnunet-service-messenger.c',
+                              'gnunet-service-messenger_service.c',
+                              'gnunet-service-messenger_list_handles.c',
+                              'gnunet-service-messenger_list_messages.c',
+                              'gnunet-service-messenger_member_session.c',
+                              'gnunet-service-messenger_member.c',
+                              'gnunet-service-messenger_member_store.c',
+                              'gnunet-service-messenger_message_handle.c',
+                              'gnunet-service-messenger_message_kind.c',
+                              'gnunet-service-messenger_message_recv.c',
+                              'gnunet-service-messenger_message_send.c',
+                              'gnunet-service-messenger_message_state.c',
+                              'gnunet-service-messenger_message_store.c',
+                              'gnunet-service-messenger_operation_store.c',
+                              'gnunet-service-messenger_operation.c',
+                              'gnunet-service-messenger_basement.c',
+                              'gnunet-service-messenger_ego_store.c',
+                              'gnunet-service-messenger_handle.c',
+                              'gnunet-service-messenger_room.c',
+                              'gnunet-service-messenger_tunnel.c']
+
+if get_option('monolith') == false
+  libgnunetmessenger = library('gnunetmessenger',
+          libgnunetmessenger_src,
+          dependencies: [libgnunetutil_dep,
+                         libgnunetcadet_dep,
+                         libgnunetidentity_dep],
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
+  libgnunetmessenger_dep = declare_dependency(link_with : libgnunetmessenger)
+  executable ('gnunet-messenger',
+              'gnunet-messenger.c',
+              dependencies: [libgnunetmessenger_dep,
+                             libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
+  executable ('gnunet-service-messenger',
+              gnunetservicemessenger_src,
+              dependencies: [libgnunetmessenger_dep,
+                             libgnunetutil_dep,
+                             libgnunetidentity_dep,
+                             libgnunetcadet_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+else
+  foreach p : libgnunetmessenger_src + gnunetservicemessenger_src
+    gnunet_src += 'messenger/' + p
+  endforeach
+endif
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
new file mode 100644
index 000000000..226e8ec7f
--- /dev/null
+++ b/src/reclaim/meson.build
@@ -0,0 +1,42 @@
+libgnunetreclaim_src = ['reclaim_api.c',
+                        'reclaim_attribute.c',
+                        'reclaim_credential.c']
+
+gnunetservicereclaim_src = ['gnunet-service-reclaim.c',
+                        'gnunet-service-reclaim_tickets.c']
+
+
+if get_option('monolith') == false
+  libgnunetreclaim = library('gnunetreclaim',
+          libgnunetreclaim_src,
+          dependencies: [libgnunetutil_dep,
+                         libgnunetidentity_dep],
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
+  libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
+  executable ('gnunet-reclaim',
+              'gnunet-reclaim.c',
+              dependencies: [libgnunetreclaim_dep,
+                             libgnunetidentity_dep,
+                             libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
+  executable ('gnunet-service-reclaim',
+              gnunetservicereclaim_src,
+              dependencies: [libgnunetreclaim_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetgnsrecord_dep,
+                             libgnunetgns_dep,
+                             libgnunetidentity_dep,
+                             libgnunetnamestore_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+else
+  foreach p : libgnunetreclaim_src + gnunetservicereclaim_src
+    gnunet_src += 'reclaim/' + p
+  endforeach
+endif

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.