From: Karel Zak <kzak@redhat.com>
Date: Mon, 21 Mar 2022 12:40:40 +0000 (+0100)
Subject: meson: update for logindefs move
X-Git-Tag: v2.39-rc1~751
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=866d922bf89151385cb9b82d6c3f8aec37df22b5;p=thirdparty%2Futil-linux.git

meson: update for logindefs move

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

diff --git a/lib/meson.build b/lib/meson.build
index 0847d59c62..21165b3c1a 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -49,6 +49,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 = files('logindefs.c')
 
 if LINUX
   lib_common_sources += '''
diff --git a/login-utils/meson.build b/login-utils/meson.build
index 61093b7190..d563217134 100644
--- a/login-utils/meson.build
+++ b/login-utils/meson.build
@@ -40,19 +40,13 @@ endif
 
 chfn_sources = files(
   'chfn.c',
-  'logindefs.c',
-  'logindefs.h',
-)
+) + \
+  logindefs_c
 
 test_islocal_sources = files(
   'islocal.c',
 )
 
-test_logindefs_sources = files(
-  'logindefs.c',
-  'logindefs.h',
-)
-
 test_consoles_sources = files(
   'sulogin-consoles.c',
 )
@@ -64,9 +58,8 @@ last_sources = files(
 
 login_sources = files(
   'login.c',
-  'logindefs.c',
-  'logindefs.h',
-)
+) + \
+  logindefs_c
 
 sulogin_sources = files(
   'sulogin.c',
diff --git a/meson.build b/meson.build
index 0b65e8647c..0642ab5996 100644
--- a/meson.build
+++ b/meson.build
@@ -817,13 +817,6 @@ exe = executable(
   c_args : '-DTEST_PROGRAM')
 exes += exe
 
-exe = executable(
-  'test_logindefs',
-  test_logindefs_sources,
-  include_directories : includes,
-  c_args : '-DTEST_PROGRAM')
-exes += exe
-
 exe = executable(
   'test-consoles',
   test_consoles_sources,
@@ -887,8 +880,7 @@ exe = executable(
   'login-utils/su.c',
   'login-utils/su-common.c',
   'login-utils/su-common.h',
-  'login-utils/logindefs.c',
-  'login-utils/logindefs.h',
+  'lib/logindefs.c',
   pty_session_c,
   monotonic_c,
   include_directories : includes,
@@ -923,8 +915,7 @@ opt = not get_option('build-lslogins').disabled()
 exe = executable(
   'lslogins',
   'login-utils/lslogins.c',
-  'login-utils/logindefs.c',
-  'login-utils/logindefs.h',
+  'lib/logindefs.c',
   include_directories : includes,
   link_with : [lib_common,
                lib_smartcols],
@@ -964,8 +955,7 @@ exe = executable(
   'login-utils/runuser.c',
   'login-utils/su-common.c',
   'login-utils/su-common.h',
-  'login-utils/logindefs.c',
-  'login-utils/logindefs.h',
+  'lib/logindefs.c',
   pty_session_c,
   monotonic_c,
   include_directories : includes,
@@ -2901,6 +2891,15 @@ exe = executable(
   link_with : lib_common)
 exes += exe
 
+exe = executable(
+  'test_logindefs',
+  'lib/logindefs.c',
+  c_args : ['-DTEST_PROGRAM'],
+  include_directories : dir_include,
+  link_with : lib_common)
+exes += exe
+
+
 ############################################################
 
 exe = executable(
diff --git a/term-utils/meson.build b/term-utils/meson.build
index f93ee94325..2bf23225d4 100644
--- a/term-utils/meson.build
+++ b/term-utils/meson.build
@@ -20,7 +20,8 @@ scriptreplay_sources = files(
 
 agetty_sources = files(
   'agetty.c',
-)
+) + \
+  logindefs_c
 
 setterm_sources = files(
   'setterm.c',