[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/02: BUILD: Meson - install yet more files
|
From: |
gnunet |
|
Subject: |
[gnunet] 02/02: BUILD: Meson - install yet more files |
|
Date: |
Sat, 23 Sep 2023 21:47:43 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 83a608c546f6751d0847c5b9965c9813cbd96522
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Sep 23 21:47:37 2023 +0200
BUILD: Meson - install yet more files
---
src/scalarproduct/meson.build | 40 +++++++++-------
src/seti/meson.build | 42 ++++++++++-------
src/setu/meson.build | 42 ++++++++++-------
src/sq/meson.build | 20 +++++---
src/topology/meson.build | 45 ++++++++++--------
src/transport/meson.build | 104 ++++++++++++++++++++++++++----------------
src/vpn/meson.build | 56 ++++++++++++++++-------
7 files changed, 217 insertions(+), 132 deletions(-)
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/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/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')
+
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.