From 26978ac7c3fa9ca39dd01688c18fbe52e7c0a2d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 9 Mar 2023 10:35:05 +0100
Subject: [PATCH] meson: stop using nested lists for sources

meson itself flattens the list when it is used in "sources:" field, but it
makes our own processing more complicated. I find it also a bit confusing.
---
 src/test/meson.build | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/test/meson.build b/src/test/meson.build
index fe1a0fec21..b57ba23539 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -200,16 +200,12 @@ tests += [
                 'condition' : 'HAVE_ACL',
         },
         {
-                'sources' : [
-                        files('test-af-list.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-af-list.c') +
+                            generated_gperf_headers,
         },
         {
-                'sources' : [
-                        files('test-arphrd-util.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-arphrd-util.c') +
+                            generated_gperf_headers,
         },
         {
                 'sources' : files('test-ask-password-api.c'),
@@ -228,10 +224,8 @@ tests += [
                 'type' : 'manual',
         },
         {
-                'sources' : [
-                        files('test-cap-list.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-cap-list.c') +
+                            generated_gperf_headers,
                 'dependencies' : libcap,
         },
         {
@@ -268,28 +262,25 @@ tests += [
                 'dependencies' : libp11kit_cflags
         },
         {
-                'sources' : [
-                        files('test-errno-list.c'),
-                        generated_gperf_headers,
-                ],
+                'sources' : files('test-errno-list.c') +
+                            generated_gperf_headers,
         },
         {
                 'sources' : files('test-fd-util.c'),
                 'dependencies' : libseccomp,
         },
         {
-                'sources' : [files(
-                        'test-hashmap.c',
-                        'test-hashmap-plain.c'),
-                        test_hashmap_ordered_c,
-                ],
+                'sources' : files(
+                                  'test-hashmap.c',
+                                  'test-hashmap-plain.c',
+                            ) + [
+                                   test_hashmap_ordered_c,
+                            ],
                 'timeout' : 180,
         },
         {
-                'sources' : [
-                        files('test-ip-protocol-list.c'),
-                        shared_generated_gperf_headers,
-                ],
+                'sources' : files('test-ip-protocol-list.c') +
+                            shared_generated_gperf_headers,
         },
         {
                 'sources' : files('test-ipcrm.c'),
-- 
2.25.1