build: support registry generation

sdbus++-gen-meson version 10 adds support for redfish registry
generation and greatly simplifies the install directives.

Regenerate the YAML meson files and modify the base meson.build
as necessary.  Also, format meson.build with `meson format`.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I77586fca7742d5468803913cb45276ca57271655
diff --git a/gen/xyz/openbmc_project/Software/Activation/meson.build b/gen/xyz/openbmc_project/Software/Activation/meson.build
index c9e804b..705a6f5 100644
--- a/gen/xyz/openbmc_project/Software/Activation/meson.build
+++ b/gen/xyz/openbmc_project/Software/Activation/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/Activation'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Activation__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/Activation.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/Activation.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/Activation',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build b/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
index 5cedd32..0a1c25d 100644
--- a/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
+++ b/gen/xyz/openbmc_project/Software/ActivationBlocksTransition/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/ActivationBlocksTransition'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ActivationBlocksTransition__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ActivationBlocksTransition.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/ActivationBlocksTransition.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ActivationBlocksTransition',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build b/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
index df11aa7..07bce99 100644
--- a/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
+++ b/gen/xyz/openbmc_project/Software/ActivationProgress/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/ActivationProgress'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ActivationProgress__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ActivationProgress.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/ActivationProgress.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ActivationProgress',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build b/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
index c124c2f..858e350 100644
--- a/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
+++ b/gen/xyz/openbmc_project/Software/ApplyOptions/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/ApplyOptions'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ApplyOptions__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ApplyOptions.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/ApplyOptions.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ApplyOptions',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/ApplyTime/meson.build b/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
index 05eb6b5..edd879b 100644
--- a/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
+++ b/gen/xyz/openbmc_project/Software/ApplyTime/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/ApplyTime'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ApplyTime__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ApplyTime.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/ApplyTime.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ApplyTime',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build b/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
index f77eb13..43adca5 100644
--- a/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
+++ b/gen/xyz/openbmc_project/Software/ExtendedVersion/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/ExtendedVersion'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/ExtendedVersion__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/ExtendedVersion.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/ExtendedVersion.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/ExtendedVersion',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/Image/meson.build b/gen/xyz/openbmc_project/Software/Image/meson.build
index f492938..63213ed 100644
--- a/gen/xyz/openbmc_project/Software/Image/meson.build
+++ b/gen/xyz/openbmc_project/Software/Image/meson.build
@@ -1,8 +1,16 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/Image'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Image__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/Image.errors.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/Image.errors.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +19,11 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/Image',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/MinimumVersion/meson.build b/gen/xyz/openbmc_project/Software/MinimumVersion/meson.build
index d7aee92..1ecf17f 100644
--- a/gen/xyz/openbmc_project/Software/MinimumVersion/meson.build
+++ b/gen/xyz/openbmc_project/Software/MinimumVersion/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/MinimumVersion'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/MinimumVersion__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/MinimumVersion.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/MinimumVersion.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/MinimumVersion',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build b/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
index d2f86be..d4ddeb1 100644
--- a/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
+++ b/gen/xyz/openbmc_project/Software/RedundancyPriority/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/RedundancyPriority'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/RedundancyPriority__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/RedundancyPriority.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/RedundancyPriority.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/RedundancyPriority',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build b/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
index a1edd0b..fcff0e3 100644
--- a/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
+++ b/gen/xyz/openbmc_project/Software/RequestedRedundancyPriority/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/RequestedRedundancyPriority'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/RequestedRedundancyPriority__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/RequestedRedundancyPriority.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/RequestedRedundancyPriority.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/RequestedRedundancyPriority',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/Settings/meson.build b/gen/xyz/openbmc_project/Software/Settings/meson.build
index 0cf5dcc..4207344 100644
--- a/gen/xyz/openbmc_project/Software/Settings/meson.build
+++ b/gen/xyz/openbmc_project/Software/Settings/meson.build
@@ -1,8 +1,19 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/Settings'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Settings__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/Settings.interface.yaml',  ],
-    output: [ 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/Settings.interface.yaml',
+    ],
+    output: [
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +22,14 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/Settings',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/Update/meson.build b/gen/xyz/openbmc_project/Software/Update/meson.build
index d34410c..76c022d 100644
--- a/gen/xyz/openbmc_project/Software/Update/meson.build
+++ b/gen/xyz/openbmc_project/Software/Update/meson.build
@@ -1,8 +1,22 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/Update'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Update__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/Update.errors.yaml', '../../../../../yaml/xyz/openbmc_project/Software/Update.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/Update.errors.yaml',
+        '../../../../../yaml/xyz/openbmc_project/Software/Update.interface.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +25,16 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/Update',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/Version/meson.build b/gen/xyz/openbmc_project/Software/Version/meson.build
index 373950c..c160f67 100644
--- a/gen/xyz/openbmc_project/Software/Version/meson.build
+++ b/gen/xyz/openbmc_project/Software/Version/meson.build
@@ -1,8 +1,22 @@
 # Generated file; do not modify.
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software/Version'
+
 generated_sources += custom_target(
     'xyz/openbmc_project/Software/Version__cpp'.underscorify(),
-    input: [ '../../../../../yaml/xyz/openbmc_project/Software/Version.errors.yaml', '../../../../../yaml/xyz/openbmc_project/Software/Version.interface.yaml',  ],
-    output: [ 'error.cpp', 'error.hpp', 'common.hpp', 'server.cpp', 'server.hpp', 'aserver.hpp', 'client.hpp',  ],
+    input: [
+        '../../../../../yaml/xyz/openbmc_project/Software/Version.errors.yaml',
+        '../../../../../yaml/xyz/openbmc_project/Software/Version.interface.yaml',
+    ],
+    output: [
+        'error.cpp',
+        'error.hpp',
+        'common.hpp',
+        'server.hpp',
+        'server.cpp',
+        'aserver.hpp',
+        'client.hpp',
+    ],
     depend_files: sdbusplusplus_depfiles,
     command: [
         sdbuspp_gen_meson_prog, '--command', 'cpp',
@@ -11,5 +25,16 @@
         '--directory', meson.current_source_dir() / '../../../../../yaml',
         'xyz/openbmc_project/Software/Version',
     ],
+    install: should_generate_cpp,
+    install_dir: [
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+        false,
+        get_option('includedir') / sdbusplus_current_path,
+        get_option('includedir') / sdbusplus_current_path,
+    ],
+    build_by_default: should_generate_cpp,
 )
 
diff --git a/gen/xyz/openbmc_project/Software/meson.build b/gen/xyz/openbmc_project/Software/meson.build
index d4bde59..da32eb6 100644
--- a/gen/xyz/openbmc_project/Software/meson.build
+++ b/gen/xyz/openbmc_project/Software/meson.build
@@ -1,6 +1,21 @@
 # Generated file; do not modify.
 subdir('Activation')
-generated_others += custom_target(
+subdir('ActivationBlocksTransition')
+subdir('ActivationProgress')
+subdir('ApplyOptions')
+subdir('ApplyTime')
+subdir('ExtendedVersion')
+subdir('Image')
+subdir('MinimumVersion')
+subdir('RedundancyPriority')
+subdir('RequestedRedundancyPriority')
+subdir('Settings')
+subdir('Update')
+subdir('Version')
+
+sdbusplus_current_path = 'xyz/openbmc_project/Software'
+
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/Activation__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/Activation.interface.yaml',  ],
     output: [ 'Activation.md' ],
@@ -12,10 +27,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/Activation',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('ActivationBlocksTransition')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/ActivationBlocksTransition__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/ActivationBlocksTransition.interface.yaml',  ],
     output: [ 'ActivationBlocksTransition.md' ],
@@ -27,10 +44,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ActivationBlocksTransition',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('ActivationProgress')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/ActivationProgress__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/ActivationProgress.interface.yaml',  ],
     output: [ 'ActivationProgress.md' ],
