[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/02: BUILD: Meson - install yet more files
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/02: BUILD: Meson - install yet more files |
|
Date: |
Sat, 23 Sep 2023 21:47:42 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 1ea50dc3c613a55ea3184b17b20b464be9a14b51
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Sep 23 21:34:09 2023 +0200
BUILD: Meson - install yet more files
---
src/nat/meson.build | 1 +
src/nse/meson.build | 1 +
src/nt/meson.build | 21 ++++++++++++------
src/peerinfo/meson.build | 38 +++++++++++++++++++++------------
src/peerstore/meson.build | 31 +++++++++++++++++----------
src/reclaim/meson.build | 2 ++
src/regex/meson.build | 53 +++++++++++++++++++++++++++++-----------------
src/rest/meson.build | 32 ++++++++++++++++++----------
src/statistics/meson.build | 4 +++-
src/util/meson.build | 5 ++++-
src/zonemaster/meson.build | 30 ++++++++++++++------------
11 files changed, 140 insertions(+), 78 deletions(-)
diff --git a/src/nat/meson.build b/src/nat/meson.build
index e660f59be..3acd77336 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -24,6 +24,7 @@ endif
libgnunetnat = library('gnunetnat',
libgnunetnat_src,
+ soversion: '2.0.0',
dependencies: libgnunetutil_dep,
include_directories: [incdir, configuration_inc],
install: true,
diff --git a/src/nse/meson.build b/src/nse/meson.build
index 0aeb9c96d..ea8f79e68 100644
--- a/src/nse/meson.build
+++ b/src/nse/meson.build
@@ -18,6 +18,7 @@ endif
libgnunetnse = library('gnunetnse',
libgnunetnse_src,
+ soversion: '0.0.0',
dependencies: libgnunetutil_dep,
include_directories: [incdir, configuration_inc],
install: true,
diff --git a/src/nt/meson.build b/src/nt/meson.build
index 981e1587d..5e018a4be 100644
--- a/src/nt/meson.build
+++ b/src/nt/meson.build
@@ -1,13 +1,20 @@
libgnunetnt_src = ['nt.c']
-if get_option('monolith') == false
- libgnunetnt = library('gnunetnt',
- libgnunetnt_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetnt_dep = declare_dependency(link_with : libgnunetnt)
-else
+if get_option('monolith')
foreach p : libgnunetnt_src
gnunet_src += 'nt/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetnt = library('gnunetnt',
+ libgnunetnt_src,
+ soversion: '0.0.0',
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetnt_dep = declare_dependency(link_with : libgnunetnt)
+pkg.generate(libgnunetnt, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing GNUnet NT')
+
diff --git a/src/peerinfo/meson.build b/src/peerinfo/meson.build
index 3fdc3801b..fad1c9720 100644
--- a/src/peerinfo/meson.build
+++ b/src/peerinfo/meson.build
@@ -10,21 +10,31 @@ configure_file(input : 'peerinfo.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetpeerinfo = library('gnunetpeerinfo',
- libgnunetpeerinfo_src,
- dependencies: [libgnunetutil_dep, libgnunethello_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetpeerinfo_dep = declare_dependency(link_with : libgnunetpeerinfo)
- executable ('gnunet-service-peerinfo',
- gnunetservicepeerinfo_src,
- dependencies: [libgnunetpeerinfo_dep,
- libgnunetutil_dep,
- libgnunetstatistics_dep,
- libgnunethello_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetpeerinfo_src + gnunetservicepeerinfo_src
gnunet_src += 'peerinfo/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetpeerinfo = library('gnunetpeerinfo',
+ libgnunetpeerinfo_src,
+ soversion: '0.0.0',
+ dependencies: [libgnunetutil_dep, libgnunethello_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetpeerinfo_dep = declare_dependency(link_with : libgnunetpeerinfo)
+pkg.generate(libgnunetpeerinfo, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the peerinfo service')
+
+executable ('gnunet-service-peerinfo',
+ gnunetservicepeerinfo_src,
+ dependencies: [libgnunetpeerinfo_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunethello_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
index f5727411c..d93042876 100644
--- a/src/peerstore/meson.build
+++ b/src/peerstore/meson.build
@@ -10,18 +10,27 @@ configure_file(input : 'peerstore.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetpeerstore = library('gnunetpeerstore',
- libgnunetpeerstore_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetpeerstore_dep = declare_dependency(link_with : libgnunetpeerstore)
- executable ('gnunet-service-peerstore',
- gnunetservicepeerstore_src,
- dependencies: [libgnunetpeerstore_dep, libgnunetutil_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetpeerstore_src + gnunetservicepeerstore_src
gnunet_src += 'peerstore/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetpeerstore = library('gnunetpeerstore',
+ libgnunetpeerstore_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetpeerstore, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the peerstore service')
+libgnunetpeerstore_dep = declare_dependency(link_with : libgnunetpeerstore)
+
+executable ('gnunet-service-peerstore',
+ gnunetservicepeerstore_src,
+ dependencies: [libgnunetpeerstore_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index ee32137a6..73d42d4bb 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -18,8 +18,10 @@ if get_option('monolith')
endforeach
subdir_done()
endif
+
libgnunetreclaim = library('gnunetreclaim',
libgnunetreclaim_src,
+ soversion: '0.0.0',
dependencies: [libgnunetutil_dep,
libgnunetidentity_dep],
include_directories: [incdir, configuration_inc],
diff --git a/src/regex/meson.build b/src/regex/meson.build
index f9e8c0ee1..cb5140128 100644
--- a/src/regex/meson.build
+++ b/src/regex/meson.build
@@ -13,27 +13,40 @@ configure_file(input : 'regex.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetregex = library('gnunetregex',
- libgnunetregex_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetregex_dep = declare_dependency(link_with : libgnunetregex)
- libgnunetregexblock = library('gnunetregexblock',
- libgnunetregexblock_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetregexblock_dep = declare_dependency(link_with : libgnunetregexblock)
- executable ('gnunet-service-regex',
- gnunetserviceregex_src,
- dependencies: [libgnunetregex_dep, libgnunetutil_dep,
- libgnunetdht_dep,
- libgnunetstatistics_dep,
- libgnunetregex_dep,
- libgnunetregexblock_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetregex_src + libgnunetregexblock_src +
gnunetserviceregex_src
gnunet_src += 'regex/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetregex = library('gnunetregex',
+ libgnunetregex_src,
+ soversion: '3.1.0',
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetregex, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the regex service')
+libgnunetregex_dep = declare_dependency(link_with : libgnunetregex)
+libgnunetregexblock = library('gnunetregexblock',
+ libgnunetregexblock_src,
+ soversion: '1.0.0',
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetregexblock_dep = declare_dependency(link_with : libgnunetregexblock)
+
+executable ('gnunet-service-regex',
+ gnunetserviceregex_src,
+ dependencies: [libgnunetregex_dep, libgnunetutil_dep,
+ libgnunetdht_dep,
+ libgnunetstatistics_dep,
+ libgnunetregex_dep,
+ libgnunetregexblock_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/rest/meson.build b/src/rest/meson.build
index 9b4314040..85a69c407 100644
--- a/src/rest/meson.build
+++ b/src/rest/meson.build
@@ -9,18 +9,28 @@ configure_file(input : 'rest.conf',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetrest = library('gnunetrest',
- libgnunetrest_src,
- dependencies: [libgnunetutil_dep, mhd_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetrest_dep = declare_dependency(link_with : libgnunetrest)
- executable ('gnunet-rest-server',
- gnunetservicerest_src,
- dependencies: [libgnunetrest_dep, libgnunetutil_dep, mhd_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetrest_src + gnunetservicerest_src
gnunet_src += 'rest/' + p
endforeach
+ subdir_done()
endif
+
+
+libgnunetrest = library('gnunetrest',
+ libgnunetrest_src,
+ dependencies: [libgnunetutil_dep, mhd_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetrest, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the REST service')
+libgnunetrest_dep = declare_dependency(link_with : libgnunetrest)
+
+executable ('gnunet-rest-server',
+ gnunetservicerest_src,
+ dependencies: [libgnunetrest_dep, libgnunetutil_dep, mhd_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/statistics/meson.build b/src/statistics/meson.build
index 446523416..0448c62a2 100644
--- a/src/statistics/meson.build
+++ b/src/statistics/meson.build
@@ -20,7 +20,9 @@ libgnunetstatistics = library('gnunetstatistics',
libgnunetstatistics_src,
soversion: '2.0.0',
dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetstatistics_dep = declare_dependency(link_with : libgnunetstatistics)
pkg.generate(libgnunetstatistics, url: 'https://www.gnunet.org',
description : 'Provides API of GNUnet statistics service')
diff --git a/src/util/meson.build b/src/util/meson.build
index eecb7d553..f790a403a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -80,13 +80,16 @@ if get_option('monolith')
foreach p : libgnunetutil_src
gnunet_src += 'util/' + p
endforeach
+ subdir_done()
endif
libgnunetutil = library('gnunetutil',
libgnunetutil_src,
soversion: '15.0.0',
dependencies: gnunetdeps,
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetutil_dep = declare_dependency(link_with : libgnunetutil)
pkg.generate(libgnunetutil, url: 'https://www.gnunet.org',
description : 'Provides miscellaneous utility functions and API
for GNUnet')
diff --git a/src/zonemaster/meson.build b/src/zonemaster/meson.build
index c6a8c2baf..44c67edf2 100644
--- a/src/zonemaster/meson.build
+++ b/src/zonemaster/meson.build
@@ -7,20 +7,24 @@ configure_file(input : 'zonemaster.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- executable ('gnunet-service-zonemaster',
- gnunetservicezonemaster_src,
- dependencies: [
- libgnunetutil_dep,
- libgnunetdht_dep,
- libgnunetidentity_dep,
- libgnunetstatistics_dep,
- libgnunetnamecache_dep,
- libgnunetnamestore_dep,
- libgnunetgnsrecord_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : gnunetservicezonemaster_src
gnunet_src += 'zonemaster/' + p
endforeach
+ subdir_done()
endif
+
+executable ('gnunet-service-zonemaster',
+ gnunetservicezonemaster_src,
+ dependencies: [
+ libgnunetutil_dep,
+ libgnunetdht_dep,
+ libgnunetidentity_dep,
+ libgnunetstatistics_dep,
+ libgnunetnamecache_dep,
+ libgnunetnamestore_dep,
+ libgnunetgnsrecord_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.