yaml: move to subdirectory
A pending sdbusplus change (I38b69bc67b6a3d80cda1b508a76e106a50d8ab93)
is going to require YAML to be in a specific subdirectory and not in
the root. Move here in prep for that change.
Also add in the regenerate-meson script as a helper to regenerate
the sdbusplus meson files for this repository.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2c9e74b85550e3e8f0f5cb56a82e85c5b13c6d00
diff --git a/meson.build b/meson.build
index 4f3415c..6006b8c 100644
--- a/meson.build
+++ b/meson.build
@@ -13,15 +13,13 @@
systemd = dependency('systemd', required : true)
-sdbusplus = dependency(
- 'sdbusplus',
- fallback: [
- 'sdbusplus',
- 'sdbusplus_dep'
- ]
-)
-sdbusplusplus_prog = find_program('sdbus++', required : true)
-sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson', required : true)
+sdbusplus_dep = dependency('sdbusplus')
+sdbusplusplus_prog = find_program('sdbus++')
+sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson')
+sdbusplusplus_depfiles = files()
+if sdbusplus_dep.type_name() == 'internal'
+ sdbusplusplus_depfiles = subproject('sdbusplus').get_variable('sdbusplusplus_depfiles')
+endif
phosphorlogging = dependency(
'phosphor-logging',
@@ -100,7 +98,7 @@
deps = [
systemd,
- sdbusplus,
+ sdbusplus_dep,
phosphorlogging,
fmt_dep,
extra_deps