[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: BUILD: More pkgconfig
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: BUILD: More pkgconfig |
|
Date: |
Sat, 23 Sep 2023 20:32:44 +0200 |
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 c6ab90d78 BUILD: More pkgconfig
new 398c154d9 Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
c6ab90d78 is described below
commit c6ab90d784d0cd166b86f70b100a97f5d2ffe347
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Sep 23 20:28:24 2023 +0200
BUILD: More pkgconfig
---
contrib/gana | 2 +-
contrib/sphinx | 2 +-
src/ats/meson.build | 13 +++++++
src/block/meson.build | 3 ++
src/cadet/meson.build | 3 ++
src/dhtu/meson.build | 19 +++++----
src/dns/meson.build | 55 ++++++++++++++------------
src/fragmentation/meson.build | 17 ++++----
src/fs/meson.build | 91 +++++++++++++++++++++++--------------------
src/hello/meson.build | 28 +++++++------
src/identity/meson.build | 36 ++++++++++-------
src/json/meson.build | 18 +++++----
src/messenger/meson.build | 60 +++++++++++++++-------------
13 files changed, 202 insertions(+), 145 deletions(-)
diff --git a/contrib/gana b/contrib/gana
index c9bda2187..c1dc2dc97 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit c9bda21875ea1775f88b71de735d527132e45922
+Subproject commit c1dc2dc975742c929a523c22d91f7d4f82787230
diff --git a/contrib/sphinx b/contrib/sphinx
index 0cccef450..9c5b9d904 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 0cccef450b037a48170402117f7d3b6c0a4272af
+Subproject commit 9c5b9d9040d21542eff792e26624cf9669b127aa
diff --git a/src/ats/meson.build b/src/ats/meson.build
index de9289efc..123f394bf 100644
--- a/src/ats/meson.build
+++ b/src/ats/meson.build
@@ -28,6 +28,7 @@ endif
libgnunetats = library('gnunetats',
libgnunetats_src,
+ soversion: '4.0.0',
dependencies: [libgnunetutil_dep, libgnunethello_dep],
include_directories: [incdir, configuration_inc],
install: true,
@@ -35,6 +36,18 @@ libgnunetats = library('gnunetats',
pkg.generate(libgnunetats, url : 'https://www.gnunet.org',
description : 'Provides API for allocating bandwidth, expressing
preferences for certain peers and accessing allocation information')
libgnunetats_dep = declare_dependency(link_with : libgnunetats)
+
+shared_module('gnunet_plugin_ats_proportional',
+ ['plugin_ats_proportional.c'],
+ dependencies: [libgnunetutil_dep,
+ libgnunetats_dep,
+ libgnunetstatistics_dep,
+ libgnunetnt_dep,
+ libgnunetstatistics_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+
executable ('gnunet-service-ats',
gnunetserviceats_src,
dependencies: [libgnunetats_dep, libgnunetutil_dep,
diff --git a/src/block/meson.build b/src/block/meson.build
index 18fd71bb0..5b0542c19 100644
--- a/src/block/meson.build
+++ b/src/block/meson.build
@@ -16,6 +16,9 @@ libgnunetblock = library('gnunetblock',
soversion: '0.0.0',
install_dir: get_option('libdir'))
libgnunetblock_dep = declare_dependency(link_with : libgnunetblock)
+pkg.generate(libgnunetblock, url: 'https://www.gnunet.org',
+ description : 'Library for data block manipulation')
+
libgnunetblockgroup = library('gnunetblockgroup',
libgnunetblockgroup_src,
dependencies: [libgnunetutil_dep, libgnunetblock_dep],
diff --git a/src/cadet/meson.build b/src/cadet/meson.build
index baeecdcd3..6c9b6727f 100644
--- a/src/cadet/meson.build
+++ b/src/cadet/meson.build
@@ -37,6 +37,9 @@ libgnunetcadet = library('gnunetcadet',
soversion: '7.0.0',
install_dir: get_option('libdir'))
libgnunetcadet_dep = declare_dependency(link_with : libgnunetcadet)
+pkg.generate(libgnunetcadet, url: 'https://www.gnunet.org',
+ description : 'API for multicast and multi-hop routing between
GNUnet peers')
+
executable ('gnunet-cadet',
gnunetservicecadet_src,
dependencies: [libgnunetcadet_dep,
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
index 8ac1feb43..155b6744c 100644
--- a/src/dhtu/meson.build
+++ b/src/dhtu/meson.build
@@ -7,13 +7,18 @@ configure_file(input : 'dhtu.conf',
install: true,
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetplugindhtuip = library('gnunet_plugin_dhtu_ip',
+if get_option('monolith')
+ foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src
+ gnunet_src += 'dhtu/' + p
+ endforeach
+endif
+
+shared_module('gnunet_plugin_dhtu_ip',
libgnunetplugindhtuip_src,
dependencies: [libgnunetutil_dep, m_dep],
include_directories: [incdir, configuration_inc])
- libgnunetplugindhtuip_dep = declare_dependency(link_with :
libgnunetplugindhtuip)
- libgnunetplugindhtugnunet = library('gnunet_plugin_dhtu_gnunet',
+
+shared_module('gnunet_plugin_dhtu_gnunet',
libgnunetplugindhtugnunet_src,
dependencies: [libgnunetutil_dep,
libgnunetats_dep,
@@ -24,9 +29,3 @@ if get_option('monolith') == false
libgnunetnse_dep,
libgnunettransport_dep],
include_directories: [incdir, configuration_inc])
- libgnunetplugindhtugnunet_dep = declare_dependency(link_with :
libgnunetplugindhtugnunet)
-else
- foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src
- gnunet_src += 'dhtu/' + p
- endforeach
-endif
diff --git a/src/dns/meson.build b/src/dns/meson.build
index 9eb26aeee..9cc98b24a 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -11,32 +11,37 @@ configure_file(input : 'dns.conf.in',
install: true,
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetdns = library('gnunetdns',
- libgnunetdns_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetdns_dep = declare_dependency(link_with : libgnunetdns)
- libgnunetpluginblockdns = library('gnunet_plugin_block_dns',
- libgnunetpluginblockdns_src,
- dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetpluginblockdns_dep = declare_dependency(link_with :
libgnunetpluginblockdns)
- executable ('gnunet-service-dns',
- gnunetservicedns_src,
- dependencies: [libgnunetdns_dep, libgnunetutil_dep,
- libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
- executable ('gnunet-dns-monitor',
- gnunetdnsmonitor_src,
- dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
- include_directories: [incdir, configuration_inc])
- executable ('gnunet-dns-redirector',
- gnunetdnsredirector_src,
- dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetdns_src + gnunetservicedns_src +
libgnunetpluginblockdns_src
gnunet_src += 'dns/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetdns = library('gnunetdns',
+ libgnunetdns_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc])
+libgnunetdns_dep = declare_dependency(link_with : libgnunetdns)
+pkg.generate(libgnunetdns, url: 'https://www.gnunet.org',
+ description : 'Provides API to access GNUnet\'s DNS service (to
intercept and manipulate DNS queries)')
+
+shared_module('gnunet_plugin_block_dns',
+ libgnunetpluginblockdns_src,
+ dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep],
+ include_directories: [incdir, configuration_inc])
+
+executable ('gnunet-service-dns',
+ gnunetservicedns_src,
+ dependencies: [libgnunetdns_dep, libgnunetutil_dep,
+ libgnunetstatistics_dep],
+ include_directories: [incdir, configuration_inc])
+executable ('gnunet-dns-monitor',
+ gnunetdnsmonitor_src,
+ dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
+ include_directories: [incdir, configuration_inc])
+executable ('gnunet-dns-redirector',
+ gnunetdnsredirector_src,
+ dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
+ include_directories: [incdir, configuration_inc])
+
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build
index 1292d6012..486c560c2 100644
--- a/src/fragmentation/meson.build
+++ b/src/fragmentation/meson.build
@@ -1,14 +1,17 @@
libgnunetfragmentation_src = ['fragmentation.c',
'defragmentation.c']
-if get_option('monolith') == false
- libgnunetfragmentation = library('gnunetfragmentation',
- libgnunetfragmentation_src,
- dependencies: [m_dep, libgnunetutil_dep, libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetfragmentation_dep = declare_dependency(link_with :
libgnunetfragmentation)
-else
+if get_option('monolith')
foreach p : libgnunetfragmentation_src
gnunet_src += 'fragmentation/' + p
endforeach
endif
+
+libgnunetfragmentation = library('gnunetfragmentation',
+ libgnunetfragmentation_src,
+ dependencies: [m_dep, libgnunetutil_dep, libgnunetstatistics_dep],
+ include_directories: [incdir, configuration_inc])
+libgnunetfragmentation_dep = declare_dependency(link_with :
libgnunetfragmentation)
+pkg.generate(libgnunetfragmentation, url: 'https://www.gnunet.org',
+ description : 'Provides API for sending and receiving messages
that are larger than the MTU of the transport')
+
diff --git a/src/fs/meson.build b/src/fs/meson.build
index 9351f100d..855cccaea 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -34,50 +34,55 @@ configure_file(input : 'fs.conf.in',
install_dir: pkgcfgdir)
-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,
- m_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
+if get_option('monolith')
foreach p : libgnunetfs_src + gnunetservicefs_src
gnunet_src += 'fs/' + p
endforeach
endif
+
+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)
+pkg.generate(libgnunetfs, url: 'https://www.gnunet.org',
+ description : 'Provides API for GNUnet File-Sharing service')
+
+
+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,
+ m_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')
+
diff --git a/src/hello/meson.build b/src/hello/meson.build
index 843531bb5..23f26db31 100644
--- a/src/hello/meson.build
+++ b/src/hello/meson.build
@@ -6,18 +6,24 @@ libgnunethello_src = ['hello.c',
gnunethello_src = ['gnunet-hello.c']
-if get_option('monolith') == false
- libgnunethello = library('gnunethello',
- libgnunethello_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunethello_dep = declare_dependency(link_with : libgnunethello)
- executable ('gnunet-hello',
- gnunethello_src,
- dependencies: [libgnunethello_dep, libgnunetutil_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunethello_src
gnunet_src += 'hello/' + p
endforeach
+ subdir_done()
endif
+
+libgnunethello = library('gnunethello',
+ libgnunethello_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc])
+libgnunethello_dep = declare_dependency(link_with : libgnunethello)
+pkg.generate(libgnunethello, url: 'https://www.gnunet.org',
+ description : 'Helper library for handling GNUnet HELLO messages')
+
+
+executable ('gnunet-hello',
+ gnunethello_src,
+ dependencies: [libgnunethello_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc])
+
diff --git a/src/identity/meson.build b/src/identity/meson.build
index 9c1199d5f..e792752a7 100644
--- a/src/identity/meson.build
+++ b/src/identity/meson.build
@@ -11,20 +11,30 @@ configure_file(input : 'identity.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetidentity = library('gnunetidentity',
- libgnunetidentity_src,
- dependencies: [libgnunetutil_dep, sodium_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetidentity_dep = declare_dependency(link_with : libgnunetidentity)
- executable ('gnunet-service-identity',
- gnunetserviceidentity_src,
- dependencies: [libgnunetidentity_dep,
- libgnunetutil_dep,
- libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetidentity_src + gnunetserviceidentity_src
gnunet_src += 'identity/' + p
endforeach
endif
+
+libgnunetidentity = library('gnunetidentity',
+ libgnunetidentity_src,
+ dependencies: [libgnunetutil_dep, sodium_dep],
+ include_directories: [incdir, configuration_inc])
+libgnunetidentity_dep = declare_dependency(link_with : libgnunetidentity)
+pkg.generate(libgnunetidentity, url: 'https://www.gnunet.org',
+ description : 'API to access and organize private keys of the
user egos')
+
+executable ('gnunet-identity',
+ ['gnunet-identity.c'],
+ dependencies: [libgnunetidentity_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep],
+ include_directories: [incdir, configuration_inc])
+executable ('gnunet-service-identity',
+ gnunetserviceidentity_src,
+ dependencies: [libgnunetidentity_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep],
+ include_directories: [incdir, configuration_inc])
+
diff --git a/src/json/meson.build b/src/json/meson.build
index 769e9d4cf..9c3566335 100644
--- a/src/json/meson.build
+++ b/src/json/meson.build
@@ -4,14 +4,18 @@ libgnunetjson_src = ['json.c',
'json_mhd.c',
'json_pack.c']
-if get_option('monolith') == false
- libgnunetjson = library('gnunetjson',
- libgnunetjson_src,
- dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetjson_dep = declare_dependency(link_with : libgnunetjson)
-else
+if get_option('monolith')
foreach p : libgnunetjson_src
gnunet_src += 'json/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetjson = library('gnunetjson',
+ libgnunetjson_src,
+ dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep],
+ include_directories: [incdir, configuration_inc])
+libgnunetjson_dep = declare_dependency(link_with : libgnunetjson)
+pkg.generate(libgnunetarm, url: 'https://www.gnunet.org',
+ description : 'Library for JSON de/serialization')
+
diff --git a/src/messenger/meson.build b/src/messenger/meson.build
index 7555328e1..e2e74c5e7 100644
--- a/src/messenger/meson.build
+++ b/src/messenger/meson.build
@@ -28,34 +28,40 @@ gnunetservicemessenger_src = ['gnunet-service-messenger.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
+if get_option('monolith')
foreach p : libgnunetmessenger_src + gnunetservicemessenger_src
gnunet_src += 'messenger/' + p
endforeach
+ subdir_done()
endif
+
+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)
+pkg.generate(libgnunetmessenger, url: 'https://www.gnunet.org',
+ description : 'Provides API to access the GNUnet Messenger
subsystem')
+
+
+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')
+
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: BUILD: More pkgconfig,
gnunet <=