sensors: Align source structure away from anti-patterns
The anti-patterns document comments on source structure, specifically
on placing internal headers in a parallel subtree[1]. dbus-sensors is an
example of violating this anti-pattern, so fix it.
[1]: https://github.com/openbmc/docs/blob/master/anti-patterns.md#placing-internal-headers-in-a-parallel-subtree
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I50ecaddd53fa9c9b7a0441af9de5e60bd94e47c6
diff --git a/src/meson.build b/src/meson.build
index 9d44db3..6f47fb0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,3 +1,60 @@
+conf_data = configuration_data()
+conf_data.set10('VALIDATION_UNSECURE_FEATURE', get_option('validate-unsecure-feature').enabled())
+conf_data.set10('INSECURE_UNRESTRICTED_SENSOR_OVERRIDE', get_option('insecure-sensor-override').enabled())
+configure_file(input: 'dbus-sensor_config.h.in',
+ output: 'dbus-sensor_config.h',
+ configuration: conf_data)
+
+thresholds_a = static_library(
+ 'thresholds_a',
+ 'Thresholds.cpp',
+ dependencies: default_deps,
+)
+
+thresholds_dep = declare_dependency(
+ link_with: [ thresholds_a ],
+ dependencies: default_deps,
+)
+
+utils_a = static_library(
+ 'utils_a',
+ [
+ 'FileHandle.cpp',
+ 'SensorPaths.cpp',
+ 'Utils.cpp',
+ ],
+ dependencies: default_deps,
+)
+
+utils_dep = declare_dependency(
+ link_with: [ utils_a ],
+ dependencies: [ sdbusplus ],
+)
+
+devicemgmt_a = static_library(
+ 'devicemgmt_a',
+ [
+ 'DeviceMgmt.cpp',
+ ],
+ dependencies: default_deps,
+)
+
+devicemgmt_dep = declare_dependency(
+ link_with: [ devicemgmt_a ],
+ dependencies: default_deps,
+)
+
+pwmsensor_a = static_library(
+ 'pwmsensor_a',
+ 'PwmSensor.cpp',
+ dependencies: [ default_deps, thresholds_dep ],
+)
+
+pwmsensor_dep = declare_dependency(
+ link_with: [ pwmsensor_a ],
+ dependencies: [ default_deps, thresholds_dep ],
+)
+
peci_incdirs = []
if not meson.get_compiler('cpp').has_header('linux/peci-ioctl.h')
peci_incdirs = ['../include']
@@ -15,8 +72,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -32,10 +87,7 @@
thresholds_dep,
utils_dep,
],
- implicit_include_directories: false,
- include_directories: [
- '../include'
- ] + peci_incdirs,
+ include_directories: peci_incdirs,
install: true,
)
endif
@@ -50,8 +102,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -69,8 +119,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -87,8 +135,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -105,8 +151,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -122,8 +166,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -139,8 +181,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -156,8 +196,6 @@
sources: nvme_srcs,
dependencies: nvme_deps,
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -175,8 +213,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif
@@ -192,8 +228,6 @@
utils_dep,
],
cpp_args: uring_args,
- implicit_include_directories: false,
- include_directories: '../include',
install: true,
)
endif