[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (2da4d4740 -> c36866d5b)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (2da4d4740 -> c36866d5b) |
|
Date: |
Wed, 27 Sep 2023 15:53:40 +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 2da4d4740 BUILD: Ftbfs fix
new d4364ccb4 BUILD: Meson install more files
new c36866d5b BUILD: Meson install even 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:
contrib/hellos/meson.build | 2 ++
contrib/meson.build | 1 +
doc/man/meson.build | 9 ++++++++-
meson.build | 5 +++--
src/core/meson.build | 6 ++++++
src/datacache/meson.build | 2 +-
src/dht/meson.build | 25 +++++++++++++++++++++++-
src/dns/meson.build | 6 ++++++
src/fs/meson.build | 48 ++++++++++++++++++++++++++++++++++++++++++++--
src/gns/meson.build | 18 +++++++++++++++++
src/hostlist/meson.build | 4 +++-
src/namestore/meson.build | 34 +++++++++++++++++++++++++++++---
src/nat-auto/meson.build | 41 ++++++++++++++++++++++++++++-----------
src/nat/meson.build | 21 ++++++++++++++++++++
src/nse/meson.build | 7 +++++++
src/reclaim/meson.build | 30 +++++++++++++++++++++++++++++
src/regex/meson.build | 15 +++++++++++++++
src/set/meson.build | 6 ++++++
src/seti/meson.build | 6 ++++++
src/setu/meson.build | 6 ++++++
src/template/Makefile.am | 2 +-
src/util/meson.build | 9 +++++++--
src/vpn/meson.build | 7 +++++++
23 files changed, 285 insertions(+), 25 deletions(-)
create mode 100644 contrib/hellos/meson.build
diff --git a/contrib/hellos/meson.build b/contrib/hellos/meson.build
new file mode 100644
index 000000000..f1fa463de
--- /dev/null
+++ b/contrib/hellos/meson.build
@@ -0,0 +1,2 @@
+install_data('Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0',
+ install_dir: get_option('datadir')/'gnunet'/'hellos')
diff --git a/contrib/meson.build b/contrib/meson.build
index 5882295b8..63cf60229 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -1,4 +1,5 @@
subdir('conf')
+subdir('hellos')
subdir('scripts')
install_data(['gns'/'def.tex',
diff --git a/doc/man/meson.build b/doc/man/meson.build
index b8dfcb098..1766d7bb2 100644
--- a/doc/man/meson.build
+++ b/doc/man/meson.build
@@ -1,5 +1,12 @@
+configure_file(input : 'gnunet.conf.5.in',
+ output : 'gnunet.conf.5',
+ configuration : cdata,
+ install: false,
+ install_dir: get_option('mandir'))
+
install_man(
- [# 'gnunet.conf.5', FIXME generated from in file
+ [
+ 'gnunet.conf.5',
'gnunet-arm.1',
'gnunet-ats.1',
'gnunet-auto-share.1',
diff --git a/meson.build b/meson.build
index 2d4d168df..cb3d74cb9 100644
--- a/meson.build
+++ b/meson.build
@@ -47,7 +47,8 @@ endif
# FIXME
cdata.set('extractor', 0)
-
+cdata.set('PKGDATADIRECTORY', get_option('datadir')/'gnunet')
+cdata.set('SYSCONFDIR', get_option('sysconfdir'))
# Various checks
if cc.has_member ('struct sockaddr_in', 'sin_len', prefix : ['#include
<sys/types.h>', '#include <sys/socket.h>', '#include <netinet/in.h>'])
add_project_arguments('-DHAVE_SOCKADDR_IN_SIN_LEN', language: 'c')
@@ -324,7 +325,7 @@ result = cc.run(curl_ssl_check, name : 'cURL gnutls check',
dependencies: curl_dep)
cdata.set('curl_gnutls', 0)
if result.returncode() == 0
- cdata.set('curl_gnutls', 1)
+cdata.set('curl_gnutls', 1)
endif
if cc.has_function('getloadavg') == false
diff --git a/src/core/meson.build b/src/core/meson.build
index d8d506b52..4c5bb4d61 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -31,6 +31,12 @@ libgnunetcore_dep = declare_dependency(link_with :
libgnunetcore)
pkg.generate(libgnunetcore, url: 'https://www.gnunet.org',
description : 'Provides API for (encrypted) P2P communication')
+executable ('gnunet-core',
+ ['gnunet-core.c'],
+ dependencies: [libgnunetcore_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
executable ('gnunet-service-core',
gnunetservicecore_src,
dependencies: [libgnunetcore_dep, libgnunetutil_dep,
diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index b06a284f1..e753ca6eb 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -18,7 +18,7 @@ endif
libgnunetdatacache = library('gnunetdatacache',
libgnunetdatacache_src,
soversion: '0',
- version: '0.1.0',
+ version: '0.0.1',
dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
include_directories: [incdir, configuration_inc],
install: true,
diff --git a/src/dht/meson.build b/src/dht/meson.build
index e36f4544c..83ce8ad9e 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -49,7 +49,30 @@ executable ('gnunet-dht',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('bindir'))
-
+executable ('gnunet-dht-put',
+ ['gnunet-dht-put.c'],
+ dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-dht-get',
+ ['gnunet-dht-get.c'],
+ dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-dht-monitor',
+ ['gnunet-dht-monitor.c'],
+ dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-dht-hello',
+ ['gnunet-dht-hello.c'],
+ dependencies: [libgnunetdht_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-dht',
gnunetservicedht_src,
dependencies: [libgnunetdht_dep, libgnunetutil_dep,
diff --git a/src/dns/meson.build b/src/dns/meson.build
index ee9ba0005..20002a9fc 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -56,4 +56,10 @@ executable ('gnunet-dns-redirector',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-helper-dns',
+ ['gnunet-helper-dns.c'],
+ dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/fs/meson.build b/src/fs/meson.build
index 65fe6320f..ca0b7ef95 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -42,8 +42,8 @@ endif
libgnunetfs = library('gnunetfs',
libgnunetfs_src,
- soversion: '3',
- version: '3.1.1',
+ soversion: '2',
+ version: '2.1.1',
dependencies: [libgnunetutil_dep,
libgnunetdatastore_dep,
libgnunetstatistics_dep,
@@ -70,6 +70,42 @@ executable ('gnunet-unindex',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('bindir'))
+executable ('gnunet-auto-share',
+ 'gnunet-auto-share.c',
+ dependencies: [libgnunetfs_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-directory',
+ 'gnunet-directory.c',
+ dependencies: [libgnunetfs_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-download',
+ 'gnunet-download.c',
+ dependencies: [libgnunetfs_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-fs',
+ 'gnunet-fs.c',
+ dependencies: [libgnunetfs_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-publish',
+ 'gnunet-publish.c',
+ dependencies: [libgnunetfs_dep,
+ libgnunetidentity_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-fs',
gnunetservicefs_src,
dependencies: [libgnunetfs_dep,
@@ -87,4 +123,12 @@ executable ('gnunet-service-fs',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-helper-fs-publish',
+ ['gnunet-helper-fs-publish.c'],
+ dependencies: [libgnunetfs_dep,
+ libgnunetutil_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
diff --git a/src/gns/meson.build b/src/gns/meson.build
index a25850d85..bb9fac065 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -11,7 +11,20 @@ configure_file(input : 'gns.conf.in',
configuration : cdata,
install: true,
install_dir: pkgcfgdir)
+configure_file(input : 'tlds.conf',
+ output : 'tlds.conf',
+ configuration : cdata,
+ install: true,
+ install_dir: pkgcfgdir)
+configure_file(input : 'gnunet-gns-proxy-setup-ca.in',
+ output : 'gnunet-gns-proxy-setup-ca',
+ configuration : cdata,
+ install: true,
+ install_dir: pkgcfgdir)
+
+install_data('gnunet-gns-proxy-ca.template',
+ install_dir: get_option('datadir')/'gnunet')
if get_option('monolith')
foreach p : libgnunetgns_src + gnunetservicegns_src
@@ -122,3 +135,8 @@ executable ('gnunet-dns2gns',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+
+#if nss_dep.found()
+# subdir('nss')
+#endif
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build
index 99cc089df..811e3e669 100644
--- a/src/hostlist/meson.build
+++ b/src/hostlist/meson.build
@@ -22,4 +22,6 @@ executable ('gnunet-daemon-hostlist',
libgnunettransport_dep,
mhd_dep,
curl_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 1a84e7d0f..e57bf46e7 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -59,14 +59,42 @@ if pq_dep.found()
endif
executable ('gnunet-namestore',
- gnunetnamestore_src,
+ gnunetnamestore_src,
+ dependencies: [libgnunetnamestore_dep,
+ libgnunetutil_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-namestore-dbtool',
+ ['gnunet-namestore-dbtool.c'],
dependencies: [libgnunetnamestore_dep,
libgnunetutil_dep,
libgnunetgnsrecord_dep,
libgnunetidentity_dep],
include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('bindir'))
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-namestore-zonefile',
+ ['gnunet-namestore-zonefile.c'],
+ dependencies: [libgnunetnamestore_dep,
+ libgnunetutil_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-zoneimport',
+ ['gnunet-zoneimport.c'],
+ dependencies: [libgnunetnamestore_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-namestore',
gnunetservicenamestore_src,
dependencies: [libgnunetnamestore_dep,
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
index e5643cc58..9c6f5a0d0 100644
--- a/src/nat-auto/meson.build
+++ b/src/nat-auto/meson.build
@@ -3,19 +3,38 @@ libgnunetnatauto_src = ['nat_auto_api.c',
gnunetservicenatauto_src = ['gnunet-nat-server.c']
+configure_file(input : 'nat-auto.conf.in',
+ output : 'nat-auto.conf',
+ configuration : cdata,
+ install: true,
+ install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetnatauto = library('gnunetnatauto',
- libgnunetnatauto_src,
- dependencies: [libgnunetutil_dep, libgnunetnat_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto)
- executable ('gnunet-nat-server',
- gnunetservicenatauto_src,
- dependencies: [libgnunetnatauto_dep, libgnunetutil_dep,
libgnunetnat_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetnatauto_src + gnunetservicenatauto_src
gnunet_src += 'nat-auto/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetnatauto = library('gnunetnatauto',
+ libgnunetnatauto_src,
+ soversion: '0',
+ version: '0.0.0',
+ dependencies: [libgnunetutil_dep, libgnunetnat_dep],
+ include_directories: [incdir, configuration_inc])
+libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto)
+
+executable ('gnunet-nat-auto',
+ ['gnunet-nat-auto.c'],
+ dependencies: [libgnunetnatauto_dep, libgnunetutil_dep,
+ libgnunetnat_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-nat-server',
+ gnunetservicenatauto_src,
+ dependencies: [libgnunetnatauto_dep, libgnunetutil_dep,
libgnunetnat_dep],
+ 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 430f56e13..415d6cbb3 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -34,6 +34,13 @@ 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-nat',
+ ['gnunet-nat.c'],
+ dependencies: [libgnunetnat_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+
executable ('gnunet-service-nat',
gnunetservicenat_src,
dependencies: [libgnunetnat_dep, libgnunetutil_dep,
@@ -41,4 +48,18 @@ executable ('gnunet-service-nat',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-helper-nat-server',
+ ['gnunet-helper-nat-server.c'],
+ dependencies: [libgnunetnat_dep, libgnunetutil_dep,
+ libgnunetstatistics_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-helper-nat-client',
+ ['gnunet-helper-nat-client.c'],
+ 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 57047b463..7490214a3 100644
--- a/src/nse/meson.build
+++ b/src/nse/meson.build
@@ -28,6 +28,13 @@ 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-nse',
+ ['gnunet-nse.c'],
+ dependencies: [libgnunetnse_dep, m_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+
executable ('gnunet-service-nse',
gnunetservicense_src,
dependencies: [libgnunetnse_dep, libgnunetutil_dep,
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index 0c23ef92b..4ccda79c2 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -1,6 +1,8 @@
libgnunetreclaim_src = ['reclaim_api.c',
'reclaim_attribute.c',
'reclaim_credential.c']
+libgnunetdid_src = ['did_helper.c',
+ 'did_core.c']
gnunetservicereclaim_src = ['gnunet-service-reclaim.c',
'gnunet-service-reclaim_tickets.c']
@@ -32,6 +34,23 @@ libgnunetreclaim_dep = declare_dependency(link_with :
libgnunetreclaim)
pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org',
description : 'Provides API to access reclaimID')
+libgnunetdid = library('gnunetdid',
+ libgnunetdid_src,
+ soversion: '0',
+ version: '0.0.0',
+ dependencies: [libgnunetutil_dep,
+ libgnunetnamestore_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetgns_dep,
+ json_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetdid_dep = declare_dependency(link_with : libgnunetdid)
+pkg.generate(libgnunetdid, url: 'https://www.gnunet.org',
+ description : 'Provides API to manipulate DID')
+
executable ('gnunet-reclaim',
'gnunet-reclaim.c',
dependencies: [libgnunetreclaim_dep,
@@ -40,6 +59,17 @@ executable ('gnunet-reclaim',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('bindir'))
+executable ('gnunet-did',
+ 'gnunet-did.c',
+ dependencies: [libgnunetreclaim_dep,
+ libgnunetdid_dep,
+ libgnunetgns_dep,
+ libgnunetnamestore_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,
diff --git a/src/regex/meson.build b/src/regex/meson.build
index ae644dcc7..f1bbfa1b8 100644
--- a/src/regex/meson.build
+++ b/src/regex/meson.build
@@ -51,4 +51,19 @@ executable ('gnunet-service-regex',
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-daemon-regexprofiler',
+ ['gnunet-daemon-regexprofiler.c',
+ 'regex_internal.c',
+ 'regex_internal_dht.c',
+ 'regex_test_lib.c',
+ 'regex_test_graph.c',
+ 'regex_test_random.c'],
+ 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/set/meson.build b/src/set/meson.build
index bfaf4260f..51782f446 100644
--- a/src/set/meson.build
+++ b/src/set/meson.build
@@ -31,6 +31,12 @@ libgnunetset = library('gnunetset',
pkg.generate(libgnunetset, url: 'https://www.gnunet.org',
description : 'Provides API for accessing the set service')
libgnunetset_dep = declare_dependency(link_with : libgnunetset)
+shared_module('gnunet_plugin_block_set_test',
+ ['plugin_block_set_test.c'],
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install:true,
+ install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-service-set',
gnunetserviceset_src,
dependencies: [libgnunetset_dep,
diff --git a/src/seti/meson.build b/src/seti/meson.build
index 0741cac18..e5d3812ce 100644
--- a/src/seti/meson.build
+++ b/src/seti/meson.build
@@ -27,6 +27,12 @@ libgnunetseti = library('gnunetseti',
pkg.generate(libgnunetseti, url: 'https://www.gnunet.org',
description : 'Provides API for accessing the set intersection
service')
libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
+shared_module('gnunet_plugin_block_seti_test',
+ ['plugin_block_seti_test.c'],
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install:true,
+ install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-service-seti',
gnunetserviceseti_src,
dependencies: [libgnunetseti_dep,
diff --git a/src/setu/meson.build b/src/setu/meson.build
index 6f0b0c663..fe5611fd2 100644
--- a/src/setu/meson.build
+++ b/src/setu/meson.build
@@ -29,6 +29,12 @@ libgnunetsetu = library('gnunetsetu',
pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
description : 'Provides API for accessing the set union service')
libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
+shared_module('gnunet_plugin_block_setu_test',
+ ['plugin_block_setu_test.c'],
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install:true,
+ install_dir: get_option('libdir')/'gnunet')
executable ('gnunet-service-setu',
gnunetservicesetu_src,
dependencies: [libgnunetsetu_dep,
diff --git a/src/template/Makefile.am b/src/template/Makefile.am
index 4d2e58083..c8ab26ebd 100644
--- a/src/template/Makefile.am
+++ b/src/template/Makefile.am
@@ -5,7 +5,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/
libexecdir= $(pkglibdir)/libexec/
-dist_pkgcfg_DATA = \
+noinst_dist_pkgcfg_DATA = \
template.conf
if USE_COVERAGE
diff --git a/src/util/meson.build b/src/util/meson.build
index 3b7711b13..a9d1178b1 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -76,10 +76,15 @@ configure_file(input : 'util.conf',
configuration : cdata,
install: true,
install_dir: pkgcfgdir)
+configure_file(input : 'resolver.conf',
+ output : 'resolver.conf',
+ configuration : cdata,
+ install: true,
+ install_dir: pkgcfgdir)
if get_option('monolith')
- foreach p : libgnunetutil_src
+ foreach p : [libgnunetutil_src, gnunetserviceresolver_src]
gnunet_src += 'util/' + p
endforeach
subdir_done()
@@ -147,7 +152,7 @@ executable ('gnunet-config-diff',
include_directories: [incdir, configuration_inc],
install: false)
-executable ('gnunet-resolver-arm',
+executable ('gnunet-service-resolver-arm',
gnunetserviceresolver_src,
dependencies: [libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
diff --git a/src/vpn/meson.build b/src/vpn/meson.build
index 54f8ffae9..ed53e200e 100644
--- a/src/vpn/meson.build
+++ b/src/vpn/meson.build
@@ -55,4 +55,11 @@ executable ('gnunet-service-vpn',
include_directories: [incdir, configuration_inc, exitdir],
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-helper-vpn',
+ ['gnunet-helper-vpn.c'],
+ dependencies: [libgnunetvpn_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc, exitdir],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (2da4d4740 -> c36866d5b),
gnunet <=