BUILD: meson install more files

4 files changed, 56 insertions, 5 deletions

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],