move entity_map_json to libipmid
entity_map_json is used by dbus-sdr sensor handling so it needs to be in
a common location or loading order matters. This change moves the file
from the ipmi20 provider library to libipmi, a common library.
Tested: Found that even though the dbus-sdr provider loads before
ipmi20, it loads properly without missing symbols.
Change-Id: I9ab6833c78e6f3c89c02cf998ce0a36353059c3d
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
diff --git a/libipmid/meson.build b/libipmid/meson.build
index 3a8042c..0d6360c 100644
--- a/libipmid/meson.build
+++ b/libipmid/meson.build
@@ -6,13 +6,22 @@
systemd,
]
+entity_map_json_lib = static_library(
+ 'entity_map_json',
+ 'entity_map_json.cpp',
+ include_directories: root_inc,
+ dependencies: [nlohmann_json_dep, sdbusplus_dep],
+ implicit_include_directories: false)
+
+entity_map_json_dep = declare_dependency(link_with: entity_map_json_lib)
+
libipmid = library(
'ipmid',
'sdbus-asio.cpp',
'signals.cpp',
'systemintf-sdbus.cpp',
'utils.cpp',
- dependencies: ipmid_pre,
+ dependencies: [ipmid_pre, entity_map_json_dep],
version: meson.project_version(),
include_directories: root_inc,
install: true,