[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: meson: build all components
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: meson: build all components |
|
Date: |
Wed, 25 Oct 2023 00:13:39 +0200 |
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 94109410c meson: build all components
94109410c is described below
commit 94109410c7a99d92028f63936e110f1dacd9156a
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 25 00:13:34 2023 +0200
meson: build all components
---
src/cli/meson.build | 4 +---
src/contrib/service/consensus/meson.build | 1 -
src/contrib/service/conversation/meson.build | 1 -
src/contrib/service/scalarproduct/meson.build | 1 -
src/contrib/service/secretsharing/meson.build | 1 -
src/contrib/service/set/meson.build | 7 -------
src/include/meson.build | 2 --
src/lib/hello/meson.build | 5 +----
src/service/dhtu/meson.build | 2 +-
src/service/exit/meson.build | 6 +-----
src/service/hostlist/meson.build | 3 ---
src/service/pt/meson.build | 4 ----
src/service/topology/meson.build | 1 -
src/service/transport/transport-testing-communicator.c | 1 +
src/service/zonemaster/meson.build | 1 -
15 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/src/cli/meson.build b/src/cli/meson.build
index cfaceab74..5c1fded1a 100644
--- a/src/cli/meson.build
+++ b/src/cli/meson.build
@@ -1,7 +1,5 @@
subdir('util')
-if get_option('monolith') == false
- subdir('arm')
-endif
+subdir('arm')
subdir('statistics')
subdir('datastore')
subdir('nat')
diff --git a/src/contrib/service/consensus/meson.build
b/src/contrib/service/consensus/meson.build
index b66acf2b9..50483e81f 100644
--- a/src/contrib/service/consensus/meson.build
+++ b/src/contrib/service/consensus/meson.build
@@ -13,7 +13,6 @@ if get_option('monolith')
#foreach p : libgnunetconsensus_src + gnunetserviceconsensus_src
# gnunet_src += 'consensus/' + p
#endforeach
- subdir_done()
endif
libgnunetconsensus = shared_library('gnunetconsensus',
diff --git a/src/contrib/service/conversation/meson.build
b/src/contrib/service/conversation/meson.build
index b3fb070d9..a7f1ee896 100644
--- a/src/contrib/service/conversation/meson.build
+++ b/src/contrib/service/conversation/meson.build
@@ -15,7 +15,6 @@ if get_option('monolith')
foreach p : libgnunetconversation_src + gnunetserviceconversation_src
gnunet_src += 'conversation/' + p
endforeach
- subdir_done()
endif
libgnunetmicrophone = library('gnunetmicrophone',
diff --git a/src/contrib/service/scalarproduct/meson.build
b/src/contrib/service/scalarproduct/meson.build
index 296734c2c..a3d24cfa9 100644
--- a/src/contrib/service/scalarproduct/meson.build
+++ b/src/contrib/service/scalarproduct/meson.build
@@ -16,7 +16,6 @@ if get_option('monolith')
foreach p : libgnunetscalarproduct_src + gnunetservicescalarproducta_src +
gnunetservicescalarproductb_src + gnunetservicescalarproductecca_src +
gnunetservicescalarproducteccb_src
gnunet_src += 'scalarproduct/' + p
endforeach
- subdir_done()
endif
libgnunetscalarproduct = library('gnunetscalarproduct',
diff --git a/src/contrib/service/secretsharing/meson.build
b/src/contrib/service/secretsharing/meson.build
index bfd66dddb..5f9935793 100644
--- a/src/contrib/service/secretsharing/meson.build
+++ b/src/contrib/service/secretsharing/meson.build
@@ -13,7 +13,6 @@ if get_option('monolith')
#foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src
# gnunet_src += 'secretsharing/' + p
#endforeach
- subdir_done()
endif
libgnunetsecretsharing = library('gnunetsecretsharing',
diff --git a/src/contrib/service/set/meson.build
b/src/contrib/service/set/meson.build
index fe4934cb9..153c16ac5 100644
--- a/src/contrib/service/set/meson.build
+++ b/src/contrib/service/set/meson.build
@@ -13,13 +13,6 @@ configure_file(input : 'set.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith')
- #foreach p : libgnunetset_src + gnunetserviceset_src
- # gnunet_src += 'set/' + p
- #endforeach
- subdir_done()
-endif
-
libgnunetset = library('gnunetset',
libgnunetset_src,
soversion: '0',
diff --git a/src/include/meson.build b/src/include/meson.build
index 9a2483db5..57216c178 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -49,7 +49,6 @@ install_headers(
'gnunet_gnsrecord_json_lib.h',
'gnunet_gnsrecord_plugin.h',
'gnu_name_system_record_types.h',
- 'gnunet_hello_lib.h',
'gnunet_hello_uri_lib.h',
'gnunet_helper_lib.h',
'gnunet_identity_service.h',
@@ -115,7 +114,6 @@ install_headers(
'gnunet_transport_application_service.h',
'gnunet_transport_communication_service.h',
'gnunet_transport_core_service.h',
- 'gnunet_transport_hello_service.h',
'gnunet_transport_monitor_service.h',
'gnunet_tun_lib.h',
'gnunet_uri_lib.h',
diff --git a/src/lib/hello/meson.build b/src/lib/hello/meson.build
index 1986316ac..30e0f4c9c 100644
--- a/src/lib/hello/meson.build
+++ b/src/lib/hello/meson.build
@@ -1,7 +1,4 @@
-libgnunethello_src = [#'hello.c',
- 'address.c',
- 'hello-ng.c',
- 'hello-uri.c']
+libgnunethello_src = ['hello-uri.c']
libgnunethello = library('gnunethello',
libgnunethello_src,
diff --git a/src/service/dhtu/meson.build b/src/service/dhtu/meson.build
index b2525e782..a3c5b0e0a 100644
--- a/src/service/dhtu/meson.build
+++ b/src/service/dhtu/meson.build
@@ -11,7 +11,6 @@ if get_option('monolith')
foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src
gnunet_src += 'dhtu/' + p
endforeach
- subdir_done()
endif
libgnunettestingdhtu = library('gnunettestingdhtu',
@@ -42,6 +41,7 @@ shared_module('gnunet_plugin_dhtu_gnunet',
libgnunetcore_dep,
libgnunethello_dep,
libgnunetpeerstore_dep,
+ libgnunettransportapplication_dep,
libgnunetnse_dep,
],
include_directories: [incdir, configuration_inc],
diff --git a/src/service/exit/meson.build b/src/service/exit/meson.build
index e75f2b080..8656986e1 100644
--- a/src/service/exit/meson.build
+++ b/src/service/exit/meson.build
@@ -5,11 +5,7 @@ configure_file(input : 'exit.conf',
install_dir: pkgcfgdir)
-if get_option('monolith')
- subdir_done()
-endif
-
-if host_machine.system() == 'linux'
+if host_machine.system() == 'linux'
executable ('gnunet-helper-exit',
['gnunet-helper-exit.c'],
include_directories: [incdir, configuration_inc],
diff --git a/src/service/hostlist/meson.build b/src/service/hostlist/meson.build
index c05578334..01e7ecc01 100644
--- a/src/service/hostlist/meson.build
+++ b/src/service/hostlist/meson.build
@@ -9,9 +9,6 @@ configure_file(input : 'hostlist.conf',
install_dir: pkgcfgdir)
-if get_option('monolith')
- subdir_done()
-endif
executable ('gnunet-daemon-hostlist',
gnunetdaemonhostlist_src,
dependencies: [libgnunetutil_dep,
diff --git a/src/service/pt/meson.build b/src/service/pt/meson.build
index 0b6cc1818..2fdb1c7fa 100644
--- a/src/service/pt/meson.build
+++ b/src/service/pt/meson.build
@@ -5,10 +5,6 @@ configure_file(input : 'pt.conf',
install_dir: pkgcfgdir)
-if get_option('monolith')
- subdir_done()
-endif
-
executable ('gnunet-daemon-pt',
['gnunet-daemon-pt.c'],
dependencies: [libgnunetdns_dep,
diff --git a/src/service/topology/meson.build b/src/service/topology/meson.build
index b196d98f2..33b704b41 100644
--- a/src/service/topology/meson.build
+++ b/src/service/topology/meson.build
@@ -13,7 +13,6 @@ if get_option('monolith')
foreach p : libgnunetfriends_src
gnunet_src += 'topology/' + p
endforeach
- subdir_done()
endif
libgnunetfriends = library('gnunetfriends',
diff --git a/src/service/transport/transport-testing-communicator.c
b/src/service/transport/transport-testing-communicator.c
index 168b29ce5..107051241 100644
--- a/src/service/transport/transport-testing-communicator.c
+++ b/src/service/transport/transport-testing-communicator.c
@@ -31,6 +31,7 @@
#include "transport-testing-communicator.h"
#include "gnunet_signatures.h"
#include "transport.h"
+#include "gnunet_hello_uri_lib.h"
#include <inttypes.h>
#define LOG(kind, ...) GNUNET_log_from (kind, "transport-testing2",
__VA_ARGS__)
diff --git a/src/service/zonemaster/meson.build
b/src/service/zonemaster/meson.build
index 44c67edf2..92333ac8d 100644
--- a/src/service/zonemaster/meson.build
+++ b/src/service/zonemaster/meson.build
@@ -11,7 +11,6 @@ if get_option('monolith')
foreach p : gnunetservicezonemaster_src
gnunet_src += 'zonemaster/' + p
endforeach
- subdir_done()
endif
executable ('gnunet-service-zonemaster',
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: meson: build all components,
gnunet <=