system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 18:55:10 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

meson: move declarations of resolved and friends

Browse source
This commit is contained in:
Yu Watanabe 2023-06-25 15:36:27 +09:00
parent ec57a4ea49
commit c19cd86542
2 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
meson.build
View file

@ -2558,44 +2558,6 @@ if want_tests != 'false'
depends : exe)
endif
if conf.get('ENABLE_RESOLVE') == 1
dbus_programs += executable(
'systemd-resolved',
systemd_resolved_sources,
include_directories : resolve_includes,
link_with : [libshared,
libbasic_gcrypt,
libsystemd_resolve_core],
dependencies : [systemd_resolved_dependencies,
userspace],
install_rpath : pkglibdir,
install : true,
install_dir : libexecdir)
public_programs += executable(
'resolvectl',
resolvectl_sources,
include_directories : includes,
link_with : [libshared,
libbasic_gcrypt,
libsystemd_resolve_core],
dependencies : [lib_openssl_or_gcrypt,
libidn,
libm,
threads,
userspace],
install_rpath : pkglibdir,
install : true)
meson.add_install_script(meson_make_symlink,
bindir / 'resolvectl',
sbindir / 'resolvconf')
meson.add_install_script(meson_make_symlink,
bindir / 'resolvectl',
bindir / 'systemd-resolve')
endif
if conf.get('ENABLE_LOGIND') == 1
dbus_programs += executable(
'systemd-logind',

42
src/resolve/meson.build
View file

@ -117,6 +117,38 @@ if conf.get('ENABLE_DNS_OVER_TLS') == 1
endif
endif
link_with = [
libbasic_gcrypt,
libshared,
libsystemd_resolve_core,
]
executables += [
libexec_template + {
'name' : 'systemd-resolved',
'dbus' : true,
'conditions' : ['ENABLE_RESOLVE'],
'sources' : systemd_resolved_sources +
files('resolved.c'),
'include_directories' : resolve_includes,
'link_with' : link_with,
'dependencies' : systemd_resolved_dependencies,
},
executable_template + {
'name' : 'resolvectl',
'public' : true,
'conditions' : ['ENABLE_RESOLVE'],
'sources' : resolvectl_sources,
'link_with' : link_with,
'dependencies' : [
lib_openssl_or_gcrypt,
libidn,
libm,
threads,
],
},
]
if conf.get('ENABLE_RESOLVE') == 1
install_data('org.freedesktop.resolve1.conf',
install_dir : dbuspolicydir)
@ -126,6 +158,14 @@ if conf.get('ENABLE_RESOLVE') == 1
install_dir : polkitpolicydir)
install_data('resolv.conf',
install_dir : libexecdir)
meson.add_install_script(meson_make_symlink,
bindir / 'resolvectl',
sbindir / 'resolvconf')
meson.add_install_script(meson_make_symlink,
bindir / 'resolvectl',
bindir / 'systemd-resolve')
endif
custom_target(
@ -210,5 +250,3 @@ fuzzers += [
'base' : fuzzer_resolve_base,
},
]
systemd_resolved_sources += files('resolved.c')