[gnunet] branch master updated: fix meson modular build

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 242ce99ea fix meson modular build
242ce99ea is described below

commit 242ce99ea04512c87ae6a9ffa9b4d12bfe0a1132
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 5 09:04:23 2023 +0200

    fix meson modular build
---
 src/hello/meson.build     | 18 ++++++------
 src/include/meson.build   |  7 -----
 src/transport/meson.build | 71 ++++-------------------------------------------
 3 files changed, 13 insertions(+), 83 deletions(-)

diff --git a/src/hello/meson.build b/src/hello/meson.build
index 04d5a6bef..c0df8b76c 100644
--- a/src/hello/meson.build
+++ b/src/hello/meson.build
@@ -1,11 +1,8 @@
-libgnunethello_src = ['hello.c',
+libgnunethello_src = [#'hello.c',
                       'address.c',
                       'hello-ng.c',
                       'hello-uri.c']
 
-gnunethello_src = ['gnunet-hello.c']
-
-
 if get_option('monolith')
   foreach p : libgnunethello_src
     gnunet_src += 'hello/' + p
@@ -26,10 +23,11 @@ pkg.generate(libgnunethello, url: 'https://www.gnunet.org',
              description : 'Helper library for handling GNUnet HELLO messages')
 
 
-executable ('gnunet-hello',
-            gnunethello_src,
-            dependencies: [libgnunethello_dep, libgnunetutil_dep],
-            include_directories: [incdir, configuration_inc],
-            install: true,
-            install_dir: get_option('bindir'))
+# TNG
+#executable ('gnunet-hello',
+#            ['gnunet-hello.c'],
+#            dependencies: [libgnunethello_dep, libgnunetutil_dep],
+#            include_directories: [incdir, configuration_inc],
+#            install: true,
+#            install_dir: get_option('bindir'))
 
diff --git a/src/include/meson.build b/src/include/meson.build
index 58125cc11..bf1f46a54 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -12,10 +12,6 @@ install_headers(
   'gnunet_abd_service.h',
   'gnunet_applications.h',
   'gnunet_arm_service.h',
-  'gnunet_ats_service.h',
-  'gnunet_ats_application_service.h',
-  'gnunet_ats_transport_service.h',
-  'gnunet_ats_plugin.h',
   'gnunet_bandwidth_lib.h',
   'gnunet_bio_lib.h',
   'gnunet_dht_block_types.h',
@@ -118,14 +114,11 @@ install_headers(
   'gnunet_testing_ng_lib.h',
   'gnunet_testing_netjail_lib.h',
   'gnunet_time_lib.h',
-  'gnunet_transport_service.h',
   'gnunet_transport_application_service.h',
   'gnunet_transport_communication_service.h',
   'gnunet_transport_core_service.h',
   'gnunet_transport_hello_service.h',
-  'gnunet_transport_manipulation_service.h',
   'gnunet_transport_monitor_service.h',
-  'gnunet_transport_plugin.h',
   'gnunet_tun_lib.h',
   'gnunet_uri_lib.h',
   'gnunet_util_lib.h',
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 6489db9af..267a8d7c7 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -28,50 +28,12 @@ configure_file(input : 
'gnunet-transport-certificate-creation.in',
                install: true,
                install_dir: get_option('bindir'))
 
-configure_file(input : 'communicator-unix.conf',
-               output : 'communicator-unix.conf',
-               configuration : cdata,
-               install: true,
-               install_dir: pkgcfgdir)
-
 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,
-#        soversion: '2',
-#        version: '2.2.0',
-#        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)
-
-#libgnunettransporttesting = library('gnunettransporttesting',
-#        [
-#          'transport-testing.c',
-#          'transport-testing-filenames.c',
-#          'transport-testing-loggers.c',
-#          'transport-testing-main.c',
-#          'transport-testing-send.c'
-#          ],
-#        soversion: '0',
-#        version: '0.0.0',
-#        dependencies: [libgnunetutil_dep,
-#                       libgnunettesting_dep,
-#                       libgnunettransport_dep,
-#                       libgnunetats_dep,
-#                       libgnunethello_dep],
-#        include_directories: [incdir, configuration_inc],
-#        install: true,
-#        install_dir: get_option('libdir'))
-
-
 libgnunettransportapplication = library('gnunettransportapplication',
         libgnunettransportapplication_src,
         soversion: '0',
@@ -129,11 +91,11 @@ libgnunettransporttesting2 = 
library('gnunettransporttesting2',
           'transport_api_cmd_stop_peer.c',
           'transport_api_cmd_send_simple.c',
           'transport_api_cmd_send_simple_performance.c',
-          #'transport-testing2.c',
-          #'transport-testing-filenames2.c',
-          #'transport-testing-loggers2.c',
-          #'transport-testing-main2.c',
-          #'transport-testing-send2.c',
+          'transport-testing2.c',
+          'transport-testing-filenames2.c',
+          'transport-testing-loggers2.c',
+          'transport-testing-main2.c',
+          'transport-testing-send2.c',
           'transport-testing-communicator.c',
           ],
         soversion: '0',
@@ -149,18 +111,6 @@ libgnunettransporttesting2 = 
library('gnunettransporttesting2',
         install_dir: get_option('libdir'))
 libgnunettransporttesting2_dep = declare_dependency(link_with : 
libgnunettransporttesting2)
 
-#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')
-
 executable ('gnunet-communicator-unix',
             gnunetcommunicatorunix_src,
             dependencies: [libgnunettransportcommunicator_dep,
@@ -199,17 +149,6 @@ executable ('gnunet-communicator-tcp',
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 
-#executable ('gnunet-transport',
-#            ['gnunet-transport.c'],
-#            dependencies: [libgnunettransportcommunicator_dep,
-#                           libgnunethello_dep,
-#                           libgnunettransport_dep,
-#                           libgnunetpeerstore_dep,
-#                           libgnunetutil_dep],
-#            include_directories: [incdir, configuration_inc],
-#            install: true,
-#            install_dir: get_option('bindir'))
-
 libgnunettesttransport_cmd_simplesend = 
library('gnunet_test_transport_plugin_cmd_simple_send',
     ['test_transport_plugin_cmd_simple_send.c'],
         dependencies: [

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.