From f1b98127ff6320648cc3dc876f3b6a5aa3af204b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 2 Mar 2022 14:49:32 +0100 Subject: meson: do not use split() in file lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The approach to use '''…'''.split() instead of a list of strings was initially used when converting from automake because it allowed identical blocks of lines to be used for both, making the conversion easier. But over the years we have been using normal lists more and more, especially when there were just a few filenames listed. This converts the rest. No functional change. --- src/resolve/meson.build | 149 ++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 76 deletions(-) (limited to 'src/resolve/meson.build') diff --git a/src/resolve/meson.build b/src/resolve/meson.build index 24f94f8c0e..6478b8d589 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -2,82 +2,79 @@ resolve_includes = [includes, include_directories('.')] -basic_dns_sources = files(''' - resolved-dns-dnssec.c - resolved-dns-dnssec.h - resolved-dns-packet.c - resolved-dns-packet.h - resolved-dns-rr.c - resolved-dns-rr.h - resolved-dns-answer.c - resolved-dns-answer.h - resolved-dns-question.c - resolved-dns-question.h - resolved-util.c - resolved-util.h - dns-type.c - dns-type.h -'''.split()) - -systemd_resolved_sources = files(''' - resolved-bus.c - resolved-bus.h - resolved-conf.c - resolved-conf.h - resolved-def.h - resolved-dns-cache.c - resolved-dns-cache.h - resolved-dns-query.c - resolved-dns-query.h - resolved-dns-scope.c - resolved-dns-scope.h - resolved-dns-search-domain.c - resolved-dns-search-domain.h - resolved-dns-server.c - resolved-dns-server.h - resolved-dns-stream.c - resolved-dns-stream.h - resolved-dns-stub.c - resolved-dns-stub.h - resolved-dns-synthesize.c - resolved-dns-synthesize.h - resolved-dns-transaction.c - resolved-dns-transaction.h - resolved-dns-trust-anchor.c - resolved-dns-trust-anchor.h - resolved-dns-zone.c - resolved-dns-zone.h - resolved-dnssd-bus.c - resolved-dnssd-bus.h - resolved-dnssd.c - resolved-dnssd.h - resolved-dnstls.h - resolved-etc-hosts.c - resolved-etc-hosts.h - resolved-link-bus.c - resolved-link-bus.h - resolved-link.c - resolved-link.h - resolved-llmnr.c - resolved-llmnr.h - resolved-manager.c - resolved-manager.h - resolved-mdns.c - resolved-mdns.h - resolved-resolv-conf.c - resolved-resolv-conf.h - resolved-socket-graveyard.c - resolved-socket-graveyard.h - resolved-varlink.c - resolved-varlink.h -'''.split()) - -resolvectl_sources = files(''' - resolvconf-compat.c - resolvconf-compat.h - resolvectl.c - resolvectl.h -'''.split()) +basic_dns_sources = files( + 'resolved-dns-dnssec.c', + 'resolved-dns-dnssec.h', + 'resolved-dns-packet.c', + 'resolved-dns-packet.h', + 'resolved-dns-rr.c', + 'resolved-dns-rr.h', + 'resolved-dns-answer.c', + 'resolved-dns-answer.h', + 'resolved-dns-question.c', + 'resolved-dns-question.h', + 'resolved-util.c', + 'resolved-util.h', + 'dns-type.c', + 'dns-type.h') + +systemd_resolved_sources = files( + 'resolved-bus.c', + 'resolved-bus.h', + 'resolved-conf.c', + 'resolved-conf.h', + 'resolved-def.h', + 'resolved-dns-cache.c', + 'resolved-dns-cache.h', + 'resolved-dns-query.c', + 'resolved-dns-query.h', + 'resolved-dns-scope.c', + 'resolved-dns-scope.h', + 'resolved-dns-search-domain.c', + 'resolved-dns-search-domain.h', + 'resolved-dns-server.c', + 'resolved-dns-server.h', + 'resolved-dns-stream.c', + 'resolved-dns-stream.h', + 'resolved-dns-stub.c', + 'resolved-dns-stub.h', + 'resolved-dns-synthesize.c', + 'resolved-dns-synthesize.h', + 'resolved-dns-transaction.c', + 'resolved-dns-transaction.h', + 'resolved-dns-trust-anchor.c', + 'resolved-dns-trust-anchor.h', + 'resolved-dns-zone.c', + 'resolved-dns-zone.h', + 'resolved-dnssd-bus.c', + 'resolved-dnssd-bus.h', + 'resolved-dnssd.c', + 'resolved-dnssd.h', + 'resolved-dnstls.h', + 'resolved-etc-hosts.c', + 'resolved-etc-hosts.h', + 'resolved-link-bus.c', + 'resolved-link-bus.h', + 'resolved-link.c', + 'resolved-link.h', + 'resolved-llmnr.c', + 'resolved-llmnr.h', + 'resolved-manager.c', + 'resolved-manager.h', + 'resolved-mdns.c', + 'resolved-mdns.h', + 'resolved-resolv-conf.c', + 'resolved-resolv-conf.h', + 'resolved-socket-graveyard.c', + 'resolved-socket-graveyard.h', + 'resolved-varlink.c', + 'resolved-varlink.h') + +resolvectl_sources = files( + 'resolvconf-compat.c', + 'resolvconf-compat.h', + 'resolvectl.c', + 'resolvectl.h') ############################################################ -- cgit v1.2.1