[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (398c154d9 -> 8ac5695b5)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (398c154d9 -> 8ac5695b5) |
|
Date: |
Sat, 23 Sep 2023 21:17:31 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a change to branch master
in repository gnunet.
from 398c154d9 Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
new dca0afc85 BUILD: More pkgconfig and installation
new 8ac5695b5 BUILD: Meson - install more files
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/ats/meson.build | 2 +-
src/block/meson.build | 5 ++--
src/conversation/meson.build | 7 +----
src/datacache/meson.build | 14 ++++++++--
src/datastore/meson.build | 20 ++++++++++----
src/dht/meson.build | 22 +++++++++++++--
src/dhtu/meson.build | 9 ++++--
src/dns/meson.build | 20 ++++++++++----
src/fragmentation/meson.build | 4 ++-
src/fs/meson.build | 1 +
src/gnsrecord/meson.build | 42 ++++++++++++++++++----------
src/hello/meson.build | 9 ++++--
src/hostlist/meson.build | 29 +++++++++-----------
src/identity/meson.build | 12 ++++++--
src/json/meson.build | 7 +++--
src/messenger/meson.build | 1 +
src/namecache/meson.build | 21 ++++++++++----
src/namestore/meson.build | 21 ++++++++++----
src/nat/meson.build | 33 ++++++++++++++--------
src/nse/meson.build | 37 +++++++++++++++----------
src/reclaim/meson.build | 64 +++++++++++++++++++++++--------------------
src/revocation/meson.build | 62 ++++++++++++++++++++++++++++++-----------
src/statistics/meson.build | 37 +++++++++++++++++--------
23 files changed, 321 insertions(+), 158 deletions(-)
diff --git a/src/ats/meson.build b/src/ats/meson.build
index 123f394bf..2719ea219 100644
--- a/src/ats/meson.build
+++ b/src/ats/meson.build
@@ -46,7 +46,7 @@ shared_module('gnunet_plugin_ats_proportional',
libgnunetstatistics_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir'))
+ install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-service-ats',
gnunetserviceats_src,
diff --git a/src/block/meson.build b/src/block/meson.build
index 5b0542c19..3b0a211ab 100644
--- a/src/block/meson.build
+++ b/src/block/meson.build
@@ -34,11 +34,12 @@ shared_module('gnunet_plugin_block_test',
dependencies: plugin_dep,
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir'))
+ install_dir: get_option('libdir')/'gnunet')
+
shared_module('gnunet_plugin_block_template',
['plugin_block_template.c'],
dependencies: plugin_dep,
include_directories: [incdir, configuration_inc],
install: false,
- install_dir: get_option('libdir'))
+ install_dir: get_option('libdir')/'gnunet')
diff --git a/src/conversation/meson.build b/src/conversation/meson.build
index d4d905e6f..37da098d9 100644
--- a/src/conversation/meson.build
+++ b/src/conversation/meson.build
@@ -66,12 +66,7 @@ shared_module('gnunet_plugin_gnsrecord_conversation',
libgnunetidentity_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir'))
-
-libgnunetconversation_dep = declare_dependency(link_with :
libgnunetconversation)
-pkg.generate(libgnunetconversation, url: 'https://www.gnunet.org',
- description : 'Provides API to access the GNU Name System')
-
+ install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-conversation',
'gnunet-conversation.c',
diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index 8613e527f..4342c1ecf 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -19,7 +19,9 @@ libgnunetdatacache = library('gnunetdatacache',
libgnunetdatacache_src,
soversion: '0.1.0',
dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetdatacache_dep = declare_dependency(link_with : libgnunetdatacache)
pkg.generate(libgnunetdatacache, url: 'https://www.gnunet.org',
description : 'Provides datacache API for temporary storage to
disk')
@@ -30,7 +32,11 @@ shared_module('gnunet_plugin_datacache_sqlite',
libgnunetdatacache_dep,
sqlite_dep,
libgnunetsq_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
+
+
if pq_dep.found()
shared_module('gnunet_plugin_datacache_postgres',
['plugin_datacache_postgres.c'],
@@ -38,5 +44,7 @@ if pq_dep.found()
libgnunetdatacache_dep,
pq_dep,
libgnunetpq_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
endif
diff --git a/src/datastore/meson.build b/src/datastore/meson.build
index 6c83b228b..9fc161d4b 100644
--- a/src/datastore/meson.build
+++ b/src/datastore/meson.build
@@ -23,7 +23,9 @@ libgnunetdatastore = library('gnunetdatastore',
dependencies: [libgnunetutil_dep,
libgnunetstatistics_dep,
libgnunetdatacache_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetdatastore_dep = declare_dependency(link_with : libgnunetdatastore)
pkg.generate(libgnunetdatastore, url: 'https://www.gnunet.org',
description : 'Management API for the datastore for persistent
storage to disk')
@@ -34,7 +36,9 @@ shared_module('gnunet_plugin_datastore_sqlite',
libgnunetdatastore_dep,
sqlite_dep,
libgnunetsq_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
if pq_dep.found()
shared_module('gnunet_plugin_datastore_postgres',
@@ -43,7 +47,9 @@ if pq_dep.found()
libgnunetdatastore_dep,
pq_dep,
libgnunetpq_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
endif
executable ('gnunet-datastore',
@@ -52,12 +58,16 @@ executable ('gnunet-datastore',
libgnunetutil_dep,
libgnunetstatistics_dep,
libgnunetdatacache_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-datastore',
gnunetservicedatastore_src,
dependencies: [libgnunetdatastore_dep,
libgnunetutil_dep,
libgnunetstatistics_dep,
libgnunetdatacache_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/dht/meson.build b/src/dht/meson.build
index 8b595a58f..572cc6e5d 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -21,7 +21,9 @@ libgnunetdht = library('gnunetdht',
libgnunetdht_src,
soversion: '4.0.0',
dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetdht_dep = declare_dependency(link_with : libgnunetdht)
pkg.generate(libgnunetdht, url: 'https://www.gnunet.org',
description : 'Provides API for the R5N distributed hash table')
@@ -34,6 +36,19 @@ shared_module('gnunet_plugin_block_dht',
libgnunetblockgroup_dep],
include_directories: [incdir, configuration_inc])
+executable ('gnunet-dht',
+ gnunetservicedht_src,
+ dependencies: [libgnunetdht_dep, libgnunetutil_dep,
+ libgnunetblock_dep,
+ m_dep,
+ libgnunetdatacache_dep,
+ libgnunetstatistics_dep,
+ libgnunetblockgroup_dep,
+ libgnunethello_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+
executable ('gnunet-service-dht',
gnunetservicedht_src,
dependencies: [libgnunetdht_dep, libgnunetutil_dep,
@@ -43,4 +58,7 @@ executable ('gnunet-service-dht',
libgnunetstatistics_dep,
libgnunetblockgroup_dep,
libgnunethello_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
index 155b6744c..bec4c2ec2 100644
--- a/src/dhtu/meson.build
+++ b/src/dhtu/meson.build
@@ -16,7 +16,9 @@ endif
shared_module('gnunet_plugin_dhtu_ip',
libgnunetplugindhtuip_src,
dependencies: [libgnunetutil_dep, m_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
shared_module('gnunet_plugin_dhtu_gnunet',
libgnunetplugindhtugnunet_src,
@@ -28,4 +30,7 @@ shared_module('gnunet_plugin_dhtu_gnunet',
libgnunetpeerinfo_dep,
libgnunetnse_dep,
libgnunettransport_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
+
diff --git a/src/dns/meson.build b/src/dns/meson.build
index 9cc98b24a..54d92109d 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -21,7 +21,9 @@ endif
libgnunetdns = library('gnunetdns',
libgnunetdns_src,
dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
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)')
@@ -29,19 +31,27 @@ pkg.generate(libgnunetdns, url: 'https://www.gnunet.org',
shared_module('gnunet_plugin_block_dns',
libgnunetpluginblockdns_src,
dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-service-dns',
gnunetservicedns_src,
dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-dns-monitor',
gnunetdnsmonitor_src,
dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
executable ('gnunet-dns-redirector',
gnunetdnsredirector_src,
dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build
index 486c560c2..fa3d08a0a 100644
--- a/src/fragmentation/meson.build
+++ b/src/fragmentation/meson.build
@@ -10,7 +10,9 @@ endif
libgnunetfragmentation = library('gnunetfragmentation',
libgnunetfragmentation_src,
dependencies: [m_dep, libgnunetutil_dep, libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
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 855cccaea..5fb5a1ff4 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -42,6 +42,7 @@ endif
libgnunetfs = library('gnunetfs',
libgnunetfs_src,
+ soversion: '3.1.1',
dependencies: [libgnunetutil_dep,
libgnunetdatastore_dep,
libgnunetstatistics_dep,
diff --git a/src/gnsrecord/meson.build b/src/gnsrecord/meson.build
index f98415ce5..e6ea8237f 100644
--- a/src/gnsrecord/meson.build
+++ b/src/gnsrecord/meson.build
@@ -4,22 +4,34 @@ libgnunetgnsrecord_src = ['gnsrecord.c',
'gnsrecord_misc.c']
libgnunetgnsrecordjson_src = ['json_gnsrecord.c']
-if get_option('monolith') == false
- libgnunetgnsrecord = library('gnunetgnsrecord',
- libgnunetgnsrecord_src,
- dependencies: [libgnunetutil_dep,
- sodium_dep,
- libgnunetidentity_dep,
- gcrypt_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord)
- libgnunetgnsrecordjson = library('gnunetgnsrecordjson',
- libgnunetgnsrecordjson_src,
- dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetgnsrecordjson_dep = declare_dependency(link_with :
libgnunetgnsrecord)
-else
+if get_option('monolith')
foreach p : libgnunetgnsrecord_src + libgnunetgnsrecordjson_src
gnunet_src += 'gnsrecord/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetgnsrecord = library('gnunetgnsrecord',
+ libgnunetgnsrecord_src,
+ soversion: '0.0.0',
+ dependencies: [libgnunetutil_dep,
+ sodium_dep,
+ libgnunetidentity_dep,
+ gcrypt_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord)
+pkg.generate(libgnunetgnsrecord, url: 'https://www.gnunet.org',
+ description : 'Provides API for manipulating GNS records')
+
+
+libgnunetgnsrecordjson = library('gnunetgnsrecordjson',
+ libgnunetgnsrecordjson_src,
+ soversion: '0.0.0',
+ dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecord)
+
diff --git a/src/hello/meson.build b/src/hello/meson.build
index 23f26db31..bac772f32 100644
--- a/src/hello/meson.build
+++ b/src/hello/meson.build
@@ -15,8 +15,11 @@ endif
libgnunethello = library('gnunethello',
libgnunethello_src,
+ soversion: '1.0.1',
dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunethello_dep = declare_dependency(link_with : libgnunethello)
pkg.generate(libgnunethello, url: 'https://www.gnunet.org',
description : 'Helper library for handling GNUnet HELLO messages')
@@ -25,5 +28,7 @@ pkg.generate(libgnunethello, url: 'https://www.gnunet.org',
executable ('gnunet-hello',
gnunethello_src,
dependencies: [libgnunethello_dep, libgnunetutil_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build
index 8cdcf3972..99cc089df 100644
--- a/src/hostlist/meson.build
+++ b/src/hostlist/meson.build
@@ -9,20 +9,17 @@ configure_file(input : 'hostlist.conf',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- executable ('gnunet-daemon-hostlist',
- gnunetdaemonhostlist_src,
- dependencies: [libgnunetutil_dep,
- libgnunetcore_dep,
- libgnunethello_dep,
- libgnunetpeerinfo_dep,
- libgnunetstatistics_dep,
- libgnunettransport_dep,
- mhd_dep,
- curl_dep],
- include_directories: [incdir, configuration_inc])
-else
- #foreach p : gnunetdaemonhostlist_src
- # gnunet_src += 'hostlist/' + p
- #endforeach
+if get_option('monolith')
+ subdir_done()
endif
+executable ('gnunet-daemon-hostlist',
+ gnunetdaemonhostlist_src,
+ dependencies: [libgnunetutil_dep,
+ libgnunetcore_dep,
+ libgnunethello_dep,
+ libgnunetpeerinfo_dep,
+ libgnunetstatistics_dep,
+ libgnunettransport_dep,
+ mhd_dep,
+ curl_dep],
+ include_directories: [incdir, configuration_inc])
diff --git a/src/identity/meson.build b/src/identity/meson.build
index e792752a7..b9d54fa91 100644
--- a/src/identity/meson.build
+++ b/src/identity/meson.build
@@ -20,7 +20,9 @@ endif
libgnunetidentity = library('gnunetidentity',
libgnunetidentity_src,
dependencies: [libgnunetutil_dep, sodium_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
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')
@@ -30,11 +32,15 @@ executable ('gnunet-identity',
dependencies: [libgnunetidentity_dep,
libgnunetutil_dep,
libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-identity',
gnunetserviceidentity_src,
dependencies: [libgnunetidentity_dep,
libgnunetutil_dep,
libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/json/meson.build b/src/json/meson.build
index 9c3566335..92356b5a5 100644
--- a/src/json/meson.build
+++ b/src/json/meson.build
@@ -13,9 +13,12 @@ endif
libgnunetjson = library('gnunetjson',
libgnunetjson_src,
+ soversion: '0.0.0',
dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetjson_dep = declare_dependency(link_with : libgnunetjson)
-pkg.generate(libgnunetarm, url: 'https://www.gnunet.org',
+pkg.generate(libgnunetjson, url: 'https://www.gnunet.org',
description : 'Library for JSON de/serialization')
diff --git a/src/messenger/meson.build b/src/messenger/meson.build
index e2e74c5e7..097ba5d49 100644
--- a/src/messenger/meson.build
+++ b/src/messenger/meson.build
@@ -37,6 +37,7 @@ endif
libgnunetmessenger = library('gnunetmessenger',
libgnunetmessenger_src,
+ soversion: '0.0.0',
dependencies: [libgnunetutil_dep,
libgnunetcadet_dep,
libgnunetidentity_dep],
diff --git a/src/namecache/meson.build b/src/namecache/meson.build
index 719d94c0b..f00fbae41 100644
--- a/src/namecache/meson.build
+++ b/src/namecache/meson.build
@@ -22,7 +22,9 @@ libgnunetnamecache = library('gnunetnamecache',
soversion: '0.0.0',
dependencies: [libgnunetutil_dep,
libgnunetgnsrecord_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetnamecache_dep = declare_dependency(link_with : libgnunetnamecache)
pkg.generate(libgnunetnamecache, url: 'https://www.gnunet.org',
description : 'Provides API for storing GNS records to a cache')
@@ -33,7 +35,9 @@ shared_module('gnunet_plugin_namecache_sqlite',
libgnunetgnsrecord_dep,
sqlite_dep,
libgnunetsq_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
if pq_dep.found()
shared_module('gnunet_plugin_namecache_postgres',
@@ -42,7 +46,9 @@ if pq_dep.found()
libgnunetgnsrecord_dep,
pq_dep,
libgnunetpq_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
endif
executable ('gnunet-namecache',
@@ -51,11 +57,16 @@ executable ('gnunet-namecache',
libgnunetutil_dep,
libgnunetgnsrecord_dep,
libgnunetidentity_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-namecache',
gnunetservicenamecache_src,
dependencies: [libgnunetnamecache_dep,
libgnunetutil_dep,
libgnunetgnsrecord_dep,
libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/namestore/meson.build b/src/namestore/meson.build
index 5b20d93ae..f531158ee 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -24,7 +24,9 @@ libgnunetnamestore = library('gnunetnamestore',
dependencies: [libgnunetutil_dep,
libgnunetgnsrecord_dep,
libgnunetidentity_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetnamestore_dep = declare_dependency(link_with : libgnunetnamestore)
pkg.generate(libgnunetnamestore, url: 'https://www.gnunet.org',
description : 'Provides API for storing GNS records to a
database')
@@ -37,7 +39,9 @@ shared_module('gnunet_plugin_namestore_sqlite',
libgnunetsq_dep,
libgnunetstatistics_dep,
sqlite_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
if pq_dep.found()
shared_module('gnunet_plugin_namestore_postgres',
@@ -48,7 +52,9 @@ if pq_dep.found()
libgnunetpq_dep,
libgnunetstatistics_dep,
pq_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
endif
executable ('gnunet-namestore',
@@ -57,7 +63,9 @@ executable ('gnunet-namestore',
libgnunetutil_dep,
libgnunetgnsrecord_dep,
libgnunetidentity_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-namestore',
gnunetservicenamestore_src,
dependencies: [libgnunetnamestore_dep,
@@ -66,4 +74,7 @@ executable ('gnunet-service-namestore',
libgnunetgnsrecord_dep,
libgnunetidentity_dep,
libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/nat/meson.build b/src/nat/meson.build
index 23c2bb18d..e660f59be 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -15,19 +15,28 @@ configure_file(input : 'nat.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetnat = library('gnunetnat',
- libgnunetnat_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetnat_dep = declare_dependency(link_with : libgnunetnat)
- executable ('gnunet-service-nat',
- gnunetservicenat_src,
- dependencies: [libgnunetnat_dep, libgnunetutil_dep,
- libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetnat_src + gnunetservicenat_src
gnunet_src += 'nat/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetnat = library('gnunetnat',
+ libgnunetnat_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetnat_dep = declare_dependency(link_with : libgnunetnat)
+pkg.generate(libgnunetnat, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the NAT service')
+
+executable ('gnunet-service-nat',
+ gnunetservicenat_src,
+ dependencies: [libgnunetnat_dep, libgnunetutil_dep,
+ libgnunetstatistics_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/nse/meson.build b/src/nse/meson.build
index 1fe8fe39e..0aeb9c96d 100644
--- a/src/nse/meson.build
+++ b/src/nse/meson.build
@@ -9,21 +9,30 @@ configure_file(input : 'nse.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetnse = library('gnunetnse',
- libgnunetnse_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetnse_dep = declare_dependency(link_with : libgnunetnse)
- executable ('gnunet-service-nse',
- gnunetservicense_src,
- dependencies: [libgnunetnse_dep, libgnunetutil_dep,
- libgnunetcore_dep,
- m_dep,
- libgnunetstatistics_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetnse_src + gnunetservicense_src
gnunet_src += 'nse/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetnse = library('gnunetnse',
+ libgnunetnse_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetnse_dep = declare_dependency(link_with : libgnunetnse)
+pkg.generate(libgnunetnse, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the NSE service')
+
+executable ('gnunet-service-nse',
+ gnunetservicense_src,
+ dependencies: [libgnunetnse_dep, libgnunetutil_dep,
+ libgnunetcore_dep,
+ m_dep,
+ libgnunetstatistics_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 26eaa6b31..ee32137a6 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -12,37 +12,41 @@ configure_file(input : 'reclaim.conf',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetreclaim = library('gnunetreclaim',
- libgnunetreclaim_src,
- dependencies: [libgnunetutil_dep,
- libgnunetidentity_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir'))
- libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
- executable ('gnunet-reclaim',
- 'gnunet-reclaim.c',
- dependencies: [libgnunetreclaim_dep,
- libgnunetidentity_dep,
- libgnunetutil_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('bindir'))
- executable ('gnunet-service-reclaim',
- gnunetservicereclaim_src,
- dependencies: [libgnunetreclaim_dep,
- libgnunetutil_dep,
- libgnunetstatistics_dep,
- libgnunetgnsrecord_dep,
- libgnunetgns_dep,
- libgnunetidentity_dep,
- libgnunetnamestore_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
-else
+if get_option('monolith')
foreach p : libgnunetreclaim_src + gnunetservicereclaim_src
gnunet_src += 'reclaim/' + p
endforeach
+ subdir_done()
endif
+libgnunetreclaim = library('gnunetreclaim',
+ libgnunetreclaim_src,
+ dependencies: [libgnunetutil_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
+pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org',
+ description : 'Provides API to access reclaimID')
+
+executable ('gnunet-reclaim',
+ 'gnunet-reclaim.c',
+ dependencies: [libgnunetreclaim_dep,
+ libgnunetidentity_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-service-reclaim',
+ gnunetservicereclaim_src,
+ dependencies: [libgnunetreclaim_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetgns_dep,
+ libgnunetidentity_dep,
+ libgnunetnamestore_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/revocation/meson.build b/src/revocation/meson.build
index 6a539febb..fda4bc6f4 100644
--- a/src/revocation/meson.build
+++ b/src/revocation/meson.build
@@ -9,23 +9,53 @@ configure_file(input : 'revocation.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetrevocation = library('gnunetrevocation',
- libgnunetrevocation_src,
- dependencies: [libgnunetutil_dep, libgnunetidentity_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation)
- executable ('gnunet-service-revocation',
- gnunetservicerevocation_src,
- dependencies: [libgnunetrevocation_dep,
- libgnunetutil_dep,
- libgnunetstatistics_dep,
- libgnunetcore_dep,
- libgnunetsetu_dep,
- libgnunetidentity_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetrevocation_src + gnunetservicerevocation_src
gnunet_src += 'revocation/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetrevocation = library('gnunetrevocation',
+ libgnunetrevocation_src,
+ soversion: '0.0.0',
+ dependencies: [libgnunetutil_dep, libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation)
+pkg.generate(libgnunetrevocation, url: 'https://www.gnunet.org',
+ description : 'Provides API to perform key revocation in GNUnet')
+
+shared_module('gnunet_plugin_block_revocation',
+ ['plugin_block_revocation.c'],
+ dependencies: [libgnunetutil_dep,
+ libgnunetrevocation_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet')
+
+executable ('gnunet-revocation',
+ ['gnunet-revocation.c'],
+ dependencies: [libgnunetrevocation_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetcore_dep,
+ libgnunetsetu_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-service-revocation',
+ gnunetservicerevocation_src,
+ dependencies: [libgnunetrevocation_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetcore_dep,
+ libgnunetsetu_dep,
+ libgnunetidentity_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 86c3b6eb9..446523416 100644
--- a/src/statistics/meson.build
+++ b/src/statistics/meson.build
@@ -9,18 +9,33 @@ configure_file(input : 'statistics.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetstatistics = library('gnunetstatistics',
- libgnunetstatistics_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetstatistics_dep = declare_dependency(link_with : libgnunetstatistics)
- executable ('gnunet-service-statistics',
- gnunetservicestatistics_src,
- dependencies: [libgnunetstatistics_dep, libgnunetutil_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetstatistics_src + gnunetservicestatistics_src
gnunet_src += 'statistics/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetstatistics = library('gnunetstatistics',
+ libgnunetstatistics_src,
+ soversion: '2.0.0',
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc])
+libgnunetstatistics_dep = declare_dependency(link_with : libgnunetstatistics)
+pkg.generate(libgnunetstatistics, url: 'https://www.gnunet.org',
+ description : 'Provides API of GNUnet statistics service')
+
+executable ('gnunet-service-statistics',
+ gnunetservicestatistics_src,
+ dependencies: [libgnunetstatistics_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-statistics',
+ gnunetservicestatistics_src,
+ dependencies: [libgnunetstatistics_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+
+
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (398c154d9 -> 8ac5695b5),
gnunet <=