mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-04 15:21:12 +00:00
build/meson: drop libnm_nm_default_dep dependency
This commit is contained in:
parent
478142ddeb
commit
4c98a45270
|
@ -12,7 +12,6 @@ libnmc_base = static_library(
|
|||
),
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -20,7 +19,6 @@ libnmc_base_dep = declare_dependency(
|
|||
include_directories: common_inc,
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
],
|
||||
link_with: libnmc_base,
|
||||
)
|
||||
|
@ -72,7 +70,6 @@ libnmc = static_library(
|
|||
),
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
],
|
||||
link_depends: settings_docs_source,
|
||||
)
|
||||
|
@ -81,7 +78,6 @@ libnmc_dep = declare_dependency(
|
|||
include_directories: common_inc,
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
],
|
||||
link_with: libnmc,
|
||||
)
|
||||
|
|
|
@ -29,7 +29,6 @@ exe = executable(
|
|||
'test-libnm-core-aux.c',
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
glib_dep,
|
||||
],
|
||||
link_with: [
|
||||
|
|
|
@ -5,7 +5,6 @@ executable(
|
|||
'nm-online' + '.c',
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_client_aux_extern_dep,
|
||||
glib_dep,
|
||||
],
|
||||
|
|
|
@ -24,9 +24,14 @@ libnmt_newt = static_library(
|
|||
'nmt-newt-utils.c',
|
||||
'nmt-newt-widget.c',
|
||||
),
|
||||
include_directories: [
|
||||
src_inc,
|
||||
top_inc,
|
||||
],
|
||||
dependencies: [
|
||||
libnm_nm_default_dep,
|
||||
libnm_dep,
|
||||
newt_dep,
|
||||
glib_dep,
|
||||
],
|
||||
)
|
||||
|
||||
|
|
|
@ -19,7 +19,6 @@ libnm_dispatcher_core = static_library(
|
|||
sources: 'nm-dispatcher-utils.c',
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_client_aux_extern_dep,
|
||||
],
|
||||
)
|
||||
|
@ -36,7 +35,6 @@ executable(
|
|||
'nm-dispatcher.c',
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
glib_dep,
|
||||
],
|
||||
link_with: [
|
||||
|
|
|
@ -7,7 +7,7 @@ exe = executable(
|
|||
nmdbus_dispatcher_sources,
|
||||
],
|
||||
dependencies: [
|
||||
libnm_nm_default_dep,
|
||||
libnm_dep,
|
||||
glib_dep,
|
||||
],
|
||||
include_directories: dispatcher_inc,
|
||||
|
|
|
@ -1,20 +1,22 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
examples = [
|
||||
['add-connection-gdbus', [libnm_client_public_enum_sources[1]], [uuid_dep]],
|
||||
['add-connection-libnm', [], [libnm_dep]],
|
||||
['get-active-connections-gdbus', [libnm_client_public_enum_sources[1]], []],
|
||||
['get-ap-info-libnm', [], [libnm_dep]],
|
||||
['list-connections-gdbus', [], []],
|
||||
['list-connections-libnm', [], [libnm_dep]],
|
||||
['monitor-nm-running-gdbus', [], []],
|
||||
['monitor-nm-state-gdbus', [], []],
|
||||
['add-connection-gdbus', [uuid_dep]],
|
||||
['add-connection-libnm', []],
|
||||
['get-active-connections-gdbus', []],
|
||||
['get-ap-info-libnm', []],
|
||||
['list-connections-gdbus', []],
|
||||
['list-connections-libnm', []],
|
||||
['monitor-nm-running-gdbus', []],
|
||||
['monitor-nm-state-gdbus', []],
|
||||
]
|
||||
|
||||
foreach example: examples
|
||||
executable(
|
||||
example[0],
|
||||
[example[0] + '.c'] + example[1],
|
||||
dependencies: [libnm_nm_default_dep] + example[2],
|
||||
[example[0] + '.c'],
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
] + example[1],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
@ -1,17 +1,5 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
libnm_nm_default_dep = declare_dependency(
|
||||
include_directories: [
|
||||
libnm_client_public_inc,
|
||||
libnm_core_public_inc,
|
||||
top_inc,
|
||||
src_inc,
|
||||
],
|
||||
dependencies: [
|
||||
libnm_core_public_dep,
|
||||
],
|
||||
)
|
||||
|
||||
libnm_client_impl_sources = files(
|
||||
'nm-access-point.c',
|
||||
'nm-active-connection.c',
|
||||
|
@ -72,8 +60,10 @@ libnm_client_impl = static_library(
|
|||
sources: libnm_client_impl_sources + libnm_client_public_enum_sources,
|
||||
dependencies: [
|
||||
libnmdbus_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_core_public_dep,
|
||||
libnm_client_public_dep,
|
||||
libudev_dep,
|
||||
glib_dep,
|
||||
],
|
||||
link_with: libnm_log_null,
|
||||
)
|
||||
|
@ -84,8 +74,10 @@ libnm = shared_library(
|
|||
'nm',
|
||||
version: libnm_version,
|
||||
dependencies: [
|
||||
libnm_nm_default_dep,
|
||||
libnm_core_public_dep,
|
||||
libnm_client_public_dep,
|
||||
libudev_dep,
|
||||
glib_dep,
|
||||
],
|
||||
link_whole: [
|
||||
libnm_client_impl,
|
||||
|
@ -109,6 +101,11 @@ libnm = shared_library(
|
|||
libnm_dep = declare_dependency(
|
||||
sources: libnm_client_public_enum_sources[1],
|
||||
include_directories: libnm_client_public_inc,
|
||||
dependencies: [
|
||||
libnm_core_public_dep,
|
||||
libnm_client_public_dep,
|
||||
glib_dep,
|
||||
],
|
||||
link_with: libnm,
|
||||
)
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ foreach test_unit: test_units
|
|||
],
|
||||
dependencies: [
|
||||
libnm_core_public_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_client_public_dep,
|
||||
glib_dep,
|
||||
libudev_dep,
|
||||
],
|
||||
|
|
Loading…
Reference in a new issue