diff --git a/clients/cli/meson.build b/clients/cli/meson.build index eb633cf97c..c33928d2bc 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -26,11 +26,11 @@ executable( libnmc_dep, libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, - libnm_core_aux_intern_dep_link, glib_dep, readline_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_glib_aux, libnm_std_aux, @@ -53,10 +53,10 @@ generate_docs_nm_settings_nmcli = executable( libnmc_dep, libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, - libnm_core_aux_intern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_glib_aux, libnm_std_aux, diff --git a/clients/cloud-setup/meson.build b/clients/cloud-setup/meson.build index 3872aa875e..898909052d 100644 --- a/clients/cloud-setup/meson.build +++ b/clients/cloud-setup/meson.build @@ -53,12 +53,12 @@ executable( libnm_cloud_setup_core_dep, libnmc_base_dep, libnmc_dep, - libnm_core_aux_intern_dep_link, libnm_core_aux_extern_dep_link, libcurl_dep, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_log_null, libnm_glib_aux, libnm_std_aux, diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build index e62d99602d..40f380f0cd 100644 --- a/clients/common/tests/meson.build +++ b/clients/common/tests/meson.build @@ -6,11 +6,11 @@ exe = executable( dependencies: [ libnmc_base_dep, libnmc_dep, - libnm_core_aux_intern_dep_link, libnm_core_aux_extern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_glib_aux, libnm_std_aux, diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 03df2e01ac..f426ca3f2d 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -52,10 +52,10 @@ executable( libnmt_newt_dep, libnm_client_aux_extern_dep, libnm_core_aux_extern_dep_link, - libnm_core_aux_intern_dep_link, glib_dep, ], link_with: [ + libnm_core_aux_intern, libnm_base, libnm_log_null, libnm_glib_aux, diff --git a/src/libnm-client-aux-extern/meson.build b/src/libnm-client-aux-extern/meson.build index 767c6ef595..af8c5886b1 100644 --- a/src/libnm-client-aux-extern/meson.build +++ b/src/libnm-client-aux-extern/meson.build @@ -6,7 +6,7 @@ libnm_client_aux_extern = static_library( 'nm-libnm-aux.c', ), dependencies: [ - libnm_core_aux_intern_dep, + libnm_core_public_dep, libnm_dep, ], ) diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build index 0498cbdfd3..d867b2b13a 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build @@ -72,7 +72,6 @@ libnm_client_impl = static_library( sources: libnm_client_impl_sources + libnm_client_public_enum_sources, dependencies: [ libnmdbus_dep, - libnm_core_aux_intern_dep, libnm_nm_default_dep, libudev_dep, ], diff --git a/src/libnm-client-test/meson.build b/src/libnm-client-test/meson.build index 65686b0ad6..8e2fba1130 100644 --- a/src/libnm-client-test/meson.build +++ b/src/libnm-client-test/meson.build @@ -12,7 +12,6 @@ libnm_client_test = static_library( top_inc, ], dependencies: [ - libnm_core_aux_intern_dep, libnm_core_public_dep, glib_dep, ], diff --git a/src/libnm-core-aux-extern/meson.build b/src/libnm-core-aux-extern/meson.build index 4e1001adc7..146afce3d8 100644 --- a/src/libnm-core-aux-extern/meson.build +++ b/src/libnm-core-aux-extern/meson.build @@ -6,7 +6,6 @@ libnm_core_aux_extern = static_library( 'nm-libnm-core-aux.c', ), dependencies: [ - libnm_core_aux_intern_dep, libnm_core_public_dep, glib_dep, ], @@ -17,7 +16,6 @@ libnm_core_aux_extern_dep = declare_dependency( src_inc, ], dependencies: [ - libnm_core_aux_intern_dep, libnm_core_public_dep, glib_dep, ], diff --git a/src/libnm-core-aux-intern/meson.build b/src/libnm-core-aux-intern/meson.build index 8720d1ee3b..a58921e304 100644 --- a/src/libnm-core-aux-intern/meson.build +++ b/src/libnm-core-aux-intern/meson.build @@ -11,19 +11,3 @@ libnm_core_aux_intern = static_library( glib_dep, ], ) - -libnm_core_aux_intern_dep = declare_dependency( - include_directories: [ - src_inc, - top_inc, - ], - dependencies: [ - libnm_core_public_dep, - glib_dep, - ], -) - -libnm_core_aux_intern_dep_link = declare_dependency( - dependencies: libnm_core_aux_intern_dep, - link_with: libnm_core_aux_intern, -)