[glib-networking/mcatanzaro/mesonbuild: 4/4] build: move some code to lower-level meson.builds

[Marge Bot <marge-bot src gnome org>]

commit 9efb546cc93ed2e967f2691c53813ee2d2bf1568
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Fri Feb 11 15:38:31 2022 -0600

    build: move some code to lower-level meson.builds
    
    This simplifies the subdir logic in the toplevel meson.build by pushing
    it lower. It's not a huge simplification, but helps a bit.
    
    Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/204>

 meson.build       | 38 +++-----------------------------------
 proxy/meson.build | 15 +++++++++++++++
 tls/meson.build   | 17 +++++++++++++++++
 3 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8e93a33a..99dbeb13 100644
--- a/meson.build
+++ b/meson.build
@@ -157,8 +157,6 @@ po_dir = join_paths(meson.source_root(), 'po')
 top_inc = include_directories('.')
 tls_inc = include_directories('tls')
 
-subdir('po')
-
 enable_installed_tests = get_option('installed_tests')
 test_template = files('template.test.in')
 
@@ -171,39 +169,9 @@ endif
 
 proxy_test_programs = []
 
-if libproxy_dep.found()
-  subdir('proxy/libproxy')
-endif
-
-if gsettings_desktop_schemas_dep.found()
-  subdir('proxy/gnome')
-endif
-
-# FIXME: This ought to work on Windows.
-# https://gitlab.gnome.org/GNOME/glib-networking/-/issues/185
-if not ['windows'].contains(host_system)
-  subdir('proxy/environment')
-endif
-
-subdir('proxy/tests')
-
-subdir('tls/base')
-
-if gnutls_dep.found()
-  subdir('tls/gnutls')
-endif
-
-if backends.contains('openssl')
-  if ['darwin', 'ios'].contains(host_system)
-    security_dep = dependency('appleframeworks', modules : ['Security'])
-  elif ['windows'].contains(host_system)
-    crypt32_dep = cc.find_library('crypt32')
-  endif
-
-  subdir('tls/openssl')
-endif
-
-subdir('tls/tests')
+subdir('po')
+subdir('proxy')
+subdir('tls')
 
 # Will automatically pick it up from the cross file if defined
 gio_querymodules = find_program('gio-querymodules', required : false)
diff --git a/proxy/meson.build b/proxy/meson.build
new file mode 100644
index 00000000..c6384525
--- /dev/null
+++ b/proxy/meson.build
@@ -0,0 +1,15 @@
+if libproxy_dep.found()
+  subdir('libproxy')
+endif
+
+if gsettings_desktop_schemas_dep.found()
+  subdir('gnome')
+endif
+
+# FIXME: This ought to work on Windows.
+# https://gitlab.gnome.org/GNOME/glib-networking/-/issues/185
+if not ['windows'].contains(host_system)
+  subdir('environment')
+endif
+
+subdir('tests')
diff --git a/tls/meson.build b/tls/meson.build
new file mode 100644
index 00000000..e76e7666
--- /dev/null
+++ b/tls/meson.build
@@ -0,0 +1,17 @@
+subdir('base')
+
+if gnutls_dep.found()
+  subdir('gnutls')
+endif
+
+if backends.contains('openssl')
+  if ['darwin', 'ios'].contains(host_system)
+    security_dep = dependency('appleframeworks', modules : ['Security'])
+  elif ['windows'].contains(host_system)
+    crypt32_dep = cc.find_library('crypt32')
+  endif
+
+  subdir('openssl')
+endif
+
+subdir('tests')