summaryrefslogtreecommitdiff
path: root/src/resolve
diff options
context:
space:
mode:
authorJan Janssen <medhefgo@web.de>2023-01-24 15:14:15 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-01-24 22:04:03 +0100
commit4a7ee0a5217ab963c12704dbff428c43d9df81f0 (patch)
tree3ed6aa0e2bfbcb394f35da8fd8a1fa58b64fcd1f /src/resolve
parentbe551917938391ba57fd570bd19be4d6c3c547bc (diff)
downloadsystemd-4a7ee0a5217ab963c12704dbff428c43d9df81f0.tar.gz
meson: Do not include headers in source lists
Meson+ninja+compiler do this for us and are better at it. https://mesonbuild.com/FAQ.html#do-i-need-to-add-my-headers-to-the-sources-list-like-in-autotools
Diffstat (limited to 'src/resolve')
-rw-r--r--src/resolve/meson.build47
1 files changed, 4 insertions, 43 deletions
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index cd02c88039..331c925814 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -4,79 +4,44 @@ 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',
)
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',
+ 'resolvconf-compat.c',
+ 'resolvectl.c',
)
############################################################
@@ -139,13 +104,11 @@ if conf.get('ENABLE_DNS_OVER_TLS') == 1
if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
systemd_resolved_sources += files(
'resolved-dnstls-gnutls.c',
- 'resolved-dnstls-gnutls.h',
)
systemd_resolved_dependencies += libgnutls
elif conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1
systemd_resolved_sources += files(
'resolved-dnstls-openssl.c',
- 'resolved-dnstls-openssl.h',
)
systemd_resolved_dependencies += libopenssl
else
@@ -188,8 +151,7 @@ tests += [
libm]],
[files('test-resolved-etc-hosts.c',
- 'resolved-etc-hosts.c',
- 'resolved-etc-hosts.h'),
+ 'resolved-etc-hosts.c'),
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
@@ -231,8 +193,7 @@ fuzzers += [
[lib_openssl_or_gcrypt,
libm]],
[files('fuzz-etc-hosts.c',
- 'resolved-etc-hosts.c',
- 'resolved-etc-hosts.h'),
+ 'resolved-etc-hosts.c'),
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,