meson: rename logindefs_c to lib_common_logindefs

Rename the logindefs static library variable from logindefs_c to
lib_common_logindefs for consistency with lib_common_shells and
the autotools libcommon_logindefs.la naming.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/lib/meson.build b/lib/meson.build
index 15077dbf40046d72efaad3a1342138546a367389..c193aeda71c2f9f2aed4c1558b61c9f000d43b1b 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -51,7 +51,7 @@ pty_session_c = files('pty-session.c')
 ismounted_c = files('ismounted.c')
 exec_shell_c = files('exec_shell.c')
 fileeq_c = files('fileeq.c')
-logindefs_c = static_library('logindefs',
+lib_common_logindefs = static_library('common_logindefs',
   sources : ['logindefs.c'],
   include_directories : dir_include,
   dependencies : lib_econf,

diff --git a/meson.build b/meson.build
index 5fbbe3376bf9b0de81784a1e94ed3998e2d02cbe..a3e4abdbfeec6ed178638db1ef30a4498dcfa213 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1069,7 +1069,7 @@ exe = executable(
   chfn_sources,
   chfn_chsh_sources,
   include_directories : includes,
-  link_with : [lib_common, logindefs_c],
+  link_with : [lib_common, lib_common_logindefs],
   dependencies : chfn_chsh_deps,
   install_dir : usrbin_exec_dir,
   install_mode : 'rwsr-xr-x',
@@ -1172,7 +1172,7 @@ exe = executable(
   pty_session_c,
   monotonic_c,
   include_directories : includes,
-  link_with : [lib_common, logindefs_c, lib_common_shells],
+  link_with : [lib_common, lib_common_logindefs, lib_common_shells],
   dependencies : [lib_pam,
                   lib_pam_misc,
                   lib_util,
@@ -1212,7 +1212,7 @@ exe = executable(
   include_directories : includes,
   link_with : [lib_common,
                lib_smartcols,
-               logindefs_c] +
+               lib_common_logindefs] +
                (build_liblastlog2 ? [lib_lastlog2] : []),
   dependencies : [lib_selinux,
                   lib_systemd],
@@ -1258,7 +1258,7 @@ exe = executable(
   pty_session_c,
   monotonic_c,
   include_directories : includes,
-  link_with : [lib_common, logindefs_c, lib_common_shells],
+  link_with : [lib_common, lib_common_logindefs, lib_common_shells],
   dependencies : [lib_pam,
                   lib_pam_misc,
                   lib_util,
@@ -2210,7 +2210,7 @@ exe = executable(
   'setpriv',
   setpriv_sources,
   include_directories : includes,
-  link_with : [lib_common, logindefs_c],
+  link_with : [lib_common, lib_common_logindefs],
   dependencies : [lib_cap_ng],
   install_dir : usrbin_exec_dir,
   install : opt,
@@ -2748,7 +2748,7 @@ exe = executable(
   'agetty',
   agetty_sources,
   include_directories : includes,
-  link_with : [lib_common, logindefs_c],
+  link_with : [lib_common, lib_common_logindefs],
   dependencies : [BSD ? lib_util : [], lib_systemd],
   install_dir : sbindir,
   install : opt,
@@ -2843,7 +2843,7 @@ exe = executable(
   'login',
   login_sources,
   include_directories : includes,
-  link_with : [lib_common, logindefs_c, lib_common_shells],
+  link_with : [lib_common, lib_common_logindefs, lib_common_shells],
   dependencies : [lib_pam,
                   lib_audit,
                   lib_selinux],
@@ -3741,7 +3741,7 @@ exe = executable(
   'lib/logindefs.c',
   c_args : ['-DTEST_PROGRAM'],
   include_directories : dir_include,
-  link_with : [lib_common, logindefs_c],
+  link_with : [lib_common, lib_common_logindefs],
   build_by_default: program_tests)
 if not is_disabler(exe)
   exes += exe