[gnunet] branch master updated: meson: fix build after component consolidation

[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 76b2084cd meson: fix build after component consolidation
76b2084cd is described below

commit 76b2084cdea123ac6a6886aacfea5bed5bb2755e
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Oct 13 23:07:13 2023 +0200

    meson: fix build after component consolidation
---
 src/include/meson.build   | 1 -
 src/meson.build           | 9 ---------
 src/transport/meson.build | 3 ---
 src/util/meson.build      | 1 +
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/include/meson.build b/src/include/meson.build
index bf1f46a54..0aa85c9d1 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -42,7 +42,6 @@ install_headers(
   'gnunet_dnsstub_lib.h',
   'gnunet_dns_service.h',
   'gnunet_error_codes.h',
-  'gnunet_fragmentation_lib.h',
   'gnunet_friends_lib.h',
   'gnunet_fs_service.h',
   'gnunet_getopt_lib.h',
diff --git a/src/meson.build b/src/meson.build
index f903d0111..c59ecfab9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,7 +4,6 @@ endif
 
 subdir('include')
 subdir('util')
-subdir('nt')
 subdir('hello')
 subdir('block')
 if get_option('monolith') == false
@@ -27,25 +26,18 @@ subdir('peerstore')
 #subdir('ats')
 subdir('nat')
 subdir('nat-auto')
-subdir('fragmentation')
 subdir('transport')
-#subdir('ats-tool')
 subdir('core')
-# Testbed needs old transport
-#subdir('testbed-logger')
-#subdir('testbed')
 subdir('nse')
 subdir('dhtu')
 subdir('dht')
 subdir('hostlist')
-subdir('topology')
 subdir('regex')
 subdir('dns')
 subdir('identity')
 subdir('gnsrecord')
 subdir('namecache')
 subdir('namestore')
-#subdir('peerinfo-tool')
 subdir('cadet')
 subdir('set')
 subdir('seti')
@@ -65,7 +57,6 @@ subdir('secretsharing')
 subdir('reclaim')
 subdir('messenger')
 ##subdir('$(EXP_DIR)')
-#subdir('integration-tests')
 
 if not get_option('monolith')
   subdir_done()
diff --git a/src/transport/meson.build b/src/transport/meson.build
index e44c01fa7..423bfc8a5 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -109,7 +109,6 @@ executable ('gnunet-communicator-unix',
             dependencies: [libgnunettransportcommunicator_dep,
                            libgnunetpeerstore_dep,
                            libgnunetstatistics_dep,
-                           libgnunetnt_dep,
                            libgnunetnat_dep,
                            gcrypt_dep,
                            libgnunetutil_dep],
@@ -122,7 +121,6 @@ executable ('gnunet-communicator-udp',
                            libgnunettransportapplication_dep,
                            libgnunetpeerstore_dep,
                            libgnunetstatistics_dep,
-                           libgnunetnt_dep,
                            libgnunetnat_dep,
                            gcrypt_dep,
                            libgnunetutil_dep],
@@ -134,7 +132,6 @@ executable ('gnunet-communicator-tcp',
             dependencies: [libgnunettransportcommunicator_dep,
                            libgnunetpeerstore_dep,
                            libgnunetstatistics_dep,
-                           libgnunetnt_dep,
                            libgnunetnat_dep,
                            gcrypt_dep,
                            libgnunetutil_dep],
diff --git a/src/util/meson.build b/src/util/meson.build
index 7da8274b4..a559c721d 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -47,6 +47,7 @@ libgnunetutil_src = ['bandwidth.c',
        'mq.c',
        'nc.c',
        'network.c',
+       'nt.c',
        'op.c',
        'os_installation.c',
        'os_network.c',

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