diff --git a/gen/xyz/openbmc_project/State/BMC/meson.build b/gen/xyz/openbmc_project/State/BMC/meson.build
index a40bcf4..d5e3710 100644
--- a/gen/xyz/openbmc_project/State/BMC/meson.build
+++ b/gen/xyz/openbmc_project/State/BMC/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/BMC__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/BMC.errors.yaml', meson.project_source_root() / 'xyz/openbmc_project/State/BMC.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/BMC.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/BMC',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build b/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
index afb48ce..c04d2c3 100644
--- a/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
+++ b/gen/xyz/openbmc_project/State/BMCRedundancy/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/BMCRedundancy__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/BMCRedundancy',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build b/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
index c0fc32c..c343308 100644
--- a/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/PostCode/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/PostCode__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Boot/PostCode',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/Progress/meson.build b/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
index ad00832..693ce2c 100644
--- a/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/Progress/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/Progress__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Boot/Progress',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/Raw/meson.build b/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
index d6111b3..6ae940c 100644
--- a/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/Raw/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Boot/Raw__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Boot/Raw',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Boot/meson.build b/gen/xyz/openbmc_project/State/Boot/meson.build
index c5ce53c..905d7e2 100644
--- a/gen/xyz/openbmc_project/State/Boot/meson.build
+++ b/gen/xyz/openbmc_project/State/Boot/meson.build
@@ -2,45 +2,42 @@
 subdir('PostCode')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Boot/PostCode__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Boot/PostCode.interface.yaml',  ],
     output: [ 'PostCode.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Boot/PostCode',
     ],
-    build_by_default: true,
 )
 
 subdir('Progress')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Boot/Progress__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Boot/Progress.interface.yaml',  ],
     output: [ 'Progress.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Boot/Progress',
     ],
-    build_by_default: true,
 )
 
 subdir('Raw')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Boot/Raw__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Boot/Raw.interface.yaml',  ],
     output: [ 'Raw.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Boot/Raw',
     ],
-    build_by_default: true,
 )
 
diff --git a/gen/xyz/openbmc_project/State/Chassis/meson.build b/gen/xyz/openbmc_project/State/Chassis/meson.build
index 4f0547d..90d9e75 100644
--- a/gen/xyz/openbmc_project/State/Chassis/meson.build
+++ b/gen/xyz/openbmc_project/State/Chassis/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Chassis__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Chassis.errors.yaml', meson.project_source_root() / 'xyz/openbmc_project/State/Chassis.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Chassis.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Chassis',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build b/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
index 6e71c68..1c6c4a4 100644
--- a/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/Availability/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/Availability__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Decorator/Availability',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build b/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
index f2d6ad4..1f2e646 100644
--- a/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/OperationalStatus/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Decorator/OperationalStatus__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Decorator/OperationalStatus',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Decorator/meson.build b/gen/xyz/openbmc_project/State/Decorator/meson.build
index b2200b6..67726a8 100644
--- a/gen/xyz/openbmc_project/State/Decorator/meson.build
+++ b/gen/xyz/openbmc_project/State/Decorator/meson.build
@@ -2,30 +2,28 @@
 subdir('Availability')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Decorator/Availability__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Decorator/Availability.interface.yaml',  ],
     output: [ 'Availability.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Decorator/Availability',
     ],
-    build_by_default: true,
 )
 
 subdir('OperationalStatus')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Decorator/OperationalStatus__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Decorator/OperationalStatus.interface.yaml',  ],
     output: [ 'OperationalStatus.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Decorator/OperationalStatus',
     ],
-    build_by_default: true,
 )
 
