summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-01-28 08:46:29 +0100
committerThomas Haller <thaller@redhat.com>2021-01-28 08:46:29 +0100
commit90622e782b82f395aaccd9229f74fe357f6433e5 (patch)
treebe0ab877b09d44847e5445d69ec237d7e4801b63
parent947a8b7bad70b34427d6c75f334546ef83cd5ed6 (diff)
downloadNetworkManager-90622e782b82f395aaccd9229f74fe357f6433e5.tar.gz
build/meson: rename "daemon_nm_default_dep" to "core_default_dep"
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.
-rw-r--r--src/devices/adsl/meson.build2
-rw-r--r--src/devices/bluetooth/meson.build2
-rw-r--r--src/devices/ovs/meson.build2
-rw-r--r--src/devices/team/meson.build2
-rw-r--r--src/devices/wifi/meson.build4
-rw-r--r--src/devices/wwan/meson.build2
-rw-r--r--src/initrd/meson.build4
-rw-r--r--src/meson.build12
-rw-r--r--src/ppp/meson.build2
-rw-r--r--src/settings/plugins/ifcfg-rh/meson.build4
-rw-r--r--src/settings/plugins/ifupdown/meson.build4
11 files changed, 20 insertions, 20 deletions
diff --git a/src/devices/adsl/meson.build b/src/devices/adsl/meson.build
index b5983597e5..aa9f000b38 100644
--- a/src/devices/adsl/meson.build
+++ b/src/devices/adsl/meson.build
@@ -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,
diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build
index f4c890218e..c6d12f3f8d 100644
--- a/src/devices/bluetooth/meson.build
+++ b/src/devices/bluetooth/meson.build
@@ -7,7 +7,7 @@ sources = files(
)
deps = [
- daemon_nm_default_dep,
+ core_default_dep,
libnm_wwan_dep,
]
diff --git a/src/devices/ovs/meson.build b/src/devices/ovs/meson.build
index 65bce66516..e61eeb8d2e 100644
--- a/src/devices/ovs/meson.build
+++ b/src/devices/ovs/meson.build
@@ -9,7 +9,7 @@ sources = files(
)
deps = [
- daemon_nm_default_dep,
+ core_default_dep,
jansson_dep,
]
diff --git a/src/devices/team/meson.build b/src/devices/team/meson.build
index b14b984bb6..37814deba4 100644
--- a/src/devices/team/meson.build
+++ b/src/devices/team/meson.build
@@ -6,7 +6,7 @@ sources = files(
)
deps = [
- daemon_nm_default_dep,
+ core_default_dep,
jansson_dep,
libteamdctl_dep,
]
diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build
index 1c9add3331..878981fc72 100644
--- a/src/devices/wifi/meson.build
+++ b/src/devices/wifi/meson.build
@@ -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,
diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build
index 577dceadf8..971b7121fa 100644
--- a/src/devices/wwan/meson.build
+++ b/src/devices/wwan/meson.build
@@ -9,7 +9,7 @@ sources = nm_service_providers_source + files(
)
deps = [
- daemon_nm_default_dep,
+ core_default_dep,
libsystemd_dep,
mm_glib_dep,
]
diff --git a/src/initrd/meson.build b/src/initrd/meson.build
index 7629773a73..bd590e8ca5 100644
--- a/src/initrd/meson.build
+++ b/src/initrd/meson.build
@@ -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,
diff --git a/src/meson.build b/src/meson.build
index dadfec1958..2a7dc31162 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -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,
)
diff --git a/src/ppp/meson.build b/src/ppp/meson.build
index 12f81042ed..70f0b231e0 100644
--- a/src/ppp/meson.build
+++ b/src/ppp/meson.build
@@ -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,
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build
index 64bf7d5564..370eec4c57 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/src/settings/plugins/ifcfg-rh/meson.build
@@ -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,
diff --git a/src/settings/plugins/ifupdown/meson.build b/src/settings/plugins/ifupdown/meson.build
index e3a8055d60..c582d14c16 100644
--- a/src/settings/plugins/ifupdown/meson.build
+++ b/src/settings/plugins/ifupdown/meson.build
@@ -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,