commit 998dc4eb85f850bd916526ee3bf0fe548aa8ef93
author Manojkiran Eda <manojkiran.eda@gmail.com> Thu Jul 28 08:18:03 2022 +0530
committer ManojKiran Eda <manojkiran.eda@gmail.com> Thu Aug 04 05:55:38 2022 +0000
tree df59eda2244847803da1df3873c8f73e94ae1f5f
parent 0ce1424fd1d30dcb9e4af222ec08615ee832a425

Move oem libpldm code inside libpldm

Moving the oem support inside the libpldm folder would
help us to migrate libpldm folder into its own repository.

Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
Change-Id: I4596e9e001c985864431a56343318e5f93d3ede3

libpldmresponder/meson.build

diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build
index 9ea74a3..ed68a84 100644
--- a/libpldmresponder/meson.build
+++ b/libpldmresponder/meson.build
@@ -28,7 +28,12 @@
   'event_parser.cpp'
 ]
 
+responder_headers = ['.']
+
 if get_option('oem-ibm').enabled()
+   responder_headers += [
+    '../oem/ibm/',
+   ]
   sources += [
     '../oem/ibm/libpldmresponder/utils.cpp',
     '../oem/ibm/libpldmresponder/file_io.cpp',
@@ -49,10 +54,12 @@
   'pldmresponder',
   sources,
   version: meson.project_version(),
+  include_directories:include_directories(responder_headers),
   dependencies: libpldmresponder_deps,
   install: true)
 
-libpldmresponder = declare_dependency(
+libpldmresponder_dep = declare_dependency(
+  include_directories:include_directories(responder_headers),
   link_with: libpldmresponder)
 
 if get_option('tests').enabled()

libpldmresponder/test/meson.build

diff --git a/libpldmresponder/test/meson.build b/libpldmresponder/test/meson.build
index 1f40788..edb9643 100644
--- a/libpldmresponder/test/meson.build
+++ b/libpldmresponder/test/meson.build
@@ -39,7 +39,7 @@
                      dependencies: [
                          dep_src,
                          libpldm_dep,
-                         libpldmresponder,
+                         libpldmresponder_dep,
                          libpldmutils,
                          gtest,
                          gmock,