@@ -42,10 +61,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ActivationProgress',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('ApplyOptions')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/ApplyOptions__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/ApplyOptions.interface.yaml',  ],
     output: [ 'ApplyOptions.md' ],
@@ -57,10 +78,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ApplyOptions',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('ApplyTime')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/ApplyTime__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/ApplyTime.interface.yaml',  ],
     output: [ 'ApplyTime.md' ],
@@ -72,10 +95,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ApplyTime',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('ExtendedVersion')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/ExtendedVersion__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/ExtendedVersion.interface.yaml',  ],
     output: [ 'ExtendedVersion.md' ],
@@ -87,10 +112,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/ExtendedVersion',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Image')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/Image__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/Image.errors.yaml',  ],
     output: [ 'Image.md' ],
@@ -102,10 +129,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/Image',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('MinimumVersion')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/MinimumVersion__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/MinimumVersion.interface.yaml',  ],
     output: [ 'MinimumVersion.md' ],
@@ -117,10 +146,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/MinimumVersion',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('RedundancyPriority')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/RedundancyPriority__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/RedundancyPriority.interface.yaml',  ],
     output: [ 'RedundancyPriority.md' ],
@@ -132,10 +163,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/RedundancyPriority',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('RequestedRedundancyPriority')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/RequestedRedundancyPriority__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/RequestedRedundancyPriority.interface.yaml',  ],
     output: [ 'RequestedRedundancyPriority.md' ],
@@ -147,10 +180,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/RequestedRedundancyPriority',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Settings')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/Settings__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/Settings.interface.yaml',  ],
     output: [ 'Settings.md' ],
@@ -162,10 +197,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/Settings',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Update')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/Update__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/Update.errors.yaml', '../../../../yaml/xyz/openbmc_project/Software/Update.interface.yaml',  ],
     output: [ 'Update.md' ],
@@ -177,10 +214,12 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/Update',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )
 
-subdir('Version')
-generated_others += custom_target(
+generated_markdown += custom_target(
     'xyz/openbmc_project/Software/Version__markdown'.underscorify(),
     input: [ '../../../../yaml/xyz/openbmc_project/Software/Version.errors.yaml', '../../../../yaml/xyz/openbmc_project/Software/Version.interface.yaml',  ],
     output: [ 'Version.md' ],
@@ -192,5 +231,8 @@
         '--directory', meson.current_source_dir() / '../../../../yaml',
         'xyz/openbmc_project/Software/Version',
     ],
+    install: should_generate_markdown,
+    install_dir: [inst_markdown_dir / sdbusplus_current_path],
+    build_by_default: should_generate_markdown,
 )