diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cadet/meson.build | 1 | ||||
-rw-r--r-- | src/core/meson.build | 1 | ||||
-rw-r--r-- | src/curl/meson.build | 1 | ||||
-rw-r--r-- | src/datacache/meson.build | 1 | ||||
-rw-r--r-- | src/datastore/meson.build | 1 | ||||
-rw-r--r-- | src/dht/meson.build | 1 | ||||
-rw-r--r-- | src/dhtu/meson.build | 1 | ||||
-rw-r--r-- | src/fragmentation/meson.build | 1 | ||||
-rw-r--r-- | src/fs/meson.build | 1 | ||||
-rw-r--r-- | src/identity/meson.build | 1 | ||||
-rw-r--r-- | src/namecache/meson.build | 2 | ||||
-rw-r--r-- | src/nat-auto/meson.build | 2 | ||||
-rw-r--r-- | src/scalarproduct/meson.build | 2 | ||||
-rw-r--r-- | src/secretsharing/meson.build | 1 | ||||
-rw-r--r-- | src/testing/meson.build | 6 | ||||
-rw-r--r-- | src/transport/meson.build | 11 | ||||
-rw-r--r-- | src/util/meson.build | 2 |
17 files changed, 20 insertions, 16 deletions
diff --git a/src/cadet/meson.build b/src/cadet/meson.build index dfaf77af8..5684d06ea 100644 --- a/src/cadet/meson.build +++ b/src/cadet/meson.build | |||
@@ -27,6 +27,7 @@ if get_option('monolith') | |||
27 | foreach p : libgnunetcadet_src + gnunetservicecadet_src | 27 | foreach p : libgnunetcadet_src + gnunetservicecadet_src |
28 | gnunet_src += 'cadet/' + p | 28 | gnunet_src += 'cadet/' + p |
29 | endforeach | 29 | endforeach |
30 | subdir_done() | ||
30 | endif | 31 | endif |
31 | 32 | ||
32 | libgnunetcadet = library('gnunetcadet', | 33 | libgnunetcadet = library('gnunetcadet', |
diff --git a/src/core/meson.build b/src/core/meson.build index f64896737..06ba0272e 100644 --- a/src/core/meson.build +++ b/src/core/meson.build | |||
@@ -17,6 +17,7 @@ if get_option('monolith') | |||
17 | foreach p : libgnunetcore_src + gnunetservicecore_src | 17 | foreach p : libgnunetcore_src + gnunetservicecore_src |
18 | gnunet_src += 'core/' + p | 18 | gnunet_src += 'core/' + p |
19 | endforeach | 19 | endforeach |
20 | subdir_done() | ||
20 | endif | 21 | endif |
21 | 22 | ||
22 | libgnunetcore = library('gnunetcore', | 23 | libgnunetcore = library('gnunetcore', |
diff --git a/src/curl/meson.build b/src/curl/meson.build index dd38843a8..00f35aa20 100644 --- a/src/curl/meson.build +++ b/src/curl/meson.build | |||
@@ -5,6 +5,7 @@ if get_option('monolith') | |||
5 | foreach p : libgnunetcurl_src | 5 | foreach p : libgnunetcurl_src |
6 | gnunet_src += 'curl/' + p | 6 | gnunet_src += 'curl/' + p |
7 | endforeach | 7 | endforeach |
8 | subdir_done() | ||
8 | endif | 9 | endif |
9 | 10 | ||
10 | libgnunetcurl = library('gnunetcurl', | 11 | libgnunetcurl = library('gnunetcurl', |
diff --git a/src/datacache/meson.build b/src/datacache/meson.build index ae57161cd..bde9f8621 100644 --- a/src/datacache/meson.build +++ b/src/datacache/meson.build | |||
@@ -13,6 +13,7 @@ if get_option('monolith') | |||
13 | foreach p : libgnunetdatacache_src | 13 | foreach p : libgnunetdatacache_src |
14 | gnunet_src += 'datacache/' + p | 14 | gnunet_src += 'datacache/' + p |
15 | endforeach | 15 | endforeach |
16 | subdir_done() | ||
16 | endif | 17 | endif |
17 | 18 | ||
18 | libgnunetdatacache = library('gnunetdatacache', | 19 | libgnunetdatacache = library('gnunetdatacache', |
diff --git a/src/datastore/meson.build b/src/datastore/meson.build index 2f412e183..77a21b8be 100644 --- a/src/datastore/meson.build +++ b/src/datastore/meson.build | |||
@@ -16,6 +16,7 @@ if get_option('monolith') | |||
16 | foreach p : libgnunetdatastore_src + gnunetservicedatastore_src | 16 | foreach p : libgnunetdatastore_src + gnunetservicedatastore_src |
17 | gnunet_src += 'datastore/' + p | 17 | gnunet_src += 'datastore/' + p |
18 | endforeach | 18 | endforeach |
19 | subdir_done() | ||
19 | endif | 20 | endif |
20 | libgnunetdatastore = library('gnunetdatastore', | 21 | libgnunetdatastore = library('gnunetdatastore', |
21 | libgnunetdatastore_src, | 22 | libgnunetdatastore_src, |
diff --git a/src/dht/meson.build b/src/dht/meson.build index f42ae354c..02c3cb8f8 100644 --- a/src/dht/meson.build +++ b/src/dht/meson.build | |||
@@ -15,6 +15,7 @@ if get_option('monolith') | |||
15 | foreach p : libgnunetdht_src + gnunetservicedht_src | 15 | foreach p : libgnunetdht_src + gnunetservicedht_src |
16 | gnunet_src += 'dht/' + p | 16 | gnunet_src += 'dht/' + p |
17 | endforeach | 17 | endforeach |
18 | subdir_done() | ||
18 | endif | 19 | endif |
19 | 20 | ||
20 | libgnunetdht = library('gnunetdht', | 21 | libgnunetdht = library('gnunetdht', |
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build index 8d076cc3f..b024332dd 100644 --- a/src/dhtu/meson.build +++ b/src/dhtu/meson.build | |||
@@ -11,6 +11,7 @@ if get_option('monolith') | |||
11 | foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src | 11 | foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src |
12 | gnunet_src += 'dhtu/' + p | 12 | gnunet_src += 'dhtu/' + p |
13 | endforeach | 13 | endforeach |
14 | subdir_done() | ||
14 | endif | 15 | endif |
15 | 16 | ||
16 | libgnunettestingdhtu = library('gnunettestingdhtu', | 17 | libgnunettestingdhtu = library('gnunettestingdhtu', |
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build index 148a4efe8..411812d0d 100644 --- a/src/fragmentation/meson.build +++ b/src/fragmentation/meson.build | |||
@@ -5,6 +5,7 @@ if get_option('monolith') | |||
5 | foreach p : libgnunetfragmentation_src | 5 | foreach p : libgnunetfragmentation_src |
6 | gnunet_src += 'fragmentation/' + p | 6 | gnunet_src += 'fragmentation/' + p |
7 | endforeach | 7 | endforeach |
8 | subdir_done() | ||
8 | endif | 9 | endif |
9 | 10 | ||
10 | libgnunetfragmentation = library('gnunetfragmentation', | 11 | libgnunetfragmentation = library('gnunetfragmentation', |
diff --git a/src/fs/meson.build b/src/fs/meson.build index 73e55b65a..4246e4fcf 100644 --- a/src/fs/meson.build +++ b/src/fs/meson.build | |||
@@ -38,6 +38,7 @@ if get_option('monolith') | |||
38 | foreach p : libgnunetfs_src + gnunetservicefs_src | 38 | foreach p : libgnunetfs_src + gnunetservicefs_src |
39 | gnunet_src += 'fs/' + p | 39 | gnunet_src += 'fs/' + p |
40 | endforeach | 40 | endforeach |
41 | subdir_done() | ||
41 | endif | 42 | endif |
42 | 43 | ||
43 | libgnunetfs = library('gnunetfs', | 44 | libgnunetfs = library('gnunetfs', |
diff --git a/src/identity/meson.build b/src/identity/meson.build index 7987bfcfc..c9e4f9bb4 100644 --- a/src/identity/meson.build +++ b/src/identity/meson.build | |||
@@ -15,6 +15,7 @@ if get_option('monolith') | |||
15 | foreach p : libgnunetidentity_src + gnunetserviceidentity_src | 15 | foreach p : libgnunetidentity_src + gnunetserviceidentity_src |
16 | gnunet_src += 'identity/' + p | 16 | gnunet_src += 'identity/' + p |
17 | endforeach | 17 | endforeach |
18 | subdir_done() | ||
18 | endif | 19 | endif |
19 | 20 | ||
20 | libgnunetidentity = library('gnunetidentity', | 21 | libgnunetidentity = library('gnunetidentity', |
diff --git a/src/namecache/meson.build b/src/namecache/meson.build index aa92454e6..ee6988a99 100644 --- a/src/namecache/meson.build +++ b/src/namecache/meson.build | |||
@@ -11,7 +11,7 @@ configure_file(input : 'namecache.conf.in', | |||
11 | 11 | ||
12 | 12 | ||
13 | if get_option('monolith') | 13 | if get_option('monolith') |
14 | foreach p : libgnunetnamecache_src + libgnunetpluginnamecache_sqlite_src + gnunetservicenamecache_src | 14 | foreach p : libgnunetnamecache_src + gnunetservicenamecache_src |
15 | gnunet_src += 'namecache/' + p | 15 | gnunet_src += 'namecache/' + p |
16 | endforeach | 16 | endforeach |
17 | subdir_done() | 17 | subdir_done() |
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build index eaa64f124..9b5ff4cdf 100644 --- a/src/nat-auto/meson.build +++ b/src/nat-auto/meson.build | |||
@@ -11,7 +11,7 @@ configure_file(input : 'nat-auto.conf.in', | |||
11 | install_dir: pkgcfgdir) | 11 | install_dir: pkgcfgdir) |
12 | 12 | ||
13 | if get_option('monolith') | 13 | if get_option('monolith') |
14 | foreach p : libgnunetnatauto_src + gnunetservernatauto_src + gnunetservicenatauto_src | 14 | foreach p : libgnunetnatauto_src + gnunetservernat_src + gnunetservicenatauto_src |
15 | gnunet_src += 'nat-auto/' + p | 15 | gnunet_src += 'nat-auto/' + p |
16 | endforeach | 16 | endforeach |
17 | subdir_done() | 17 | subdir_done() |
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build index 183f0f784..296734c2c 100644 --- a/src/scalarproduct/meson.build +++ b/src/scalarproduct/meson.build | |||
@@ -13,7 +13,7 @@ configure_file(input : 'scalarproduct.conf.in', | |||
13 | 13 | ||
14 | 14 | ||
15 | if get_option('monolith') | 15 | if get_option('monolith') |
16 | foreach p : libgnunetscalarproduct_src + gnunetservicescalarproduct_src | 16 | foreach p : libgnunetscalarproduct_src + gnunetservicescalarproducta_src + gnunetservicescalarproductb_src + gnunetservicescalarproductecca_src + gnunetservicescalarproducteccb_src |
17 | gnunet_src += 'scalarproduct/' + p | 17 | gnunet_src += 'scalarproduct/' + p |
18 | endforeach | 18 | endforeach |
19 | subdir_done() | 19 | subdir_done() |
diff --git a/src/secretsharing/meson.build b/src/secretsharing/meson.build index 177cd1bee..1f8cee930 100644 --- a/src/secretsharing/meson.build +++ b/src/secretsharing/meson.build | |||
@@ -12,6 +12,7 @@ if get_option('monolith') | |||
12 | foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src | 12 | foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src |
13 | gnunet_src += 'secretsharing/' + p | 13 | gnunet_src += 'secretsharing/' + p |
14 | endforeach | 14 | endforeach |
15 | subdir_done() | ||
15 | endif | 16 | endif |
16 | 17 | ||
17 | libgnunetsecretsharing = library('gnunetsecretsharing', | 18 | libgnunetsecretsharing = library('gnunetsecretsharing', |
diff --git a/src/testing/meson.build b/src/testing/meson.build index c591ae849..68b5f5149 100644 --- a/src/testing/meson.build +++ b/src/testing/meson.build | |||
@@ -28,9 +28,9 @@ configure_file(input : 'testing.conf', | |||
28 | 28 | ||
29 | 29 | ||
30 | if get_option('monolith') | 30 | if get_option('monolith') |
31 | foreach p : libgnunettesting_src | 31 | # foreach p : libgnunettesting_src |
32 | gnunet_src += 'testing/' + p | 32 | # gnunet_src += 'testing/' + p |
33 | endforeach | 33 | # endforeach |
34 | subdir_done() | 34 | subdir_done() |
35 | endif | 35 | endif |
36 | 36 | ||
diff --git a/src/transport/meson.build b/src/transport/meson.build index 267a8d7c7..e44c01fa7 100644 --- a/src/transport/meson.build +++ b/src/transport/meson.build | |||
@@ -1,11 +1,3 @@ | |||
1 | libgnunettransport_src = ['transport_api_address_to_string.c', | ||
2 | 'transport_api_blacklist.c', | ||
3 | 'transport_api_core.c', | ||
4 | 'transport_api_hello_get.c', | ||
5 | 'transport_api_manipulation.c', | ||
6 | 'transport_api_monitor_peers.c', | ||
7 | 'transport_api_monitor_plugins.c', | ||
8 | 'transport_api_offer_hello.c'] | ||
9 | libgnunettransportapplication_src = ['transport_api2_application.c'] | 1 | libgnunettransportapplication_src = ['transport_api2_application.c'] |
10 | libgnunettransportcore_src = ['transport_api2_core.c'] | 2 | libgnunettransportcore_src = ['transport_api2_core.c'] |
11 | libgnunettransportcommunicator_src = ['transport_api2_communication.c'] | 3 | libgnunettransportcommunicator_src = ['transport_api2_communication.c'] |
@@ -29,9 +21,10 @@ configure_file(input : 'gnunet-transport-certificate-creation.in', | |||
29 | install_dir: get_option('bindir')) | 21 | install_dir: get_option('bindir')) |
30 | 22 | ||
31 | if get_option('monolith') | 23 | if get_option('monolith') |
32 | foreach p : libgnunettransport_src #+ libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src | 24 | foreach p : libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src |
33 | gnunet_src += 'transport/' + p | 25 | gnunet_src += 'transport/' + p |
34 | endforeach | 26 | endforeach |
27 | subdir_done() | ||
35 | endif | 28 | endif |
36 | 29 | ||
37 | libgnunettransportapplication = library('gnunettransportapplication', | 30 | libgnunettransportapplication = library('gnunettransportapplication', |
diff --git a/src/util/meson.build b/src/util/meson.build index b5d156ea6..7da8274b4 100644 --- a/src/util/meson.build +++ b/src/util/meson.build | |||
@@ -84,7 +84,7 @@ configure_file(input : 'resolver.conf.in', | |||
84 | 84 | ||
85 | 85 | ||
86 | if get_option('monolith') | 86 | if get_option('monolith') |
87 | foreach p : [libgnunetutil_src, gnunetserviceresolver_src] | 87 | foreach p : libgnunetutil_src + gnunetserviceresolver_src |
88 | gnunet_src += 'util/' + p | 88 | gnunet_src += 'util/' + p |
89 | endforeach | 89 | endforeach |
90 | subdir_done() | 90 | subdir_done() |