[gnunet] branch master updated: BUILD: Add monolith option 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 541011a3b BUILD: Add monolith option to meson build
541011a3b is described below

commit 541011a3b787275cfc17660d29086312f6523730
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Sep 20 15:44:10 2023 +0200

    BUILD: Add monolith option to meson build
---
 meson.build              | 5 ++++-
 meson.options            | 3 +++
 src/block/meson.build    | 2 +-
 src/curl/meson.build     | 2 +-
 src/json/meson.build     | 2 +-
 src/nat-auto/meson.build | 2 +-
 src/nt/meson.build       | 2 +-
 src/sq/meson.build       | 2 +-
 8 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index 43918b9b7..501cb7c0f 100644
--- a/meson.build
+++ b/meson.build
@@ -4,8 +4,10 @@ compiler = meson.get_compiler('c')
 incdir = include_directories('src/include')
 cdata = configuration_data()
 
+
+
 # TODO: Set to true to build a single libgnunet
-gnunet_monolith = false
+gnunet_monolith = get_option('monolith')
 
 message('Building on ' + host_machine.system())
 
@@ -52,6 +54,7 @@ gnunetdeps = [mhd_dep,
               curl_dep,
               json_dep,
               zlib_dep,
+              sqlite_dep,
               unistr_dep, #dependency('libunistring'),
               ltdl_dep, #dependency('ltdl'),
               dependency('libidn2')]
diff --git a/meson.options b/meson.options
new file mode 100644
index 000000000..82e0f5ca6
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,3 @@
+# Build options
+option('monolith', type : 'boolean', value : false, description: 'Build a 
single, monolithic libgnunet shlib')
+
diff --git a/src/block/meson.build b/src/block/meson.build
index bccddb259..704f97068 100644
--- a/src/block/meson.build
+++ b/src/block/meson.build
@@ -13,7 +13,7 @@ if gnunet_monolith == false
           include_directories: [incdir, configuration_inc])
   libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup)
 else
-  foreach p : libgnunetblock_src + gnunetserviceblock_src
+  foreach p : libgnunetblock_src + libgnunetblockgroup_src
     gnunet_src += 'block/' + p
   endforeach
 endif
diff --git a/src/curl/meson.build b/src/curl/meson.build
index 791118ecd..5e7769d6d 100644
--- a/src/curl/meson.build
+++ b/src/curl/meson.build
@@ -8,7 +8,7 @@ if gnunet_monolith == false
           include_directories: [incdir, configuration_inc])
   libgnunetcurl_dep = declare_dependency(link_with : libgnunetcurl)
 else
-  foreach p : libgnunetcurl_src + gnunetservicecurl_src
+  foreach p : libgnunetcurl_src
     gnunet_src += 'curl/' + p
   endforeach
 endif
diff --git a/src/json/meson.build b/src/json/meson.build
index cbb826a66..ca010ada6 100644
--- a/src/json/meson.build
+++ b/src/json/meson.build
@@ -11,7 +11,7 @@ if gnunet_monolith == false
           include_directories: [incdir, configuration_inc])
   libgnunetjson_dep = declare_dependency(link_with : libgnunetjson)
 else
-  foreach p : libgnunetjson_src + gnunetservicejson_src
+  foreach p : libgnunetjson_src
     gnunet_src += 'json/' + p
   endforeach
 endif
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
index ed3ef6907..d3441cc65 100644
--- a/src/nat-auto/meson.build
+++ b/src/nat-auto/meson.build
@@ -16,6 +16,6 @@ if gnunet_monolith == false
               include_directories: [incdir, configuration_inc])
 else
   foreach p : libgnunetnatauto_src + gnunetservicenatauto_src
-    gnunet_src += 'natauto/' + p
+    gnunet_src += 'nat-auto/' + p
   endforeach
 endif
diff --git a/src/nt/meson.build b/src/nt/meson.build
index cd0b757ac..17c7e1e9d 100644
--- a/src/nt/meson.build
+++ b/src/nt/meson.build
@@ -7,7 +7,7 @@ if gnunet_monolith == false
           include_directories: [incdir, configuration_inc])
   libgnunetnt_dep = declare_dependency(link_with : libgnunetnt)
 else
-  foreach p : libgnunetnt_src + gnunetservicent_src
+  foreach p : libgnunetnt_src
     gnunet_src += 'nt/' + p
   endforeach
 endif
diff --git a/src/sq/meson.build b/src/sq/meson.build
index 083ce9fbe..b995b54a4 100644
--- a/src/sq/meson.build
+++ b/src/sq/meson.build
@@ -11,7 +11,7 @@ if gnunet_monolith == false
           include_directories: [incdir, configuration_inc])
   libgnunetsq_dep = declare_dependency(link_with : libgnunetsq)
 else
-  foreach p : libgnunetsq_src + gnunetservicesq_src
+  foreach p : libgnunetsq_src
     gnunet_src += 'sq/' + p
   endforeach
 endif

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