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

meson: move declarations of networkd and friends

Browse source
This commit is contained in:
Yu Watanabe 2023-06-26 03:40:54 +09:00
parent eb51c09d13
commit 7be6a143da
2 changed files with 40 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
meson.build
View file

@ -2683,52 +2683,8 @@ if want_tests != 'false'
args : ['verify', '--resolve-names=never', all_rules])
endif
if conf.get('ENABLE_NETWORKD') == 1
dbus_programs += executable(
'systemd-networkd',
systemd_networkd_sources,
include_directories : network_includes,
link_with : [libnetworkd_core,
libsystemd_network,
networkd_link_with],
dependencies : [threads,
userspace],
install_rpath : pkglibdir,
install : true,
install_dir : libexecdir)
public_programs += executable(
'systemd-networkd-wait-online',
systemd_networkd_wait_online_sources,
include_directories : includes,
link_with : [networkd_link_with],
dependencies : [userspace],
install_rpath : pkglibdir,
install : true,
install_dir : libexecdir)
public_programs += executable(
'networkctl',
networkctl_sources,
include_directories : libsystemd_network_includes,
link_with : [libsystemd_network,
networkd_link_with],
dependencies : [userspace],
install_rpath : pkglibdir,
install : true)
endif
exe = executable(
'systemd-network-generator',
network_generator_sources,
include_directories : includes,
link_with : [networkd_link_with],
dependencies : [userspace],
install_rpath : pkglibdir,
install : true,
install_dir : libexecdir)
if want_tests != 'false'
exe = executables_by_name.get('systemd-network-generator')
test('test-network-generator-conversion',
test_network_generator_conversion_sh,
# https://github.com/mesonbuild/meson/issues/2681

39
src/network/meson.build
View file

@ -150,6 +150,45 @@ libnetworkd_core = static_library(
link_with : networkd_link_with,
build_by_default : false)
executables += [
libexec_template + {
'name' : 'systemd-networkd',
'dbus' : true,
'conditions' : ['ENABLE_NETWORKD'],
'sources' : systemd_networkd_sources,
'include_directories' : network_includes,
'link_with' : [
libnetworkd_core,
libsystemd_network,
networkd_link_with,
],
'dependencies' : threads,
},
libexec_template + {
'name' : 'systemd-networkd-wait-online',
'public' : true,
'conditions' : ['ENABLE_NETWORKD'],
'sources' : systemd_networkd_wait_online_sources,
'link_with' : networkd_link_with,
},
executable_template + {
'name' : 'networkctl',
'public' : true,
'conditions' : ['ENABLE_NETWORKD'],
'sources' : networkctl_sources,
'include_directories' : libsystemd_network_includes,
'link_with' : [
libsystemd_network,
networkd_link_with,
],
},
libexec_template + {
'name' : 'systemd-network-generator',
'sources' : network_generator_sources,
'link_with' : networkd_link_with,
},
]
if conf.get('ENABLE_NETWORKD') == 1
install_data('org.freedesktop.network1.conf',
install_dir : dbuspolicydir)