From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Fri, 2 Feb 2024 12:41:37 +0000 (+0100)
Subject: meson: use a dependency object for liblastlog2
X-Git-Tag: v2.41-devel^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=485d877f8d482f4c7a9a9d185ee4868ba1892732;p=thirdparty%2Futil-linux.git

meson: use a dependency object for liblastlog2

It is easier to use.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---

diff --git a/liblastlog2/meson.build b/liblastlog2/meson.build
index c478939170..d77e556fc8 100644
--- a/liblastlog2/meson.build
+++ b/liblastlog2/meson.build
@@ -15,7 +15,7 @@ liblastlog2_sym_path = '@0@/@1@'.format(meson.current_source_dir(), liblastlog2_
 lib_lastlog2 = both_libraries(
   'lastlog2',
   lib_lastlog2_sources,
-  include_directories : [dir_include, dir_liblastlog2],
+  include_directories : [dir_include],
   link_args : ['-Wl,--version-script=@0@'.format(liblastlog2_sym_path)],
   link_depends : liblastlog2_sym,
   dependencies : [libsqlite3],
@@ -50,9 +50,9 @@ if build_liblastlog2
     exe = executable(
       test_name,
       'src/tests/tst_' + lastlog2_test + '.c',
-      include_directories : [dir_include, dir_liblastlog2],
-      link_with : [lib_common, lib_lastlog2],
-      dependencies : libdl
+      include_directories : [dir_include],
+      link_with : [lib_common],
+      dependencies : [libdl, lastlog2_dep],
     )
     # the test-setup expects the helpers in the toplevel build-directory
     link = meson.project_build_root() / test_name
diff --git a/pam_lastlog2/meson.build b/pam_lastlog2/meson.build
index e9864f3cd3..ae768dad10 100644
--- a/pam_lastlog2/meson.build
+++ b/pam_lastlog2/meson.build
@@ -19,11 +19,10 @@ if build_liblastlog2
     'pam_lastlog2',
     lib_pam_lastlog2_sources,
     name_prefix : '',
-    include_directories : [dir_include, dir_liblastlog2],
+    include_directories : [dir_include],
     link_args : ['-Wl,--version-script=@0@'.format(pam_lastlog2_sym_path)],
     link_depends : pam_lastlog2_sym,
-    link_with : [lib_lastlog2],
-    dependencies : [libpam],
+    dependencies : [libpam, lastlog2_dep],
     install : build_liblastlog2,
     install_dir : pamlibdir,
     version : liblastlog2_version,