diff options
author | Thomas Haller <thaller@redhat.com> | 2021-02-24 14:46:53 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-02-28 10:42:06 +0100 |
commit | 4c98a4527085dcdaab7381764c243ab66534739b (patch) | |
tree | 52d05a08e39cb7b8fc9450f39c904064a0116105 | |
parent | 478142ddeba078a3363da154f826d9e66319c513 (diff) | |
download | NetworkManager-4c98a4527085dcdaab7381764c243ab66534739b.tar.gz |
build/meson: drop libnm_nm_default_dep dependency
-rw-r--r-- | clients/common/meson.build | 4 | ||||
-rw-r--r-- | clients/common/tests/meson.build | 1 | ||||
-rw-r--r-- | clients/meson.build | 1 | ||||
-rw-r--r-- | clients/tui/newt/meson.build | 7 | ||||
-rw-r--r-- | dispatcher/meson.build | 2 | ||||
-rw-r--r-- | dispatcher/tests/meson.build | 2 | ||||
-rw-r--r-- | examples/C/glib/meson.build | 22 | ||||
-rw-r--r-- | src/libnm-client-impl/meson.build | 25 | ||||
-rw-r--r-- | src/libnm-client-impl/tests/meson.build | 2 |
9 files changed, 31 insertions, 35 deletions
diff --git a/clients/common/meson.build b/clients/common/meson.build index 26a2fd6785..6f53d877a1 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -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, ) diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index 08dbe5df38..4a7a2ffb3d 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -29,7 +29,6 @@ exe = executable( 'test-libnm-core-aux.c', dependencies: [ libnm_dep, - libnm_nm_default_dep, glib_dep, ], link_with: [ diff --git a/clients/meson.build b/clients/meson.build index 7a677cc25e..015bda372f 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -5,7 +5,6 @@ executable( 'nm-online' + '.c', dependencies: [ libnm_dep, - libnm_nm_default_dep, libnm_client_aux_extern_dep, glib_dep, ], diff --git a/clients/tui/newt/meson.build b/clients/tui/newt/meson.build index 16c06eb0bd..acca1e9145 100644 --- a/clients/tui/newt/meson.build +++ b/clients/tui/newt/meson.build @@ -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, ], ) diff --git a/dispatcher/meson.build b/dispatcher/meson.build index f222313c26..f32a3153eb 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -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: [ diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index 45e7cc23e5..1a335c5e96 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -7,7 +7,7 @@ exe = executable( nmdbus_dispatcher_sources, ], dependencies: [ - libnm_nm_default_dep, + libnm_dep, glib_dep, ], include_directories: dispatcher_inc, diff --git a/examples/C/glib/meson.build b/examples/C/glib/meson.build index cf26fdf4bf..5bee13c1dc 100644 --- a/examples/C/glib/meson.build +++ b/examples/C/glib/meson.build @@ -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 diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index d3aee24178..e80ef79866 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -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, ) diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build index 3ee2983a6f..e1955d0b3c 100644 --- a/src/libnm-client-impl/tests/meson.build +++ b/src/libnm-client-impl/tests/meson.build @@ -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, ], |