build/meson: rename "nm_core_dep" to "libnm_core_dep"
The library is called "libnm_core". So the dependency should be called
"libnm_core_dep", like in all other cases.
(cherry picked from commit c27ad37c27
)
This commit is contained in:
@@ -22,7 +22,7 @@ deps = [
|
||||
libnm_dep,
|
||||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
readline_dep,
|
||||
]
|
||||
|
||||
|
@@ -4,7 +4,7 @@ deps = [
|
||||
libnm_dep,
|
||||
libnmc_dep,
|
||||
libnmc_base_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
exe = executable(
|
||||
|
@@ -2,7 +2,7 @@ name = 'nm-online'
|
||||
|
||||
deps = [
|
||||
libnm_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
clients_cflags = [
|
||||
|
@@ -2,7 +2,7 @@ name = 'nmtui'
|
||||
|
||||
deps = [
|
||||
newt_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
cflags = clients_cflags + [
|
||||
|
@@ -27,7 +27,7 @@ sources = files('nm-dispatcher-utils.c')
|
||||
|
||||
deps = [
|
||||
libnm_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
cflags = [
|
||||
|
@@ -9,7 +9,7 @@ exe = executable(
|
||||
test_unit,
|
||||
test_unit + '.c',
|
||||
include_directories: incs,
|
||||
dependencies: nm_core_dep,
|
||||
dependencies: libnm_core_dep,
|
||||
c_args: [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
|
||||
|
@@ -14,6 +14,6 @@ foreach example: examples
|
||||
example[0],
|
||||
[example[0] + '.c'] + example[1],
|
||||
include_directories: example[2],
|
||||
dependencies: [nm_core_dep] + example[3],
|
||||
dependencies: [libnm_core_dep] + example[3],
|
||||
)
|
||||
endforeach
|
||||
|
@@ -241,7 +241,7 @@ libnm_core = static_library(
|
||||
c_args: cflags,
|
||||
)
|
||||
|
||||
nm_core_dep = declare_dependency(
|
||||
libnm_core_dep = declare_dependency(
|
||||
sources: libnm_core_enum[1],
|
||||
include_directories: libnm_core_inc,
|
||||
dependencies: [
|
||||
@@ -280,7 +280,7 @@ shared_nm_libnm_core_aux_dep = declare_dependency(
|
||||
shared_inc,
|
||||
],
|
||||
dependencies: [
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
glib_dep,
|
||||
shared_nm_glib_aux_dep,
|
||||
libnm_systemd_shared_dep,
|
||||
|
@@ -34,7 +34,7 @@ foreach test_unit: test_units
|
||||
'libnm-core-' + test_unit,
|
||||
[test_unit + '.c'] + enum,
|
||||
dependencies: [
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
libnm_systemd_shared_no_logging_dep,
|
||||
],
|
||||
c_args: [
|
||||
|
@@ -10,7 +10,7 @@ libnm_utils_sources = files('nm-libnm-utils.c')
|
||||
deps = [
|
||||
libnmdbus_dep,
|
||||
shared_nm_glib_aux_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
if have_fake_typelibs
|
||||
@@ -159,7 +159,7 @@ libnm = shared_library(
|
||||
dl_dep,
|
||||
libudev_dep,
|
||||
shared_nm_glib_aux_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
uuid_dep,
|
||||
libnm_systemd_shared_no_logging_dep,
|
||||
],
|
||||
|
@@ -19,7 +19,7 @@ foreach test_unit: test_units
|
||||
],
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
libnm_systemd_shared_no_logging_dep,
|
||||
],
|
||||
c_args: cflags,
|
||||
@@ -39,6 +39,6 @@ libnm_vpn_plugin_utils_test = static_library(
|
||||
'nm-vpn-plugin-utils-test',
|
||||
sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
|
||||
include_directories: libnm_inc,
|
||||
dependencies: nm_core_dep,
|
||||
dependencies: libnm_core_dep,
|
||||
c_args: cflags,
|
||||
)
|
||||
|
@@ -8,7 +8,7 @@ cflags = [
|
||||
executable(
|
||||
name,
|
||||
name + '.c',
|
||||
dependencies: nm_core_dep,
|
||||
dependencies: libnm_core_dep,
|
||||
c_args: cflags,
|
||||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
|
@@ -10,7 +10,7 @@ libnmi_core = static_library(
|
||||
c_args: nm_cflags,
|
||||
sources: sources,
|
||||
include_directories: src_inc,
|
||||
dependencies: nm_core_dep,
|
||||
dependencies: libnm_core_dep,
|
||||
)
|
||||
|
||||
name = 'nm-initrd-generator'
|
||||
@@ -19,7 +19,7 @@ executable(
|
||||
name + '.c',
|
||||
c_args: nm_cflags,
|
||||
include_directories: src_inc,
|
||||
dependencies: [ nm_core_dep ],
|
||||
dependencies: [ libnm_core_dep ],
|
||||
link_with: [libnetwork_manager_base, libnmi_core],
|
||||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
|
@@ -13,7 +13,7 @@ nm_cflags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON'
|
||||
|
||||
nm_dep = declare_dependency(
|
||||
include_directories: src_inc,
|
||||
dependencies: nm_core_dep,
|
||||
dependencies: libnm_core_dep,
|
||||
compile_args: nm_cflags,
|
||||
)
|
||||
|
||||
@@ -49,7 +49,7 @@ sources = files(
|
||||
deps = [
|
||||
libsystemd_dep,
|
||||
libudev_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
if enable_wext
|
||||
@@ -149,7 +149,7 @@ nm_deps = [
|
||||
dl_dep,
|
||||
libndp_dep,
|
||||
libudev_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
shared_n_acd_dep,
|
||||
logind_dep,
|
||||
]
|
||||
@@ -186,7 +186,7 @@ deps = [
|
||||
dl_dep,
|
||||
libndp_dep,
|
||||
libudev_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
name = 'nm-iface-helper'
|
||||
@@ -216,7 +216,7 @@ if enable_tests
|
||||
|
||||
deps = [
|
||||
libudev_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
test_cflags = ['-DNETWORKMANAGER_COMPILATION_TEST']
|
||||
|
@@ -2,7 +2,7 @@ name = 'nm-pppd-plugin'
|
||||
|
||||
deps = [
|
||||
dl_dep,
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
]
|
||||
|
||||
nm_pppd_plugin = shared_module(
|
||||
|
@@ -38,7 +38,7 @@ libnm_systemd_core = static_library(
|
||||
)
|
||||
],
|
||||
dependencies: [
|
||||
nm_core_dep,
|
||||
libnm_core_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD',
|
||||
|
@@ -36,7 +36,7 @@ exe = executable(
|
||||
test_unit,
|
||||
[test_unit + '.c'],
|
||||
include_directories: src_inc,
|
||||
dependencies: nm_core_dep,
|
||||
dependencies: libnm_core_dep,
|
||||
c_args: cflags,
|
||||
link_with: [
|
||||
libnm_systemd_core,
|
||||
|
Reference in New Issue
Block a user