[gnunet] branch master updated: BUILD: More meson conversions

[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 c987ce850 BUILD: More meson conversions
c987ce850 is described below

commit c987ce850656cba2b60d3100e74c61d5a7c781fd
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Sep 21 13:46:59 2023 +0200

    BUILD: More meson conversions
---
 src/fs/meson.build  | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gns/meson.build |  9 +++++++
 src/meson.build     |  2 +-
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/src/fs/meson.build b/src/fs/meson.build
new file mode 100644
index 000000000..9bf7b3142
--- /dev/null
+++ b/src/fs/meson.build
@@ -0,0 +1,76 @@
+libgnunetfs_src = ['fs_api.c',
+                   'fs_directory.c',
+                   'fs_dirmetascan.c',
+                   'fs_download.c',
+                   'fs_file_information.c',
+                   'fs_getopt.c',
+                   'fs_list_indexed.c',
+                   'fs_publish.c',
+                   'fs_publish_ksk.c',
+                   'fs_publish_ublock.c',
+                   'fs_misc.c',
+                   'fs_namespace.c',
+                   'fs_search.c',
+                   'fs_sharetree.c',
+                   'fs_tree.c',
+                   'fs_unindex.c',
+                   'fs_uri.c',
+                   'meta_data.c']
+
+gnunetservicefs_src = ['gnunet-service-fs.c',
+                       'gnunet-service-fs_cp.c',
+                       'gnunet-service-fs_indexing.c',
+                       'gnunet-service-fs_pe.c',
+                       'gnunet-service-fs_pr.c',
+                       'gnunet-service-fs_push.c',
+                       'gnunet-service-fs_put.c',
+                       'gnunet-service-fs_cadet_client.c',
+                       'gnunet-service-fs_cadet_server.c']
+
+
+if get_option('monolith') == false
+  libgnunetfs = library('gnunetfs',
+          libgnunetfs_src,
+          dependencies: [libgnunetutil_dep,
+                         libgnunetdatastore_dep,
+                         libgnunetstatistics_dep,
+                         unistr_dep],
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir'))
+  libgnunetfs_dep = declare_dependency(link_with : libgnunetfs)
+  executable ('gnunet-search',
+              'gnunet-search.c',
+              dependencies: [libgnunetfs_dep,
+                             libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
+  executable ('gnunet-unindex',
+              'gnunet-unindex.c',
+              dependencies: [libgnunetfs_dep,
+                             libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
+  executable ('gnunet-service-fs',
+              gnunetservicefs_src,
+              dependencies: [libgnunetfs_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetcore_dep,
+                             libgnunetdht_dep,
+                             libgnunetidentity_dep,
+                             libgnunetats_dep,
+                             libgnunetcadet_dep,
+                             libgnunetpeerstore_dep,
+                             libgnunetdatastore_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+else
+  foreach p : libgnunetfs_src + gnunetservicefs_src
+    gnunet_src += 'fs/' + p
+  endforeach
+endif
diff --git a/src/gns/meson.build b/src/gns/meson.build
index afbecbe64..45688f975 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -15,6 +15,15 @@ if get_option('monolith') == false
           install: true,
           install_dir: get_option('libdir'))
   libgnunetgns_dep = declare_dependency(link_with : libgnunetgns)
+  executable ('gnunet-gns',
+              'gnunet-gns.c',
+              dependencies: [libgnunetgns_dep,
+                             libgnunetgnsrecord_dep,
+                             idn_dep,
+                             libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('bindir'))
   executable ('gnunet-service-gns',
               gnunetservicegns_src,
               dependencies: [libgnunetgns_dep,
diff --git a/src/meson.build b/src/meson.build
index 560c24917..9ae2df0d8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -62,7 +62,7 @@ subdir('vpn')
 subdir('gns')
 subdir('zonemaster')
 ##subdir('$(CONVERSATION_DIR)')
-#subdir('fs')
+subdir('fs')
 #subdir('exit')
 #subdir('pt')
 #subdir('secretsharing')

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