commit a918a62831ef49e2788b48454029d180131a70fe
author Andrew Jeffery <andrew@aj.id.au> Fri Apr 21 15:14:47 2023 +0930
committer Andrew Jeffery <andrew@aj.id.au> Mon Apr 24 12:39:13 2023 +0930
tree 3de24b27bc195bbfee30e2b58fc54a059134f06d
parent ba1a5eb96b8b0cf507b7eaa2ed231d3392d7c7cb

include: Move instance-id.h under libpldm/

The installed location for the header is
`${includedir}/libpldm/instance-id.h`. Make the in-tree location
equivalent so we don't have a slightly jarring inconsistency.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I9c1f324e18ba504261845187e88e35db0d8ef873

include/libpldm/instance-id.h

diff --git a/include/libpldm/requester/instance-id.h b/include/libpldm/instance-id.h
similarity index 100%
rename from include/libpldm/requester/instance-id.h
rename to include/libpldm/instance-id.h

include/libpldm/meson.build

diff --git a/include/libpldm/meson.build b/include/libpldm/meson.build
index fce591f..71f29a2 100644
--- a/include/libpldm/meson.build
+++ b/include/libpldm/meson.build
@@ -29,7 +29,7 @@
 
 if get_option('requester-api').enabled()
    libpldm_headers += files(
-    'requester/instance-id.h',
+    'instance-id.h',
     'requester/pldm.h'
     )
    libpldm_transport_headers += files(

src/requester/instance-id.c

diff --git a/src/requester/instance-id.c b/src/requester/instance-id.c
index e3cf41f..3d39fd8 100644
--- a/src/requester/instance-id.c
+++ b/src/requester/instance-id.c
@@ -1,6 +1,6 @@
 // NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp)
 #define _GNU_SOURCE
-#include "libpldm/requester/instance-id.h"
+#include "libpldm/instance-id.h"
 #include "libpldm/pldm.h"
 #include <errno.h>
 #include <fcntl.h>