[gnunet] 02/02: BUILD: Some libgnunet considerations

[gnunet]

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

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

commit 9c8d9a406f119698aa5a7ba7df8ba396828550f7
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Sep 22 11:13:16 2023 +0200

    BUILD: Some libgnunet considerations
---
 src/block/meson.build | 47 +++++++++++++++++++++++++++++++----------------
 src/meson.build       | 29 +++++++++++++++--------------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/block/meson.build b/src/block/meson.build
index aae7445ee..9cb66552c 100644
--- a/src/block/meson.build
+++ b/src/block/meson.build
@@ -1,23 +1,38 @@
 libgnunetblock_src = ['block.c']
 libgnunetblockgroup_src = ['bg_bf.c']
 
-if get_option('monolith') == false
-  libgnunetblock = library('gnunetblock',
-          libgnunetblock_src,
-          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir'))
-  libgnunetblock_dep = declare_dependency(link_with : libgnunetblock)
-  libgnunetblockgroup = library('gnunetblockgroup',
-          libgnunetblockgroup_src,
-          dependencies: [libgnunetutil_dep, libgnunetblock_dep],
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir'))
-  libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup)
-else
+if get_option('monolith')
   foreach p : libgnunetblock_src + libgnunetblockgroup_src
     gnunet_src += 'block/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetblock = library('gnunetblock',
+        libgnunetblock_src,
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetblock_dep = declare_dependency(link_with : libgnunetblock)
+libgnunetblockgroup = library('gnunetblockgroup',
+        libgnunetblockgroup_src,
+        dependencies: [libgnunetutil_dep, libgnunetblock_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup)
+plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep]
+shared_module('gnunet_plugin_block_test',
+      ['plugin_block_test.c'],
+      dependencies: plugin_dep,
+      include_directories: [incdir, configuration_inc],
+      install: true,
+      install_dir: get_option('libdir'))
+shared_module('gnunet_plugin_block_template',
+      ['plugin_block_template.c'],
+      dependencies: plugin_dep,
+      include_directories: [incdir, configuration_inc],
+      install: true,
+      install_dir: get_option('libdir'))
+
diff --git a/src/meson.build b/src/meson.build
index 076a8d99e..389d08245 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,19 +12,13 @@ if get_option('monolith') == false
 endif
 subdir('statistics')
 #$(TESTING)')
-if json_dep.found()
- subdir('json')
-endif
-if curl_dep.found()
-  subdir('curl')
-endif
+subdir('json', if_found : json_dep)
+subdir('curl', if_found : [curl_dep])
 if get_option('monolith') == false
   subdir('rest')
 endif
 subdir('peerinfo')
-if sqlite_dep.found()
-  subdir('sq')
-endif
+subdir('sq', if_found : [sqlite_dep])
 #subdir('$(MYSQL_DIR)')
 #subdir('$(POSTGRES_DIR)')
 subdir('datacache')
@@ -72,9 +66,16 @@ subdir('messenger')
 ##subdir('$(EXP_DIR)')
 #subdir('integration-tests')
 
-if get_option('monolith')
-  libgnunet = library('gnunet',
-                      gnunet_src,
-                      dependencies: gnunetdeps,
-                      include_directories: [incdir, configuration_inc, 
exitdir])
+if not get_option('monolith')
+  subdir_done()
 endif
+libgnunet = library('gnunet',
+                    gnunet_src,
+                    dependencies: gnunetdeps,
+                    include_directories: [incdir, configuration_inc, exitdir])
+libgnunet_dep = declare_dependency(link_with : libgnunet)
+
+# FIXME here we need to re-enter all that need to link against libgnunet
+# For example: dload plugins
+# We also need a logic that handles this
+# subdir('block')

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