diff --git a/gen/xyz/openbmc_project/State/Drive/meson.build b/gen/xyz/openbmc_project/State/Drive/meson.build
index 74f9345..7233922 100644
--- a/gen/xyz/openbmc_project/State/Drive/meson.build
+++ b/gen/xyz/openbmc_project/State/Drive/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Drive__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Drive.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Drive.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Drive',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Host/meson.build b/gen/xyz/openbmc_project/State/Host/meson.build
index f3d3d4d..3d3a886 100644
--- a/gen/xyz/openbmc_project/State/Host/meson.build
+++ b/gen/xyz/openbmc_project/State/Host/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Host__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Host.errors.yaml', meson.project_source_root() / 'xyz/openbmc_project/State/Host.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Host.interface.yaml',  ],
     output: [ 'error.cpp', 'error.hpp', 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Host',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build b/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
index 312d760..0277946 100644
--- a/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
+++ b/gen/xyz/openbmc_project/State/OperatingSystem/Status/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/OperatingSystem/Status__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/OperatingSystem/Status',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/OperatingSystem/meson.build b/gen/xyz/openbmc_project/State/OperatingSystem/meson.build
index fea8744..c0cd94a 100644
--- a/gen/xyz/openbmc_project/State/OperatingSystem/meson.build
+++ b/gen/xyz/openbmc_project/State/OperatingSystem/meson.build
@@ -2,15 +2,14 @@
 subdir('Status')
 generated_others += custom_target(
     'xyz/openbmc_project/State/OperatingSystem/Status__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/OperatingSystem/Status.interface.yaml',  ],
     output: [ 'Status.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/OperatingSystem/Status',
     ],
-    build_by_default: true,
 )
 
diff --git a/gen/xyz/openbmc_project/State/PowerOnHours/meson.build b/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
index 7367fec..131d859 100644
--- a/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
+++ b/gen/xyz/openbmc_project/State/PowerOnHours/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/PowerOnHours__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/PowerOnHours',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build b/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
index 6088257..9b5d2f4 100644
--- a/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
+++ b/gen/xyz/openbmc_project/State/ScheduledHostTransition/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/ScheduledHostTransition__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/ScheduledHostTransition',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build b/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build
index 82bf5f5..cfdf2c8 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/Inventory/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Shutdown/Inventory__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Shutdown/Inventory',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build b/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build
index 75d6374..bf85bee 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/Power/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Shutdown/Power__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Shutdown/Power',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build b/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build
index 502e618..0b117ac 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/ThermalEvent/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Shutdown/ThermalEvent__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
+    input: [ '../../../../../../xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../../..',
         'xyz/openbmc_project/State/Shutdown/ThermalEvent',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Shutdown/meson.build b/gen/xyz/openbmc_project/State/Shutdown/meson.build
index 8822511..5a453cc 100644
--- a/gen/xyz/openbmc_project/State/Shutdown/meson.build
+++ b/gen/xyz/openbmc_project/State/Shutdown/meson.build
@@ -2,45 +2,42 @@
 subdir('Inventory')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Shutdown/Inventory__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Shutdown/Inventory.errors.yaml',  ],
     output: [ 'Inventory.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Shutdown/Inventory',
     ],
-    build_by_default: true,
 )
 
 subdir('Power')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Shutdown/Power__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Shutdown/Power.errors.yaml',  ],
     output: [ 'Power.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Shutdown/Power',
     ],
-    build_by_default: true,
 )
 
 subdir('ThermalEvent')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Shutdown/ThermalEvent__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Shutdown/ThermalEvent.errors.yaml',  ],
     output: [ 'ThermalEvent.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Shutdown/ThermalEvent',
     ],
-    build_by_default: true,
 )
 
