diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-17 19:25:00 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:29 -0400 |
commit | 37efbbd8211bd40e2d1f1732e27bd7d3ca504a12 (patch) | |
tree | 2f445eca4ba6baa5bb3f41b1af4f3680b6ddae17 /src/resolve | |
parent | 0a76b0e8a2043936b6dd598a7a3f924bd683eec8 (diff) |
meson: reindent all files with 8 spaces
The indentation for emacs'es meson-mode is added .dir-locals.
All files are reindented automatically, using the lasest meson-mode from git.
Indentation should now be fairly consistent.
Diffstat (limited to 'src/resolve')
-rw-r--r-- | src/resolve/meson.build | 294 |
1 files changed, 145 insertions, 149 deletions
diff --git a/src/resolve/meson.build b/src/resolve/meson.build index f0bbce49c4..b8feb7bb1b 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -1,64 +1,62 @@ -# -*- mode: meson -*- - 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 - dns-type.c + 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 + dns-type.c '''.split()) dns_type_h = files('dns-type.h')[0] systemd_resolved_only_sources = files(''' - resolved.c - resolved-manager.c - resolved-manager.h - resolved-conf.c - resolved-conf.h - resolved-resolv-conf.c - resolved-resolv-conf.h - resolved-bus.c - resolved-bus.h - resolved-link.h - resolved-link.c - resolved-link-bus.c - resolved-link-bus.h - resolved-llmnr.h - resolved-llmnr.c - resolved-mdns.h - resolved-mdns.c - resolved-def.h - resolved-dns-query.h - resolved-dns-query.c - resolved-dns-synthesize.h - resolved-dns-synthesize.c - resolved-dns-transaction.h - resolved-dns-transaction.c - resolved-dns-scope.h - resolved-dns-scope.c - resolved-dns-server.h - resolved-dns-server.c - resolved-dns-search-domain.h - resolved-dns-search-domain.c - resolved-dns-cache.h - resolved-dns-cache.c - resolved-dns-zone.h - resolved-dns-zone.c - resolved-dns-stream.h - resolved-dns-stream.c - resolved-dns-trust-anchor.h - resolved-dns-trust-anchor.c - resolved-dns-stub.h - resolved-dns-stub.c - resolved-etc-hosts.h - resolved-etc-hosts.c + resolved.c + resolved-manager.c + resolved-manager.h + resolved-conf.c + resolved-conf.h + resolved-resolv-conf.c + resolved-resolv-conf.h + resolved-bus.c + resolved-bus.h + resolved-link.h + resolved-link.c + resolved-link-bus.c + resolved-link-bus.h + resolved-llmnr.h + resolved-llmnr.c + resolved-mdns.h + resolved-mdns.c + resolved-def.h + resolved-dns-query.h + resolved-dns-query.c + resolved-dns-synthesize.h + resolved-dns-synthesize.c + resolved-dns-transaction.h + resolved-dns-transaction.c + resolved-dns-scope.h + resolved-dns-scope.c + resolved-dns-server.h + resolved-dns-server.c + resolved-dns-search-domain.h + resolved-dns-search-domain.c + resolved-dns-cache.h + resolved-dns-cache.c + resolved-dns-zone.h + resolved-dns-zone.c + resolved-dns-stream.h + resolved-dns-stream.c + resolved-dns-trust-anchor.h + resolved-dns-trust-anchor.c + resolved-dns-stub.h + resolved-dns-stub.c + resolved-etc-hosts.h + resolved-etc-hosts.c '''.split()) systemd_resolve_only_sources = files('resolve-tool.c') @@ -66,114 +64,112 @@ systemd_resolve_only_sources = files('resolve-tool.c') ############################################################ dns_type_list_txt = custom_target( - 'dns_type-list.txt', - input : ['generate-dns_type-list.sed', dns_type_h], - output : 'dns_type-list.txt', - command : [sed, '-n', '-r', '-f', '@INPUT0@', '@INPUT1@'], - capture : true) + 'dns_type-list.txt', + input : ['generate-dns_type-list.sed', dns_type_h], + output : 'dns_type-list.txt', + command : [sed, '-n', '-r', '-f', '@INPUT0@', '@INPUT1@'], + capture : true) generate_dns_type_gperf = find_program('generate-dns_type-gperf.py') dns_type_headers = [dns_type_h] foreach item : [['dns_type', dns_type_list_txt, 'dns_type', 'DNS_TYPE_']] - fname = '@0@-from-name.gperf'.format(item[0]) - gperf_file = custom_target( - fname, - input : item[1], - output : fname, - command : [generate_dns_type_gperf, item[2], item[3], '@INPUT@'], - capture : true) - - fname = '@0@-from-name.h'.format(item[0]) - target1 = custom_target( - fname, - input : gperf_file, - output : fname, - command : [gperf, - '-L', 'ANSI-C', '-t', '--ignore-case', - '-N', 'lookup_@0@'.format(item[2]), - '-H', 'hash_@0@_name'.format(item[2]), - '-p', '-C', - '@INPUT@'], - capture : true) - - fname = '@0@-to-name.h'.format(item[0]) - awkscript = '@0@-to-name.awk'.format(item[0]) - target2 = custom_target( - fname, - input : [awkscript, item[1]], - output : fname, - command : [awk, '-f', '@INPUT0@', '@INPUT1@'], - capture : true) - - dns_type_headers += [target1, target2] + fname = '@0@-from-name.gperf'.format(item[0]) + gperf_file = custom_target( + fname, + input : item[1], + output : fname, + command : [generate_dns_type_gperf, item[2], item[3], '@INPUT@'], + capture : true) + + fname = '@0@-from-name.h'.format(item[0]) + target1 = custom_target( + fname, + input : gperf_file, + output : fname, + command : [gperf, + '-L', 'ANSI-C', '-t', '--ignore-case', + '-N', 'lookup_@0@'.format(item[2]), + '-H', 'hash_@0@_name'.format(item[2]), + '-p', '-C', + '@INPUT@'], + capture : true) + + fname = '@0@-to-name.h'.format(item[0]) + awkscript = '@0@-to-name.awk'.format(item[0]) + target2 = custom_target( + fname, + input : [awkscript, item[1]], + output : fname, + command : [awk, '-f', '@INPUT0@', '@INPUT1@'], + capture : true) + + dns_type_headers += [target1, target2] endforeach resolved_gperf_c = custom_target( - 'resolved_gperf.c', - input : 'resolved-gperf.gperf', - output : 'resolved-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) - -systemd_resolved_sources = ( - basic_dns_sources + - [resolved_gperf_c] + - systemd_resolved_only_sources + - dns_type_headers) - -systemd_resolve_sources = ( - basic_dns_sources + - systemd_resolve_only_sources + - dns_type_headers) + 'resolved_gperf.c', + input : 'resolved-gperf.gperf', + output : 'resolved-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + +systemd_resolved_sources = (basic_dns_sources + + [resolved_gperf_c] + + systemd_resolved_only_sources + + dns_type_headers) + +systemd_resolve_sources = (basic_dns_sources + + systemd_resolve_only_sources + + dns_type_headers) if conf.get('ENABLE_RESOLVED', 0) == 1 - install_data('org.freedesktop.resolve1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.resolve1.service', - install_dir : dbussystemservicedir) - - resolved_conf = configure_file( - input : 'resolved.conf.in', - output : 'resolved.conf', - configuration : substs) - install_data(resolved_conf, - install_dir : pkgsysconfdir) + install_data('org.freedesktop.resolve1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.resolve1.service', + install_dir : dbussystemservicedir) + + resolved_conf = configure_file( + input : 'resolved.conf.in', + output : 'resolved.conf', + configuration : substs) + install_data(resolved_conf, + install_dir : pkgsysconfdir) endif install_data('resolv.conf', install_dir : rootlibexecdir) tests += [ - [['src/resolve/test-resolve-tables.c', - basic_dns_sources, - dns_type_headers, - 'src/shared/test-tables.h'], - [], - [libgcrypt, - libm], - 'ENABLE_RESOLVED'], - - [['src/resolve/test-dns-packet.c', - basic_dns_sources, - dns_type_headers], - [], - [libgcrypt, - libm], - 'ENABLE_RESOLVED'], - - [['src/resolve/test-dnssec.c', - basic_dns_sources, - dns_type_headers], - [], - [libgcrypt, - libm], - 'ENABLE_RESOLVED'], - - [['src/resolve/test-dnssec-complex.c', - 'src/resolve/dns-type.c', - dns_type_headers], - [], - [], - 'ENABLE_RESOLVED', 'manual'], - ] + [['src/resolve/test-resolve-tables.c', + basic_dns_sources, + dns_type_headers, + 'src/shared/test-tables.h'], + [], + [libgcrypt, + libm], + 'ENABLE_RESOLVED'], + + [['src/resolve/test-dns-packet.c', + basic_dns_sources, + dns_type_headers], + [], + [libgcrypt, + libm], + 'ENABLE_RESOLVED'], + + [['src/resolve/test-dnssec.c', + basic_dns_sources, + dns_type_headers], + [], + [libgcrypt, + libm], + 'ENABLE_RESOLVED'], + + [['src/resolve/test-dnssec-complex.c', + 'src/resolve/dns-type.c', + dns_type_headers], + [], + [], + 'ENABLE_RESOLVED', 'manual'], +] |