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/meson.build b/meson.build
index 9ea6e1c..f6fc07c 100644
--- a/meson.build
+++ b/meson.build
@@ -205,15 +205,6 @@
transportoem_src = ['transporthandler_oem.cpp']
endif
-entity_map_json_lib = static_library(
- 'entity_map_json',
- 'entity_map_json.cpp',
- include_directories: root_inc,
- dependencies: [ipmid_dep, nlohmann_json_dep],
- implicit_include_directories: false)
-
-entity_map_json_dep = declare_dependency(link_with: entity_map_json_lib)
-
libipmi20_src = [
'app/channel.cpp',
'app/watchdog.cpp',
@@ -242,7 +233,7 @@
ipmi20_lib = library(
'ipmi20',
libipmi20_src,
- dependencies: [ipmid_pre, entity_map_json_dep, nlohmann_json_dep],
+ dependencies: [ipmid_pre, nlohmann_json_dep],
include_directories: root_inc,
install: true,
install_dir: get_option('libdir') / 'ipmid-providers',