[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (8ac5695b5 -> 83a608c54)
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated (8ac5695b5 -> 83a608c54) |
|
Date: |
Sat, 23 Sep 2023 21:47:41 +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 8ac5695b5 BUILD: Meson - install more files
new 1ea50dc3c BUILD: Meson - install yet more files
new 83a608c54 BUILD: Meson - install yet 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/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/scalarproduct/meson.build | 40 +++++++++-------
src/seti/meson.build | 42 ++++++++++-------
src/setu/meson.build | 42 ++++++++++-------
src/sq/meson.build | 20 +++++---
src/statistics/meson.build | 4 +-
src/topology/meson.build | 45 ++++++++++--------
src/transport/meson.build | 104 ++++++++++++++++++++++++++----------------
src/util/meson.build | 5 +-
src/vpn/meson.build | 56 ++++++++++++++++-------
src/zonemaster/meson.build | 30 ++++++------
18 files changed, 357 insertions(+), 210 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/scalarproduct/meson.build b/src/scalarproduct/meson.build
index de23f558c..05e6d44f0 100644
--- a/src/scalarproduct/meson.build
+++ b/src/scalarproduct/meson.build
@@ -13,23 +13,31 @@ configure_file(input : 'scalarproduct.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetscalarproduct = library('gnunetscalarproduct',
- libgnunetscalarproduct_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetscalarproduct_dep = declare_dependency(link_with :
libgnunetscalarproduct)
- executable ('gnunet-service-scalarproduct',
- gnunetservicescalarproduct_src,
- dependencies: [libgnunetscalarproduct_dep,
- libgnunetutil_dep,
- libgnunetstatistics_dep,
- libgnunetcore_dep,
- libgnunetcadet_dep,
- libgnunetblock_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetscalarproduct_src + gnunetservicescalarproduct_src
gnunet_src += 'scalarproduct/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetscalarproduct = library('gnunetscalarproduct',
+ libgnunetscalarproduct_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the scalarproduct
service')
+libgnunetscalarproduct_dep = declare_dependency(link_with :
libgnunetscalarproduct)
+executable ('gnunet-service-scalarproduct',
+ gnunetservicescalarproduct_src,
+ dependencies: [libgnunetscalarproduct_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetcore_dep,
+ libgnunetcadet_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/seti/meson.build b/src/seti/meson.build
index 1f09b50a2..fb96a20d1 100644
--- a/src/seti/meson.build
+++ b/src/seti/meson.build
@@ -9,24 +9,32 @@ configure_file(input : 'seti.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetseti = library('gnunetseti',
- libgnunetseti_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
- executable ('gnunet-service-seti',
- gnunetserviceseti_src,
- dependencies: [libgnunetseti_dep,
- libgnunetutil_dep,
- m_dep,
- libgnunetstatistics_dep,
- libgnunetcore_dep,
- libgnunetcadet_dep,
- libgnunetblock_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetseti_src + gnunetserviceseti_src
gnunet_src += 'seti/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetseti = library('gnunetseti',
+ libgnunetseti_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetarm, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the set intersection
service')
+libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
+executable ('gnunet-service-seti',
+ gnunetserviceseti_src,
+ dependencies: [libgnunetseti_dep,
+ libgnunetutil_dep,
+ m_dep,
+ libgnunetstatistics_dep,
+ libgnunetcore_dep,
+ libgnunetcadet_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/setu/meson.build b/src/setu/meson.build
index b36543264..ef4a75b20 100644
--- a/src/setu/meson.build
+++ b/src/setu/meson.build
@@ -11,24 +11,32 @@ configure_file(input : 'setu.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetsetu = library('gnunetsetu',
- libgnunetsetu_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
- executable ('gnunet-service-setu',
- gnunetservicesetu_src,
- dependencies: [libgnunetsetu_dep,
- libgnunetutil_dep,
- m_dep,
- libgnunetstatistics_dep,
- libgnunetcore_dep,
- libgnunetcadet_dep,
- libgnunetblock_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetsetu_src + gnunetservicesetu_src
gnunet_src += 'setu/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetsetu = library('gnunetsetu',
+ libgnunetsetu_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the set union service')
+libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
+executable ('gnunet-service-setu',
+ gnunetservicesetu_src,
+ dependencies: [libgnunetsetu_dep,
+ libgnunetutil_dep,
+ m_dep,
+ libgnunetstatistics_dep,
+ libgnunetcore_dep,
+ libgnunetcadet_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/sq/meson.build b/src/sq/meson.build
index 4199acb9f..d30e82e84 100644
--- a/src/sq/meson.build
+++ b/src/sq/meson.build
@@ -4,14 +4,20 @@ libgnunetsq_src = ['sq.c',
'sq_query_helper.c',
'sq_result_helper.c']
-if get_option('monolith') == false
- libgnunetsq = library('gnunetsq',
- libgnunetsq_src,
- dependencies: [libgnunetutil_dep, sqlite_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetsq_dep = declare_dependency(link_with : libgnunetsq)
-else
+if get_option('monolith')
foreach p : libgnunetsq_src
gnunet_src += 'sq/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetsq = library('gnunetsq',
+ libgnunetsq_src,
+ dependencies: [libgnunetutil_dep, sqlite_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetsq, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the SQ service')
+libgnunetsq_dep = declare_dependency(link_with : libgnunetsq)
+
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/topology/meson.build b/src/topology/meson.build
index 335369835..9f60551dc 100644
--- a/src/topology/meson.build
+++ b/src/topology/meson.build
@@ -9,25 +9,34 @@ configure_file(input : 'topology.conf',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetfriends = library('gnunetfriends',
- libgnunetfriends_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetfriends_dep = declare_dependency(link_with : libgnunetfriends)
- executable ('gnunet-daemon-topology',
- gnunetdaemontopology_src,
- dependencies: [libgnunetfriends_dep,
- libgnunetutil_dep,
- libgnunetcore_dep,
- libgnunetpeerinfo_dep,
- libgnunetstatistics_dep,
- libgnunettransport_dep,
- libgnunetats_dep,
- libgnunethello_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetfriends_src
gnunet_src += 'topology/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetfriends = library('gnunetfriends',
+ libgnunetfriends_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetfriends, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the friends service')
+libgnunetfriends_dep = declare_dependency(link_with : libgnunetfriends)
+
+executable ('gnunet-daemon-topology',
+ gnunetdaemontopology_src,
+ dependencies: [libgnunetfriends_dep,
+ libgnunetutil_dep,
+ libgnunetcore_dep,
+ libgnunetpeerinfo_dep,
+ libgnunetstatistics_dep,
+ libgnunettransport_dep,
+ libgnunetats_dep,
+ libgnunethello_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 34fc89aaa..12a86aaee 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -22,47 +22,71 @@ configure_file(input : 'transport.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunettransport = library('gnunettransport',
- libgnunettransport_src,
- dependencies: [libgnunetutil_dep, libgnunetats_dep,
libgnunethello_dep],
- include_directories: [incdir, configuration_inc])
- libgnunettransport_dep = declare_dependency(link_with : libgnunettransport)
-
- libgnunettransportapplication = library('gnunettransportapplication',
- libgnunettransportapplication_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunettransportapplication_dep = declare_dependency(link_with :
libgnunettransportapplication)
-
- libgnunettransportcore = library('gnunettransportcore',
- libgnunettransportcore_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunettransportcore_dep = declare_dependency(link_with :
libgnunettransportcore)
-
- libgnunettransportcommunicator = library('gnunettransportcommunicator',
- libgnunettransportcommunicator_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunettransportcommunicator_dep = declare_dependency(link_with :
libgnunettransportcommunicator)
-
- libgnunettransportmonitor = library('gnunettransportmonitor',
- libgnunettransportmonitor_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunettransportmonitor_dep = declare_dependency(link_with :
libgnunettransportmonitor)
- executable ('gnunet-service-transport',
- gnunetservicetransport_src,
- dependencies: [libgnunettransport_dep, libgnunetutil_dep,
- libgnunethello_dep,
- libgnunetpeerstore_dep,
- m_dep,
- libgnunetstatistics_dep,
- gcrypt_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunettransport_src #+ libgnunettransportapplication_src +
libgnunettransportcore_src + libgnunettransportcommunicator_src +
libgnunettransportmonitor_src + gnunetservicetransport_src
gnunet_src += 'transport/' + p
endforeach
endif
+
+libgnunettransport = library('gnunettransport',
+ libgnunettransport_src,
+ dependencies: [libgnunetutil_dep, libgnunetats_dep,
libgnunethello_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunettransport, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the transport service')
+libgnunettransport_dep = declare_dependency(link_with : libgnunettransport)
+
+libgnunettransportapplication = library('gnunettransportapplication',
+ libgnunettransportapplication_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunettransportapplication, url: 'https://www.gnunet.org',
+ description : 'Provides application APIs for accessing the
transport service')
+libgnunettransportapplication_dep = declare_dependency(link_with :
libgnunettransportapplication)
+
+libgnunettransportcore = library('gnunettransportcore',
+ libgnunettransportcore_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunettransportcore, url: 'https://www.gnunet.org',
+ description : 'Provides core API for accessing the transport
service')
+libgnunettransportcore_dep = declare_dependency(link_with :
libgnunettransportcore)
+
+libgnunettransportcommunicator = library('gnunettransportcommunicator',
+ libgnunettransportcommunicator_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunettransportcommunicator, url: 'https://www.gnunet.org',
+ description : 'Provides communicator API for accessing the
transport service')
+libgnunettransportcommunicator_dep = declare_dependency(link_with :
libgnunettransportcommunicator)
+
+libgnunettransportmonitor = library('gnunettransportmonitor',
+ libgnunettransportmonitor_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunettransportmonitor, url: 'https://www.gnunet.org',
+ description : 'Provides monitor API for accessing the transport
service')
+libgnunettransportmonitor_dep = declare_dependency(link_with :
libgnunettransportmonitor)
+
+executable ('gnunet-service-transport',
+ gnunetservicetransport_src,
+ dependencies: [libgnunettransport_dep, libgnunetutil_dep,
+ libgnunethello_dep,
+ libgnunetpeerstore_dep,
+ m_dep,
+ libgnunetstatistics_dep,
+ gcrypt_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
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/vpn/meson.build b/src/vpn/meson.build
index 3807b21cf..b1fd78151 100644
--- a/src/vpn/meson.build
+++ b/src/vpn/meson.build
@@ -11,24 +11,46 @@ configure_file(input : 'vpn.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetvpn = library('gnunetvpn',
- libgnunetvpn_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetvpn_dep = declare_dependency(link_with : libgnunetvpn)
- executable ('gnunet-service-vpn',
- gnunetservicevpn_src,
- dependencies: [libgnunetvpn_dep,
- libgnunetutil_dep,
- libgnunetstatistics_dep,
- libgnunetregex_dep,
- libgnunetcore_dep,
- libgnunetcadet_dep,
- libgnunetblock_dep],
- include_directories: [incdir, configuration_inc, exitdir])
-else
+if get_option('monolith')
foreach p : libgnunetvpn_src + gnunetservicevpn_src
gnunet_src += 'vpn/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetvpn = library('gnunetvpn',
+ libgnunetvpn_src,
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+pkg.generate(libgnunetvpn, url: 'https://www.gnunet.org',
+ description : 'Provides API for accessing the VPN service')
+libgnunetvpn_dep = declare_dependency(link_with : libgnunetvpn)
+
+executable ('gnunet-vpn',
+ ['gnunet-vpn.c'],
+ dependencies: [libgnunetvpn_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetregex_dep,
+ libgnunetcore_dep,
+ libgnunetcadet_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc, exitdir],
+ install: true,
+ install_dir: get_option('bindir'))
+
+executable ('gnunet-service-vpn',
+ gnunetservicevpn_src,
+ dependencies: [libgnunetvpn_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetregex_dep,
+ libgnunetcore_dep,
+ libgnunetcadet_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc, exitdir],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
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.
- [gnunet] branch master updated (8ac5695b5 -> 83a608c54),
gnunet <=