From 674a7c6915bde0189ccb3665193003817f894da3 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun, 5 Feb 2023 14:15:44 +1000
Subject: [PATCH] meson.build: alphabetical sort of the source files

And drop the header files, meson does not require those for dependency
tracking.
---
 meson.build      | 27 +++++----------------------
 test/meson.build |  5 ++---
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/meson.build b/meson.build
index d815d93..cbc625b 100644
--- a/meson.build
+++ b/meson.build
@@ -60,22 +60,12 @@ subdir('proto')
 
 src_libutil = files(
     'src/util-bits.c',
-    'src/util-io.h',
     'src/util-io.c',
-    'src/util-list.h',
     'src/util-list.c',
-    'src/util-logger.h',
     'src/util-logger.c',
-    'src/util-macros.h',
-    'src/util-memfile.h',
     'src/util-memfile.c',
-    'src/util-color.h',
-    'src/util-object.h',
-    'src/util-sources.h',
     'src/util-sources.c',
     'src/util-strings.c',
-    'src/util-strings.h',
-    'src/util-time.h',
 )
 
 lib_util = static_library('util', src_libutil)
@@ -83,19 +73,16 @@ lib_util = static_library('util', src_libutil)
 dep_libutil = declare_dependency(link_with: lib_util)
 
 src_libei = files(
-    'src/brei-shared.h',
     'src/brei-shared.c',
-    'src/libei.h',
     'src/libei.c',
     'src/libei-device.c',
     'src/libei-event.c',
-    'src/libei-log.c',
-    'src/libei-seat.c',
-    'src/libei-socket.c',
     'src/libei-fd.c',
-    'src/libei-proto.h',
+    'src/libei-log.c',
     'src/libei-proto.c',
     'src/libei-region.c',
+    'src/libei-seat.c',
+    'src/libei-socket.c',
 ) + [proto_headers]
 
 deps_libei = [
@@ -128,20 +115,17 @@ pkgconfig.generate(lib_libei,
 )
 
 src_libeis = files(
-    'src/brei-shared.h',
     'src/brei-shared.c',
-    'src/libeis.h',
     'src/libeis.c',
     'src/libeis-client.c',
     'src/libeis-device.c',
     'src/libeis-event.c',
+    'src/libeis-fd.c',
     'src/libeis-log.c',
+    'src/libeis-proto.c',
     'src/libeis-region.c',
     'src/libeis-seat.c',
     'src/libeis-socket.c',
-    'src/libeis-fd.c',
-    'src/libeis-proto.h',
-    'src/libeis-proto.c',
 ) + [proto_headers]
 
 lib_libeis = shared_library('eis',
@@ -174,7 +158,6 @@ dep_libevdev = dependency('libevdev', required: false)
 config_h.set10('HAVE_LIBEVDEV', dep_libevdev.found())
 
 src_eis_demo_server = files(
-    'tools/eis-demo-server.h',
     'tools/eis-demo-server.c',
 )
 if dep_libevdev.found()
diff --git a/test/meson.build b/test/meson.build
index 6d7fafb..3611f11 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -3,7 +3,6 @@ subproject('munit', default_options: 'werror=false')
 munit = dependency('munit', fallback: ['munit', 'munit_dep'])
 
 lib_unittest = static_library('unittest',
-    '../src/util-munit.h',
     '../src/util-munit.c',
     dependencies: munit,
     include_directories: [inc_builddir],
@@ -69,11 +68,11 @@ lib_eierpecken = static_library('eierpecken',
 
 test('eierpecken',
     executable('eierpecken',
-               'test-main.c',
-               'test-ei.c',
                'test-ei-device.c',
                'test-ei-seat.c',
+               'test-ei.c',
                'test-eis.c',
+               'test-main.c',
                link_with: lib_eierpecken,
                include_directories: [inc_builddir],
                dependencies: [dep_unittest, dep_libei, dep_libeis]))