commit d177039ea0ab26d10a1bf5dd9b191eba6139cb0e
parent ec33fd877f8c64ad14c264d3abf5b8cbfbc166cf
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Thu, 5 Oct 2023 16:39:12 +0200
BUILD: Meson libgnunet monolith fix; set still prevents build
Diffstat:
17 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/cadet/meson.build b/src/cadet/meson.build
@@ -27,6 +27,7 @@ if get_option('monolith')
foreach p : libgnunetcadet_src + gnunetservicecadet_src
gnunet_src += 'cadet/' + p
endforeach
+ subdir_done()
endif
libgnunetcadet = library('gnunetcadet',
diff --git a/src/core/meson.build b/src/core/meson.build
@@ -17,6 +17,7 @@ if get_option('monolith')
foreach p : libgnunetcore_src + gnunetservicecore_src
gnunet_src += 'core/' + p
endforeach
+ subdir_done()
endif
libgnunetcore = library('gnunetcore',
diff --git a/src/curl/meson.build b/src/curl/meson.build
@@ -5,6 +5,7 @@ if get_option('monolith')
foreach p : libgnunetcurl_src
gnunet_src += 'curl/' + p
endforeach
+ subdir_done()
endif
libgnunetcurl = library('gnunetcurl',
diff --git a/src/datacache/meson.build b/src/datacache/meson.build
@@ -13,6 +13,7 @@ if get_option('monolith')
foreach p : libgnunetdatacache_src
gnunet_src += 'datacache/' + p
endforeach
+ subdir_done()
endif
libgnunetdatacache = library('gnunetdatacache',
diff --git a/src/datastore/meson.build b/src/datastore/meson.build
@@ -16,6 +16,7 @@ if get_option('monolith')
foreach p : libgnunetdatastore_src + gnunetservicedatastore_src
gnunet_src += 'datastore/' + p
endforeach
+ subdir_done()
endif
libgnunetdatastore = library('gnunetdatastore',
libgnunetdatastore_src,
diff --git a/src/dht/meson.build b/src/dht/meson.build
@@ -15,6 +15,7 @@ if get_option('monolith')
foreach p : libgnunetdht_src + gnunetservicedht_src
gnunet_src += 'dht/' + p
endforeach
+ subdir_done()
endif
libgnunetdht = library('gnunetdht',
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
@@ -11,6 +11,7 @@ if get_option('monolith')
foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src
gnunet_src += 'dhtu/' + p
endforeach
+ subdir_done()
endif
libgnunettestingdhtu = library('gnunettestingdhtu',
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build
@@ -5,6 +5,7 @@ if get_option('monolith')
foreach p : libgnunetfragmentation_src
gnunet_src += 'fragmentation/' + p
endforeach
+ subdir_done()
endif
libgnunetfragmentation = library('gnunetfragmentation',
diff --git a/src/fs/meson.build b/src/fs/meson.build
@@ -38,6 +38,7 @@ if get_option('monolith')
foreach p : libgnunetfs_src + gnunetservicefs_src
gnunet_src += 'fs/' + p
endforeach
+ subdir_done()
endif
libgnunetfs = library('gnunetfs',
diff --git a/src/identity/meson.build b/src/identity/meson.build
@@ -15,6 +15,7 @@ if get_option('monolith')
foreach p : libgnunetidentity_src + gnunetserviceidentity_src
gnunet_src += 'identity/' + p
endforeach
+ subdir_done()
endif
libgnunetidentity = library('gnunetidentity',
diff --git a/src/namecache/meson.build b/src/namecache/meson.build
@@ -11,7 +11,7 @@ configure_file(input : 'namecache.conf.in',
if get_option('monolith')
- foreach p : libgnunetnamecache_src + libgnunetpluginnamecache_sqlite_src + gnunetservicenamecache_src
+ foreach p : libgnunetnamecache_src + gnunetservicenamecache_src
gnunet_src += 'namecache/' + p
endforeach
subdir_done()
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
@@ -11,7 +11,7 @@ configure_file(input : 'nat-auto.conf.in',
install_dir: pkgcfgdir)
if get_option('monolith')
- foreach p : libgnunetnatauto_src + gnunetservernatauto_src + gnunetservicenatauto_src
+ foreach p : libgnunetnatauto_src + gnunetservernat_src + gnunetservicenatauto_src
gnunet_src += 'nat-auto/' + p
endforeach
subdir_done()
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
@@ -13,7 +13,7 @@ configure_file(input : 'scalarproduct.conf.in',
if get_option('monolith')
- foreach p : libgnunetscalarproduct_src + gnunetservicescalarproduct_src
+ foreach p : libgnunetscalarproduct_src + gnunetservicescalarproducta_src + gnunetservicescalarproductb_src + gnunetservicescalarproductecca_src + gnunetservicescalarproducteccb_src
gnunet_src += 'scalarproduct/' + p
endforeach
subdir_done()
diff --git a/src/secretsharing/meson.build b/src/secretsharing/meson.build
@@ -12,6 +12,7 @@ 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/testing/meson.build b/src/testing/meson.build
@@ -28,9 +28,9 @@ configure_file(input : 'testing.conf',
if get_option('monolith')
- foreach p : libgnunettesting_src
- gnunet_src += 'testing/' + p
- endforeach
+ # foreach p : libgnunettesting_src
+ # gnunet_src += 'testing/' + p
+ # endforeach
subdir_done()
endif
diff --git a/src/transport/meson.build b/src/transport/meson.build
@@ -1,11 +1,3 @@
-libgnunettransport_src = ['transport_api_address_to_string.c',
- 'transport_api_blacklist.c',
- 'transport_api_core.c',
- 'transport_api_hello_get.c',
- 'transport_api_manipulation.c',
- 'transport_api_monitor_peers.c',
- 'transport_api_monitor_plugins.c',
- 'transport_api_offer_hello.c']
libgnunettransportapplication_src = ['transport_api2_application.c']
libgnunettransportcore_src = ['transport_api2_core.c']
libgnunettransportcommunicator_src = ['transport_api2_communication.c']
@@ -29,9 +21,10 @@ configure_file(input : 'gnunet-transport-certificate-creation.in',
install_dir: get_option('bindir'))
if get_option('monolith')
- foreach p : libgnunettransport_src #+ libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src
+ foreach p : libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src
gnunet_src += 'transport/' + p
endforeach
+ subdir_done()
endif
libgnunettransportapplication = library('gnunettransportapplication',
diff --git a/src/util/meson.build b/src/util/meson.build
@@ -84,7 +84,7 @@ configure_file(input : 'resolver.conf.in',
if get_option('monolith')
- foreach p : [libgnunetutil_src, gnunetserviceresolver_src]
+ foreach p : libgnunetutil_src + gnunetserviceresolver_src
gnunet_src += 'util/' + p
endforeach
subdir_done()
