From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 4 Jan 2021 11:17:22 +0000 (+0900)
Subject: meson: drop redundant directory specification in additional source files
X-Git-Tag: v248-rc1~304^2~19
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=cbaaf7b9dd81ae610edb0fdbf96b7f7427b5367a;p=systemd%2F.git

meson: drop redundant directory specification in additional source files
---

diff --git a/meson.build b/meson.build
index 5b9beebaf9..50714d0234 100644
--- a/meson.build
+++ b/meson.build
@@ -1755,7 +1755,7 @@ test_dlopen = executable(
         build_by_default : want_tests != 'false')
 
 foreach tuple : [['myhostname', 'ENABLE_NSS_MYHOSTNAME'],
-                 ['systemd',    'ENABLE_NSS_SYSTEMD', 'src/nss-systemd/userdb-glue.c src/nss-systemd/userdb-glue.h src/nss-systemd/nss-systemd.h'],
+                 ['systemd',    'ENABLE_NSS_SYSTEMD', ['nss-systemd.h', 'userdb-glue.c', 'userdb-glue.h']],
                  ['mymachines', 'ENABLE_NSS_MYMACHINES'],
                  ['resolve',    'ENABLE_NSS_RESOLVE']]
 
@@ -1768,7 +1768,9 @@ foreach tuple : [['myhostname', 'ENABLE_NSS_MYHOSTNAME'],
 
                 sources = ['src/nss-@0@/nss-@0@.c'.format(module)]
                 if tuple.length() > 2
-                        sources += tuple[2].split()
+                        foreach s : tuple[2]
+                                sources += ['src/nss-@0@/@1@'.format(module, s)]
+                        endforeach
                 endif
 
                 nss = shared_library(