Move source files into application-specific sub-directories
Currently, dbus-sensors implement multiple applications:
- psusensor
- adcsensor
- intelcpusensor
- hwmontempsensor
- ipmbsensor
- nvmesensor
- externalsensor
- mcutempsensor
- intrusionsensor
- fansensor
- exitairtempsensor
This commit is to create separate directories for each application so
that things can be separated more easily and the files are smaller,
instead of creating one huge file for the sensor implementation.
There was some discussion in discord on this. [1][2]
[1]: https://discord.com/channels/775381525260664832/1187158775438778408/1284106093756289067
[2]: https://discord.com/channels/775381525260664832/867820390406422538/1303217796821553214
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: I258fc2ee7d8f939c7b83a07350395e78775b2b8d
diff --git a/src/meson.build b/src/meson.build
index 12f8ee5..f619572 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -70,170 +70,49 @@
if get_option('intel-cpu').allowed()
peci_dep = dependency('libpeci', required: true)
+ subdir('intel-cpu')
endif
if get_option('adc').allowed()
- executable(
- 'adcsensor',
- 'ADCSensor.cpp',
- 'ADCSensorMain.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
-endif
-
-if get_option('intel-cpu').allowed()
- executable(
- 'intelcpusensor',
- 'IntelCPUSensorMain.cpp',
- 'IntelCPUSensor.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- thresholds_dep,
- utils_dep,
- peci_dep,
- ],
- include_directories: peci_incdirs,
- install: true,
- )
+ subdir('adc')
endif
if get_option('exit-air').allowed()
- executable(
- 'exitairtempsensor',
- 'ExitAirTempSensor.cpp',
- dependencies: [
- default_deps,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
+ subdir('exit-air')
endif
if get_option('fan').allowed()
- executable(
- 'fansensor',
- 'FanMain.cpp',
- 'PresenceGpio.cpp',
- 'TachSensor.cpp',
- 'PwmSensor.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
+ subdir('fan')
endif
if get_option('hwmon-temp').allowed()
- executable(
- 'hwmontempsensor',
- 'HwmonTempMain.cpp',
- 'HwmonTempSensor.cpp',
- dependencies: [
- default_deps,
- devicemgmt_dep,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
+ subdir('hwmon-temp')
endif
if get_option('intrusion').allowed()
- executable(
- 'intrusionsensor',
- 'ChassisIntrusionSensor.cpp',
- 'IntrusionSensorMain.cpp',
- dependencies: [
- default_deps,
- gpiodcxx,
- i2c,
- utils_dep,
- ],
- install: true,
- )
+ subdir('intrusion')
endif
if get_option('ipmb').allowed()
- executable(
- 'ipmbsensor',
- 'IpmbSensorMain.cpp',
- 'IpmbSensor.cpp',
- 'IpmbSDRSensor.cpp',
- dependencies: [
- default_deps,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
+ subdir('ipmb')
endif
if get_option('mcu').allowed()
- executable(
- 'mcutempsensor',
- 'MCUTempSensor.cpp',
- dependencies: [
- default_deps,
- i2c,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
+ subdir('mcu')
endif
if get_option('nvme').allowed()
- nvme_srcs = files('NVMeSensor.cpp', 'NVMeSensorMain.cpp')
- nvme_srcs += files('NVMeBasicContext.cpp')
-
- nvme_deps = [default_deps, i2c, thresholds_dep, utils_dep, threads]
-
- executable(
- 'nvmesensor',
- sources: nvme_srcs,
- dependencies: nvme_deps,
- install: true,
- )
+ subdir('nvme')
endif
if get_option('psu').allowed()
- executable(
- 'psusensor',
- 'PSUEvent.cpp',
- 'PSUSensor.cpp',
- 'PSUSensorMain.cpp',
- dependencies: [
- default_deps,
- devicemgmt_dep,
- pwmsensor_dep,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
+ subdir('psu')
endif
if get_option('external').allowed()
- executable(
- 'externalsensor',
- 'ExternalSensor.cpp',
- 'ExternalSensorMain.cpp',
- dependencies: [
- default_deps,
- thresholds_dep,
- utils_dep,
- ],
- install: true,
- )
+ subdir('external')
+endif
+
+if get_option('tests').allowed()
+ subdir('tests')
endif