commit 6f4479c71644d8c815f21155554f1d3eecc2f2dd
author Patrick Williams <patrick@stwcx.xyz> Fri Apr 16 21:39:44 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue Apr 20 14:45:07 2021 +0000
tree d1fa0e82efffa443ee175ac1112ca77738a7412d
parent b0d15f1fdb518caba397f4ea24a1f33db3bfa502

build: rename dependency variable

Per [1], the conventions for dependency variables are to
be named '<project or lib>_dep'.  This allows consistency
when using this project as a meson-subproject elsewhere.

Switch the name from 'libpldm' to 'libpldm_dep'.

1. https://mesonbuild.com/Subprojects.html#naming-convention-for-dependency-variables

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

libpldm/meson.build

diff --git a/libpldm/meson.build b/libpldm/meson.build
index bc31526..e884f66 100644
--- a/libpldm/meson.build
+++ b/libpldm/meson.build
@@ -60,7 +60,7 @@
   version: meson.project_version(),
   install: true)
 
-libpldm = declare_dependency(
+libpldm_dep = declare_dependency(
   include_directories: include_directories(libpldm_headers),
   link_with: libpldm)
 

libpldm/tests/meson.build

diff --git a/libpldm/tests/meson.build b/libpldm/tests/meson.build
index 5502820..a4fb1cc 100644
--- a/libpldm/tests/meson.build
+++ b/libpldm/tests/meson.build
@@ -38,7 +38,7 @@
                      link_args: dynamic_linker,
                      build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
                      dependencies: [
-                         libpldm,
+                         libpldm_dep,
                          gtest,
                          gmock]),
        workdir: meson.current_source_dir())

libpldmresponder/meson.build

diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build
index 4377e39..952b702 100644
--- a/libpldmresponder/meson.build
+++ b/libpldmresponder/meson.build
@@ -2,7 +2,7 @@
   phosphor_dbus_interfaces,
   sdbusplus,
   sdeventplus,
-  libpldm,
+  libpldm_dep,
   libpldmutils
 ]
 

meson.build

diff --git a/meson.build b/meson.build
index dcb0e44..63bb198 100644
--- a/meson.build
+++ b/meson.build
@@ -63,7 +63,7 @@
   'common/utils.cpp',
   version: meson.project_version(),
   dependencies: [
-      libpldm,
+      libpldm_dep,
       phosphor_dbus_interfaces,
       sdbusplus,
   ],
@@ -77,7 +77,7 @@
 subdir('libpldmresponder')
 
 deps = [
-  libpldm,
+  libpldm_dep,
   libpldmutils,
   libpldmresponder,
   libpldmutils,

pldmtool/meson.build

diff --git a/pldmtool/meson.build b/pldmtool/meson.build
index 1d98e23..857ca24 100644
--- a/pldmtool/meson.build
+++ b/pldmtool/meson.build
@@ -20,6 +20,6 @@
   sources,
   implicit_include_directories: false,
   include_directories: include_directories(libpldm_headers),
-  dependencies: [libpldm, libpldmutils, sdbusplus],
+  dependencies: [libpldm_dep, libpldmutils, sdbusplus],
   install: true,
   install_dir: get_option('bindir'))

softoff/meson.build

diff --git a/softoff/meson.build b/softoff/meson.build
index 0ef11f1..12c7e00 100644
--- a/softoff/meson.build
+++ b/softoff/meson.build
@@ -1,5 +1,5 @@
 deps = [
-    libpldm,
+    libpldm_dep,
     libpldmutils,
     sdeventplus,
     sdbusplus,

test/meson.build

diff --git a/test/meson.build b/test/meson.build
index 43de609..d778deb 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -53,7 +53,7 @@
                      link_args: dynamic_linker,
                      build_rpath: get_option('oe-sdk').enabled() ? rpath : '',
                      dependencies: [
-                         libpldm,
+                         libpldm_dep,
                          libpldmresponder,
                          libpldmutils,
                          gtest,

utilities/meson.build

diff --git a/utilities/meson.build b/utilities/meson.build
index b9ee4c6..c94be0d 100644
--- a/utilities/meson.build
+++ b/utilities/meson.build
@@ -1,4 +1,4 @@
-deps = [ libpldm, sdeventplus ]
+deps = [ libpldm_dep, sdeventplus ]
 
 executable('set-state-effecter', 'requester/set_state_effecter.cpp',
            implicit_include_directories: false,