From 85dff28743c100d0a03c2c66258cc518d6a04432 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 9 Feb 2023 11:18:32 +1000 Subject: [PATCH] meson.build: switch the source file lists to use files() --- meson.build | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index b17de5d..404b592 100644 --- a/meson.build +++ b/meson.build @@ -55,7 +55,7 @@ config_h.set('REIS_PROTOCOL_VERSION', protocol_version) subdir('proto') -src_libutil = [ +src_libutil = files( 'src/util-bits.c', 'src/util-io.h', 'src/util-io.c', @@ -73,13 +73,13 @@ src_libutil = [ 'src/util-strings.c', 'src/util-strings.h', 'src/util-time.h', -] +) lib_util = static_library('util', src_libutil) dep_libutil = declare_dependency(link_with: lib_util) -src_libei = [ +src_libei = files( 'src/brei-shared.h', 'src/brei-shared.c', 'src/libei.h', @@ -94,8 +94,7 @@ src_libei = [ 'src/libei-proto.h', 'src/libei-proto.c', 'src/libei-region.c', - proto_headers, -] +) + [proto_headers] deps_libei = [ dep_libutil, @@ -125,7 +124,7 @@ pkgconfig.generate(lib_libei, ], ) -src_libeis = [ +src_libeis = files( 'src/brei-shared.h', 'src/brei-shared.c', 'src/libeis.h', @@ -141,8 +140,7 @@ src_libeis = [ 'src/libeis-fd.c', 'src/libeis-proto.h', 'src/libeis-proto.c', - proto_headers, -] +) + [proto_headers] lib_libeis = shared_library('eis', src_libeis, @@ -198,14 +196,14 @@ config_h.set10('HAVE_LIBXKBCOMMON', dep_libxkbcommon.found()) dep_libevdev = dependency('libevdev', required: false) config_h.set10('HAVE_LIBEVDEV', dep_libevdev.found()) -src_eis_demo_server = [ +src_eis_demo_server = files( 'tools/eis-demo-server.h', 'tools/eis-demo-server.c', -] +) if dep_libevdev.found() - src_eis_demo_server += [ + src_eis_demo_server += files( 'tools/eis-demo-server-uinput.c', - ] + ) endif @@ -230,7 +228,7 @@ executable('ei-debug-events', dep_systemd = dependency('libsystemd', required: get_option('liboeffis')) build_oeffis = dep_systemd.found() if build_oeffis - src_liboeffis = 'src/liboeffis.c' + src_liboeffis = files('src/liboeffis.c') deps_liboeffis = [dep_libutil, dep_systemd] lib_liboeffis = shared_library('oeffis',