[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/02: BUILD: meson install more files
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/02: BUILD: meson install more files |
|
Date: |
Sun, 24 Sep 2023 12:06:56 +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 16693020019e7dae79d1290fc8a5672e057fcac3
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Sep 24 12:04:30 2023 +0200
BUILD: meson install more files
---
contrib/meson.build | 1 +
contrib/scripts/meson.build | 4 ++++
meson.build | 8 --------
src/include/meson.build | 3 ---
src/meson.build | 2 --
src/transport/meson.build | 39 +++++++++++++++++++++++++++++++++++++++
src/util/meson.build | 17 +++++++++++++++++
7 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/contrib/meson.build b/contrib/meson.build
index 92df78a62..5882295b8 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -1,4 +1,5 @@
subdir('conf')
+subdir('scripts')
install_data(['gns'/'def.tex',
'gns'/'gns-bcd.html',
diff --git a/contrib/scripts/meson.build b/contrib/scripts/meson.build
new file mode 100644
index 000000000..d56ba2b76
--- /dev/null
+++ b/contrib/scripts/meson.build
@@ -0,0 +1,4 @@
+install_data('gnunet-bugreport',
+ install_dir: get_option('bindir'))
+install_data('gnunet-suidfix',
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/meson.build b/meson.build
index c60a5c610..ca081365b 100644
--- a/meson.build
+++ b/meson.build
@@ -199,14 +199,6 @@ doas_bin = find_program('doas', '/usr/bin/doas', required
: false)
# Optional dependencies
-# FIXME: I think we wanted to retire mysql support
-my_dep = dependency('libmysqlclient', required : false)
-if not my_dep.found()
- my_dep = cc.find_library('mysqlclient', required : false)
-endif
-if my_dep.found()
- add_project_arguments('-DHAVE_MYSQL', language : 'c')
-endif
pq_dep = dependency('libpq', required : false)
if not pq_dep.found()
pq_dep = cc.find_library('pq', required : false)
diff --git a/src/include/meson.build b/src/include/meson.build
index 391f47445..58125cc11 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -70,9 +70,6 @@ install_headers(
'gnunet_microphone_lib.h',
'gnunet_mst_lib.h',
'gnunet_mq_lib.h',
- 'gnunet_my_lib.h',
- 'gnunet_mysql_compat.h',
- 'gnunet_mysql_lib.h',
'gnunet_namecache_plugin.h',
'gnunet_namecache_service.h',
'gnunet_namestore_plugin.h',
diff --git a/src/meson.build b/src/meson.build
index 40cc1ebbb..3da201f9b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -19,8 +19,6 @@ if get_option('monolith') == false
endif
subdir('peerinfo')
subdir('sq', if_found : [sqlite_dep])
-subdir('mysql', if_found : [my_dep])
-subdir('my', if_found : [my_dep])
subdir('pq', if_found : [pq_dep])
subdir('datacache')
subdir('datastore')
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 12a86aaee..12ecb9f3b 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -14,6 +14,7 @@ libgnunettransportmonitor_src = ['transport_api2_monitor.c']
gnunetservicetransport_src = ['gnunet-service-tng.c']
gnunetcommunicatortcp_src = ['gnunet-communicator-tcp.c']
gnunetcommunicatorudp_src = ['gnunet-communicator-udp.c']
+gnunetcommunicatorunix_src = ['gnunet-communicator-unix.c']
configure_file(input : 'transport.conf.in',
output : 'transport.conf',
@@ -90,3 +91,41 @@ executable ('gnunet-service-transport',
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-communicator-unix',
+ gnunetcommunicatorunix_src,
+ dependencies: [libgnunettransportcommunicator_dep,
+ libgnunetpeerstore_dep,
+ libgnunetstatistics_dep,
+ libgnunetnt_dep,
+ libgnunetnat_dep,
+ gcrypt_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-communicator-udp',
+ gnunetcommunicatorudp_src,
+ dependencies: [libgnunettransportcommunicator_dep,
+ libgnunettransportapplication_dep,
+ libgnunetpeerstore_dep,
+ libgnunetstatistics_dep,
+ libgnunetnt_dep,
+ libgnunetnat_dep,
+ gcrypt_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-communicator-tcp',
+ gnunetcommunicatortcp_src,
+ dependencies: [libgnunettransportcommunicator_dep,
+ libgnunetpeerstore_dep,
+ libgnunetstatistics_dep,
+ libgnunetnt_dep,
+ libgnunetnat_dep,
+ gcrypt_dep,
+ libgnunetutil_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 c59787a93..a88af225a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -69,6 +69,8 @@ libgnunetutil_src = ['bandwidth.c',
'proc_compat.c',
'gnunet_error_codes.c']
+gnunetserviceresolver_src = ['gnunet-service-resolver.c']
+
configure_file(input : 'util.conf',
output : 'util.conf',
configuration : cdata,
@@ -143,6 +145,21 @@ executable ('gnunet-config-diff',
dependencies: [libgnunetutil_dep, libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
install: false)
+
+executable ('gnunet-resolver-arm',
+ gnunetserviceresolver_src,
+ dependencies: [libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-timeout',
+ ['gnunet-timeout.c'],
+ dependencies: [libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+
executable ('test_common_logging_dummy',
['test_common_logging_dummy.c'],
dependencies: [libgnunetutil_dep, libgnunetutil_dep],
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.