fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 06:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/meson: rename "daemon_nm_default_dep" to "core_default_dep"

Browse source 
Naming for us is hard, because everything is an "nm". However, let's
standardize on the term "core" for the daemon, and not "daemon".

Eventually I would like to move the daemon from "src/" to "src/core/",
rename the dep in anticipation of that.
This commit is contained in:
Thomas Haller 2021-01-28 08:46:29 +01:00
parent 947a8b7bad
commit 90622e782b
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
11 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/adsl/meson.build
View file

@ -8,7 +8,7 @@ sources = files(
libnm_device_plugin_adsl = shared_module(
'nm-device-plugin-adsl',
sources: sources,
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,

2
src/devices/bluetooth/meson.build
View file

@ -7,7 +7,7 @@ sources = files(
)
deps = [
daemon_nm_default_dep,
core_default_dep,
libnm_wwan_dep,
]

2
src/devices/ovs/meson.build
View file

@ -9,7 +9,7 @@ sources = files(
)
deps = [
daemon_nm_default_dep,
core_default_dep,
jansson_dep,
]

2
src/devices/team/meson.build
View file

@ -6,7 +6,7 @@ sources = files(
)
deps = [
daemon_nm_default_dep,
core_default_dep,
jansson_dep,
libteamdctl_dep,
]

4
src/devices/wifi/meson.build
View file

@ -19,7 +19,7 @@ libnm_wifi_base = static_library(
'nm-wifi-p2p-peer.c',
'nm-wifi-utils.c',
) + iwd_sources,
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
)
@ -32,7 +32,7 @@ libnm_device_plugin_wifi = shared_module(
sources: files(
'nm-wifi-factory.c',
),
dependencies: [ daemon_nm_default_dep, libnm_wifi_base_dep ],
dependencies: [ core_default_dep, libnm_wifi_base_dep ],
c_args: daemon_c_flags,
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,

2
src/devices/wwan/meson.build
View file

@ -9,7 +9,7 @@ sources = nm_service_providers_source + files(
)
deps = [
daemon_nm_default_dep,
core_default_dep,
libsystemd_dep,
mm_glib_dep,
]

4
src/initrd/meson.build
View file

@ -7,14 +7,14 @@ libnmi_core = static_library(
'nmi-dt-reader.c',
'nmi-ibft-reader.c',
),
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
)
executable(
'nm-initrd-generator',
'nm-initrd-generator.c',
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
link_with: [
libNetworkManagerBase,

12
src/meson.build
View file

@ -2,7 +2,7 @@
src_inc = include_directories('.')
daemon_nm_default_dep = declare_dependency(
core_default_dep = declare_dependency(
sources: libnm_core_enum_sources[1],
include_directories: src_inc,
dependencies: [
@ -60,7 +60,7 @@ libNetworkManagerBase = static_library(
'nm-ip6-config.c',
) + platform_wifi_wext_source,
dependencies: [
daemon_nm_default_dep,
core_default_dep,
libn_dhcp4_dep,
libnm_keyfile_dep,
libnm_core_dep,
@ -73,7 +73,7 @@ libNetworkManagerBase = static_library(
)
nm_deps = [
daemon_nm_default_dep,
core_default_dep,
dl_dep,
libn_acd_dep,
libndp_dep,
@ -192,7 +192,7 @@ executable(
'nm-iface-helper',
'nm-iface-helper.c',
dependencies: [
daemon_nm_default_dep,
core_default_dep,
dl_dep,
libndp_dep,
libudev_dep,
@ -223,13 +223,13 @@ if enable_tests
'platform/tests/test-common.c',
'platform/nm-fake-platform.c',
),
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: test_c_flags,
link_with: libNetworkManager,
)
libNetworkManagerTest_dep = declare_dependency(
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
link_with: libNetworkManagerTest,
)

2
src/ppp/meson.build
View file

@ -24,7 +24,7 @@ linker_script = join_paths(meson.current_source_dir(), 'nm-ppp-plugin.ver')
core_plugins += shared_module(
name,
sources: 'nm-ppp-manager.c',
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
link_args: '-Wl,--version-script,@0@'.format(linker_script),
link_depends: linker_script,

4
src/settings/plugins/ifcfg-rh/meson.build
View file

@ -31,7 +31,7 @@ core_sources = files(
libnms_ifcfg_rh_core = static_library(
'nms-ifcfg-rh-core',
sources: core_sources,
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
)
@ -43,7 +43,7 @@ sources = [dbus_sources] + core_sources + files(
libnm_settings_plugin_ifcfg_rh = shared_module(
'nm-settings-plugin-ifcfg-rh',
sources: sources,
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
link_with: libnms_ifcfg_rh_core,
link_args: ldflags_linker_script_settings,

4
src/settings/plugins/ifupdown/meson.build
View file

@ -8,14 +8,14 @@ sources = files(
libnms_ifupdown_core = static_library(
'nms-ifupdown-core',
sources: sources,
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
)
libnm_settings_plugin_ifupdown = shared_module(
'nm-settings-plugin-ifupdown',
sources: 'nms-ifupdown-plugin.c',
dependencies: daemon_nm_default_dep,
dependencies: core_default_dep,
c_args: daemon_c_flags,
link_with: libnms_ifupdown_core,
link_args: ldflags_linker_script_settings,