diff --git a/gen/xyz/openbmc_project/State/SystemdTarget/meson.build b/gen/xyz/openbmc_project/State/SystemdTarget/meson.build
index 2af8de3..e5700f0 100644
--- a/gen/xyz/openbmc_project/State/SystemdTarget/meson.build
+++ b/gen/xyz/openbmc_project/State/SystemdTarget/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/SystemdTarget__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
     output: [ 'error.cpp', 'error.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/SystemdTarget',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/Watchdog/meson.build b/gen/xyz/openbmc_project/State/Watchdog/meson.build
index 4ba1276..165a1fb 100644
--- a/gen/xyz/openbmc_project/State/Watchdog/meson.build
+++ b/gen/xyz/openbmc_project/State/Watchdog/meson.build
@@ -1,13 +1,13 @@
 # Generated file; do not modify.
 generated_sources += custom_target(
     'xyz/openbmc_project/State/Watchdog__cpp'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
+    input: [ '../../../../../xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
     output: [ 'server.cpp', 'server.hpp', 'client.hpp',  ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../../..',
         'xyz/openbmc_project/State/Watchdog',
     ],
 )
diff --git a/gen/xyz/openbmc_project/State/meson.build b/gen/xyz/openbmc_project/State/meson.build
index 49ae284..a5b6978 100644
--- a/gen/xyz/openbmc_project/State/meson.build
+++ b/gen/xyz/openbmc_project/State/meson.build
@@ -2,139 +2,130 @@
 subdir('BMC')
 generated_others += custom_target(
     'xyz/openbmc_project/State/BMC__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/BMC.errors.yaml', meson.project_source_root() / 'xyz/openbmc_project/State/BMC.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/BMC.interface.yaml',  ],
     output: [ 'BMC.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/BMC',
     ],
-    build_by_default: true,
 )
 
 subdir('BMCRedundancy')
 generated_others += custom_target(
     'xyz/openbmc_project/State/BMCRedundancy__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/BMCRedundancy.interface.yaml',  ],
     output: [ 'BMCRedundancy.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/BMCRedundancy',
     ],
-    build_by_default: true,
 )
 
 subdir('Boot')
 subdir('Chassis')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Chassis__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Chassis.errors.yaml', meson.project_source_root() / 'xyz/openbmc_project/State/Chassis.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/Chassis.interface.yaml',  ],
     output: [ 'Chassis.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/Chassis',
     ],
-    build_by_default: true,
 )
 
 subdir('Decorator')
 subdir('Drive')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Drive__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Drive.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/Drive.interface.yaml',  ],
     output: [ 'Drive.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/Drive',
     ],
-    build_by_default: true,
 )
 
 subdir('Host')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Host__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Host.errors.yaml', meson.project_source_root() / 'xyz/openbmc_project/State/Host.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/Host.interface.yaml',  ],
     output: [ 'Host.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/Host',
     ],
-    build_by_default: true,
 )
 
 subdir('OperatingSystem')
 subdir('PowerOnHours')
 generated_others += custom_target(
     'xyz/openbmc_project/State/PowerOnHours__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/PowerOnHours.interface.yaml',  ],
     output: [ 'PowerOnHours.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/PowerOnHours',
     ],
-    build_by_default: true,
 )
 
 subdir('ScheduledHostTransition')
 generated_others += custom_target(
     'xyz/openbmc_project/State/ScheduledHostTransition__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/ScheduledHostTransition.interface.yaml',  ],
     output: [ 'ScheduledHostTransition.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/ScheduledHostTransition',
     ],
-    build_by_default: true,
 )
 
 subdir('Shutdown')
 subdir('SystemdTarget')
 generated_others += custom_target(
     'xyz/openbmc_project/State/SystemdTarget__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/SystemdTarget.errors.yaml',  ],
     output: [ 'SystemdTarget.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/SystemdTarget',
     ],
-    build_by_default: true,
 )
 
 subdir('Watchdog')
 generated_others += custom_target(
     'xyz/openbmc_project/State/Watchdog__markdown'.underscorify(),
-    input: [ meson.project_source_root() / 'xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
+    input: [ '../../../../xyz/openbmc_project/State/Watchdog.interface.yaml',  ],
     output: [ 'Watchdog.md' ],
     command: [
         sdbuspp_gen_meson_prog, '--command', 'markdown',
         '--output', meson.current_build_dir(),
         '--tool', sdbusplusplus_prog,
-        '--directory', meson.project_source_root(),
+        '--directory', meson.current_source_dir() / '../../../..',
         'xyz/openbmc_project/State/Watchdog',
     ],
-    build_by_default: true,
 )