meson: update for logindefs move

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

diff --git a/lib/meson.build b/lib/meson.build
index 0847d59c6268555ae1b870b255cf965be9a1e79b..21165b3c1a1ec26d3050d34c3305db3c43c661ab 100644 (file)
--- 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 61093b7190ef092f8861026b9b44b49faa064da5..d56321713480b1876be9e9b233f2f357fabe2eaf 100644 (file)
--- 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 0b65e8647c7295891f562e3ddd4ef5738e9b4c1c..0642ab5996c0c5ad712cfcbe8fbca06983644e4b 100644 (file)
--- 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 f93ee943254a8d456ce41ee088064b300f3e2a72..2bf23225d4d805d299480b28b401c73b41cd59e7 100644 (file)
--- 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',