mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-03 15:10:14 +01:00
build/meson: cleanup "shared/meson.build"
Drop some "helper" variables that are only used once. These variables spread out what is defined, and only make the meson file more complicated to follow.
This commit is contained in:
Thomas Haller
parent
05745cf079
commit
9d5d5d5bf0
2 changed files with 148 additions and 152 deletions
|
|
@ -56,7 +56,9 @@ nm_pkgstatedir = join_paths(nm_localstatedir, 'lib', nm_name)
|
|||
nm_vpndir = join_paths(nm_libdir, nm_name)
|
||||
nm_plugindir = join_paths(nm_libdir, nm_name, dist_version)
|
||||
|
||||
introspection_extra_cflags = ['-Wno-incompatible-pointer-types-discards-qualifiers']
|
||||
introspection_extra_cflags = [
|
||||
'-Wno-incompatible-pointer-types-discards-qualifiers',
|
||||
]
|
||||
|
||||
libnm_name = 'libnm'
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,15 @@
|
|||
|
||||
shared_inc = include_directories('.')
|
||||
|
||||
nm_default_dep = declare_dependency(include_directories: [top_inc, shared_inc])
|
||||
|
||||
glib_nm_default_dep = declare_dependency(dependencies: [glib_dep, nm_default_dep])
|
||||
glib_nm_default_dep = declare_dependency(
|
||||
include_directories: [
|
||||
top_inc,
|
||||
shared_inc,
|
||||
],
|
||||
dependencies: [
|
||||
glib_dep,
|
||||
],
|
||||
)
|
||||
|
||||
libc_siphash = static_library(
|
||||
'c-siphash',
|
||||
|
|
@ -19,44 +25,37 @@ libc_rbtree = static_library(
|
|||
c_args: '-std=c11',
|
||||
)
|
||||
|
||||
sources = files(
|
||||
'n-acd/src/n-acd.c',
|
||||
'n-acd/src/n-acd-probe.c',
|
||||
'n-acd/src/util/timer.c',
|
||||
)
|
||||
|
||||
if enable_ebpf
|
||||
sources += files('n-acd/src/n-acd-bpf.c')
|
||||
n_acd_bpf_source = 'n-acd/src/n-acd-bpf.c'
|
||||
else
|
||||
sources += files('n-acd/src/n-acd-bpf-fallback.c')
|
||||
n_acd_bpf_source = 'n-acd/src/n-acd-bpf-fallback.c'
|
||||
endif
|
||||
|
||||
incs = include_directories(
|
||||
'c-list/src',
|
||||
'c-rbtree/src',
|
||||
'c-siphash/src',
|
||||
'c-stdaux/src',
|
||||
)
|
||||
|
||||
c_flags = [
|
||||
'-D_GNU_SOURCE',
|
||||
'-DSO_ATTACH_BPF=50',
|
||||
'-std=c11',
|
||||
'-Wno-pointer-arith',
|
||||
'-Wno-vla',
|
||||
]
|
||||
|
||||
links = [
|
||||
libc_rbtree,
|
||||
libc_siphash,
|
||||
]
|
||||
|
||||
libn_acd = static_library(
|
||||
'n-acd',
|
||||
sources: sources,
|
||||
include_directories: incs,
|
||||
c_args: c_flags,
|
||||
link_with: links,
|
||||
sources: files(
|
||||
'n-acd/src/n-acd.c',
|
||||
'n-acd/src/n-acd-probe.c',
|
||||
'n-acd/src/util/timer.c',
|
||||
n_acd_bpf_source,
|
||||
),
|
||||
include_directories: include_directories(
|
||||
'c-list/src',
|
||||
'c-rbtree/src',
|
||||
'c-siphash/src',
|
||||
'c-stdaux/src',
|
||||
),
|
||||
c_args: [
|
||||
'-D_GNU_SOURCE',
|
||||
'-DSO_ATTACH_BPF=50',
|
||||
'-std=c11',
|
||||
'-Wno-pointer-arith',
|
||||
'-Wno-vla',
|
||||
],
|
||||
link_with: [
|
||||
libc_rbtree,
|
||||
libc_siphash,
|
||||
],
|
||||
)
|
||||
|
||||
libn_acd_dep = declare_dependency(
|
||||
|
|
@ -64,35 +63,29 @@ libn_acd_dep = declare_dependency(
|
|||
link_with: libn_acd,
|
||||
)
|
||||
|
||||
sources = files(
|
||||
'n-dhcp4/src/n-dhcp4-c-connection.c',
|
||||
'n-dhcp4/src/n-dhcp4-c-lease.c',
|
||||
'n-dhcp4/src/n-dhcp4-client.c',
|
||||
'n-dhcp4/src/n-dhcp4-c-probe.c',
|
||||
'n-dhcp4/src/n-dhcp4-incoming.c',
|
||||
'n-dhcp4/src/n-dhcp4-outgoing.c',
|
||||
'n-dhcp4/src/n-dhcp4-socket.c',
|
||||
'n-dhcp4/src/util/packet.c',
|
||||
'n-dhcp4/src/util/socket.c',
|
||||
)
|
||||
|
||||
incs = include_directories(
|
||||
'c-list/src',
|
||||
'c-siphash/src',
|
||||
'c-stdaux/src',
|
||||
)
|
||||
|
||||
c_flags = [
|
||||
'-D_GNU_SOURCE',
|
||||
'-Wno-declaration-after-statement',
|
||||
'-Wno-pointer-arith',
|
||||
]
|
||||
|
||||
libn_dhcp4 = static_library(
|
||||
'n-dhcp4',
|
||||
sources: sources,
|
||||
c_args: c_flags,
|
||||
include_directories: incs,
|
||||
sources: files(
|
||||
'n-dhcp4/src/n-dhcp4-c-connection.c',
|
||||
'n-dhcp4/src/n-dhcp4-c-lease.c',
|
||||
'n-dhcp4/src/n-dhcp4-client.c',
|
||||
'n-dhcp4/src/n-dhcp4-c-probe.c',
|
||||
'n-dhcp4/src/n-dhcp4-incoming.c',
|
||||
'n-dhcp4/src/n-dhcp4-outgoing.c',
|
||||
'n-dhcp4/src/n-dhcp4-socket.c',
|
||||
'n-dhcp4/src/util/packet.c',
|
||||
'n-dhcp4/src/util/socket.c',
|
||||
),
|
||||
c_args: [
|
||||
'-D_GNU_SOURCE',
|
||||
'-Wno-declaration-after-statement',
|
||||
'-Wno-pointer-arith',
|
||||
],
|
||||
include_directories: include_directories(
|
||||
'c-list/src',
|
||||
'c-siphash/src',
|
||||
'c-stdaux/src',
|
||||
),
|
||||
link_with: libc_siphash,
|
||||
)
|
||||
|
||||
|
|
@ -126,39 +119,33 @@ libnm_std_aux = static_library(
|
|||
],
|
||||
)
|
||||
|
||||
sources = files(
|
||||
'nm-glib-aux/nm-dbus-aux.c',
|
||||
'nm-glib-aux/nm-dedup-multi.c',
|
||||
'nm-glib-aux/nm-enum-utils.c',
|
||||
'nm-glib-aux/nm-errno.c',
|
||||
'nm-glib-aux/nm-hash-utils.c',
|
||||
'nm-glib-aux/nm-io-utils.c',
|
||||
'nm-glib-aux/nm-json-aux.c',
|
||||
'nm-glib-aux/nm-keyfile-aux.c',
|
||||
'nm-glib-aux/nm-logging-base.c',
|
||||
'nm-glib-aux/nm-random-utils.c',
|
||||
'nm-glib-aux/nm-ref-string.c',
|
||||
'nm-glib-aux/nm-secret-utils.c',
|
||||
'nm-glib-aux/nm-shared-utils.c',
|
||||
'nm-glib-aux/nm-time-utils.c',
|
||||
)
|
||||
|
||||
c_flags = [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
]
|
||||
|
||||
links = [
|
||||
libc_siphash,
|
||||
libnm_std_aux,
|
||||
]
|
||||
|
||||
libnm_utils_base = static_library(
|
||||
'nm-utils-base',
|
||||
sources: sources,
|
||||
sources: files(
|
||||
'nm-glib-aux/nm-dbus-aux.c',
|
||||
'nm-glib-aux/nm-dedup-multi.c',
|
||||
'nm-glib-aux/nm-enum-utils.c',
|
||||
'nm-glib-aux/nm-errno.c',
|
||||
'nm-glib-aux/nm-hash-utils.c',
|
||||
'nm-glib-aux/nm-io-utils.c',
|
||||
'nm-glib-aux/nm-json-aux.c',
|
||||
'nm-glib-aux/nm-keyfile-aux.c',
|
||||
'nm-glib-aux/nm-logging-base.c',
|
||||
'nm-glib-aux/nm-random-utils.c',
|
||||
'nm-glib-aux/nm-ref-string.c',
|
||||
'nm-glib-aux/nm-secret-utils.c',
|
||||
'nm-glib-aux/nm-shared-utils.c',
|
||||
'nm-glib-aux/nm-time-utils.c',
|
||||
),
|
||||
dependencies: glib_nm_default_dep,
|
||||
c_args: c_flags,
|
||||
link_with: links,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
],
|
||||
link_with: [
|
||||
libc_siphash,
|
||||
libnm_std_aux,
|
||||
],
|
||||
)
|
||||
|
||||
libnm_utils_base_dep = declare_dependency(
|
||||
|
|
@ -174,7 +161,10 @@ libnm_udev_aux = static_library(
|
|||
glib_nm_default_dep,
|
||||
libudev_dep,
|
||||
],
|
||||
c_args: c_flags,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
],
|
||||
)
|
||||
|
||||
libnm_udev_aux_dep = declare_dependency(
|
||||
|
|
@ -188,7 +178,10 @@ libnm_base = static_library(
|
|||
'nm-base/nm-ethtool-base.c',
|
||||
),
|
||||
dependencies: libnm_utils_base_dep,
|
||||
c_args: c_flags,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
],
|
||||
)
|
||||
|
||||
libnm_base_dep = declare_dependency(
|
||||
|
|
@ -242,68 +235,66 @@ libnm_platform_dep = declare_dependency(
|
|||
link_with: libnm_platform,
|
||||
)
|
||||
|
||||
sources = files(
|
||||
'systemd/nm-sd-utils-shared.c',
|
||||
'systemd/src/basic/alloc-util.c',
|
||||
'systemd/src/basic/env-file.c',
|
||||
'systemd/src/basic/env-util.c',
|
||||
'systemd/src/basic/escape.c',
|
||||
'systemd/src/basic/ether-addr-util.c',
|
||||
'systemd/src/basic/extract-word.c',
|
||||
'systemd/src/basic/fd-util.c',
|
||||
'systemd/src/basic/fileio.c',
|
||||
'systemd/src/basic/format-util.c',
|
||||
'systemd/src/basic/fs-util.c',
|
||||
'systemd/src/basic/hash-funcs.c',
|
||||
'systemd/src/basic/hashmap.c',
|
||||
'systemd/src/basic/hexdecoct.c',
|
||||
'systemd/src/basic/hostname-util.c',
|
||||
'systemd/src/basic/in-addr-util.c',
|
||||
'systemd/src/basic/io-util.c',
|
||||
'systemd/src/basic/memory-util.c',
|
||||
'systemd/src/basic/mempool.c',
|
||||
'systemd/src/basic/parse-util.c',
|
||||
'systemd/src/basic/path-util.c',
|
||||
'systemd/src/basic/prioq.c',
|
||||
'systemd/src/basic/process-util.c',
|
||||
'systemd/src/basic/random-util.c',
|
||||
'systemd/src/basic/ratelimit.c',
|
||||
'systemd/src/basic/signal-util.c',
|
||||
'systemd/src/basic/socket-util.c',
|
||||
'systemd/src/basic/stat-util.c',
|
||||
'systemd/src/basic/string-table.c',
|
||||
'systemd/src/basic/string-util.c',
|
||||
'systemd/src/basic/strv.c',
|
||||
'systemd/src/basic/strxcpyx.c',
|
||||
'systemd/src/basic/time-util.c',
|
||||
'systemd/src/basic/tmpfile-util.c',
|
||||
'systemd/src/basic/utf8.c',
|
||||
'systemd/src/basic/util.c',
|
||||
'systemd/src/shared/dns-domain.c',
|
||||
'systemd/src/shared/web-util.c',
|
||||
)
|
||||
|
||||
incs = include_directories(
|
||||
'systemd/sd-adapt-shared',
|
||||
'systemd/src/basic',
|
||||
'systemd/src/shared',
|
||||
)
|
||||
|
||||
c_flags = [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
|
||||
]
|
||||
|
||||
libnm_systemd_shared = static_library(
|
||||
'nm-systemd-shared',
|
||||
sources: sources,
|
||||
include_directories: incs,
|
||||
sources: files(
|
||||
'systemd/nm-sd-utils-shared.c',
|
||||
'systemd/src/basic/alloc-util.c',
|
||||
'systemd/src/basic/env-file.c',
|
||||
'systemd/src/basic/env-util.c',
|
||||
'systemd/src/basic/escape.c',
|
||||
'systemd/src/basic/ether-addr-util.c',
|
||||
'systemd/src/basic/extract-word.c',
|
||||
'systemd/src/basic/fd-util.c',
|
||||
'systemd/src/basic/fileio.c',
|
||||
'systemd/src/basic/format-util.c',
|
||||
'systemd/src/basic/fs-util.c',
|
||||
'systemd/src/basic/hash-funcs.c',
|
||||
'systemd/src/basic/hashmap.c',
|
||||
'systemd/src/basic/hexdecoct.c',
|
||||
'systemd/src/basic/hostname-util.c',
|
||||
'systemd/src/basic/in-addr-util.c',
|
||||
'systemd/src/basic/io-util.c',
|
||||
'systemd/src/basic/memory-util.c',
|
||||
'systemd/src/basic/mempool.c',
|
||||
'systemd/src/basic/parse-util.c',
|
||||
'systemd/src/basic/path-util.c',
|
||||
'systemd/src/basic/prioq.c',
|
||||
'systemd/src/basic/process-util.c',
|
||||
'systemd/src/basic/random-util.c',
|
||||
'systemd/src/basic/ratelimit.c',
|
||||
'systemd/src/basic/signal-util.c',
|
||||
'systemd/src/basic/socket-util.c',
|
||||
'systemd/src/basic/stat-util.c',
|
||||
'systemd/src/basic/string-table.c',
|
||||
'systemd/src/basic/string-util.c',
|
||||
'systemd/src/basic/strv.c',
|
||||
'systemd/src/basic/strxcpyx.c',
|
||||
'systemd/src/basic/time-util.c',
|
||||
'systemd/src/basic/tmpfile-util.c',
|
||||
'systemd/src/basic/utf8.c',
|
||||
'systemd/src/basic/util.c',
|
||||
'systemd/src/shared/dns-domain.c',
|
||||
'systemd/src/shared/web-util.c',
|
||||
),
|
||||
include_directories: include_directories(
|
||||
'systemd/sd-adapt-shared',
|
||||
'systemd/src/basic',
|
||||
'systemd/src/shared',
|
||||
),
|
||||
dependencies: glib_nm_default_dep,
|
||||
c_args: c_flags,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
|
||||
],
|
||||
)
|
||||
|
||||
libnm_systemd_shared_dep = declare_dependency(
|
||||
include_directories: incs,
|
||||
include_directories: include_directories(
|
||||
'systemd/sd-adapt-shared',
|
||||
'systemd/src/basic',
|
||||
'systemd/src/shared',
|
||||
),
|
||||
dependencies: glib_dep,
|
||||
link_with: libnm_systemd_shared,
|
||||
)
|
||||
|
|
@ -312,7 +303,10 @@ libnm_systemd_logging_stub = static_library(
|
|||
'nm-systemd-logging-stub',
|
||||
sources: 'systemd/nm-logging-stub.c',
|
||||
dependencies: glib_nm_default_dep,
|
||||
c_args: c_flags,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
|
||||
],
|
||||
)
|
||||
|
||||
if enable_tests
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue