commit 302a61a5cf9c0f27bc91f08f5ee93b96f641da8d
author Patrick Williams <patrick@stwcx.xyz> Fri Aug 27 15:40:08 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Aug 27 16:06:08 2021 -0500
tree a931a0299182efa6f52c3f208b10180545fcb268
parent 8b8f606fc7219d5cd7fbf94646a2bf44d8f98f31

build: DRY dependencies

Nearly everything uses 'sdbusplus' and 'nlohmann-json'.  Since
'nlohmann-json' is a header-only library there is no issue with
excessively including it as a dependency.  DRY up the dependency
specification by creating a 'default_deps' array that can contain
these.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iad72eeda9b3cbd688eca5dee7df5ebc5dbe3878a

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index 9b6def6..8c398e3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -9,8 +9,8 @@
         'ADCSensor.cpp',
         'ADCSensorMain.cpp',
         dependencies: [
+            default_deps,
             gpiodcxx,
-            sdbusplus,
             thresholds_dep,
             utils_dep,
         ],
@@ -26,8 +26,8 @@
         'CPUSensorMain.cpp',
         'CPUSensor.cpp',
         dependencies: [
+            default_deps,
             gpiodcxx,
-            sdbusplus,
             thresholds_dep,
             utils_dep,
         ],
@@ -44,7 +44,7 @@
         'exitairtempsensor',
         'ExitAirTempSensor.cpp',
         dependencies: [
-            sdbusplus,
+            default_deps,
             thresholds_dep,
             utils_dep,
         ],
@@ -61,8 +61,8 @@
         'TachSensor.cpp',
         'PwmSensor.cpp',
         dependencies: [
+            default_deps,
             gpiodcxx,
-            sdbusplus,
             thresholds_dep,
             utils_dep,
         ],
@@ -78,7 +78,7 @@
         'HwmonTempMain.cpp',
         'HwmonTempSensor.cpp',
         dependencies: [
-            sdbusplus,
+            default_deps,
             thresholds_dep,
             utils_dep,
         ],
@@ -94,9 +94,9 @@
         'ChassisIntrusionSensor.cpp',
         'IntrusionSensorMain.cpp',
         dependencies: [
+            default_deps,
             gpiodcxx,
             i2c,
-            sdbusplus,
             utils_dep,
         ],
         implicit_include_directories: false,
@@ -110,7 +110,7 @@
         'ipmbsensor',
         'IpmbSensor.cpp',
         dependencies: [
-            sdbusplus,
+            default_deps,
             thresholds_dep,
             utils_dep,
         ],
@@ -125,8 +125,8 @@
         'mcutempsensor',
         'MCUTempSensor.cpp',
         dependencies: [
+            default_deps,
             i2c,
-            sdbusplus,
             thresholds_dep,
             utils_dep,
         ],
@@ -144,12 +144,12 @@
         'NVMeSensor.cpp',
         'NVMeMCTPContext.cpp',
         dependencies: [
+            default_deps,
             i2c,
             mctp,
-            sdbusplus,
             thresholds_dep,
             utils_dep,
-	    ],
+        ],
         implicit_include_directories: false,
         include_directories: '../include',
         install: true,
@@ -163,8 +163,8 @@
         'PSUSensor.cpp',
         'PSUSensorMain.cpp',
         dependencies: [
+            default_deps,
             pwmsensor_dep,
-            sdbusplus,
             thresholds_dep,
             utils_dep,
         ],
@@ -180,7 +180,7 @@
         'ExternalSensor.cpp',
         'ExternalSensorMain.cpp',
         dependencies: [
-            sdbusplus,
+            default_deps,
             thresholds_dep,
             utils_dep,
         ],