build/meson: cleanup dependencies for libnm-core-aux-extern

clients/cli/meson.build

@@ -25,11 +25,11 @@ executable(
     libnmc_base_dep,
     libnmc_dep,
     libnm_client_aux_extern_dep,
-    libnm_core_aux_extern_dep_link,
     glib_dep,
     readline_dep,
   ],
   link_with: [
+    libnm_core_aux_extern,
     libnm_core_aux_intern,
     libnm_base,
     libnm_glib_aux,
@@ -52,10 +52,10 @@ generate_docs_nm_settings_nmcli = executable(
     libnmc_base_dep,
     libnmc_dep,
     libnm_client_aux_extern_dep,
-    libnm_core_aux_extern_dep_link,
     glib_dep,
   ],
   link_with: [
+    libnm_core_aux_extern,
     libnm_core_aux_intern,
     libnm_base,
     libnm_glib_aux,

clients/cloud-setup/meson.build

@@ -53,11 +53,11 @@ executable(
     libnm_cloud_setup_core_dep,
     libnmc_base_dep,
     libnmc_dep,
-    libnm_core_aux_extern_dep_link,
     libcurl_dep,
     glib_dep,
   ],
   link_with: [
+    libnm_core_aux_extern,
     libnm_core_aux_intern,
     libnm_log_null,
     libnm_glib_aux,

clients/common/meson.build

@@ -73,7 +73,6 @@ libnmc = static_library(
   dependencies: [
     libnm_dep,
     libnm_nm_default_dep,
-    libnm_core_aux_extern_dep,
   ],
   link_depends: settings_docs_source,
 )

clients/common/tests/meson.build

@@ -6,10 +6,10 @@ exe = executable(
   dependencies: [
     libnmc_base_dep,
     libnmc_dep,
-    libnm_core_aux_extern_dep_link,
     glib_dep,
   ],
   link_with: [
+    libnm_core_aux_extern,
     libnm_core_aux_intern,
     libnm_base,
     libnm_glib_aux,
@@ -29,11 +29,11 @@ exe = executable(
   'test-libnm-core-aux.c',
   dependencies: [
     libnm_dep,
-    libnm_core_aux_extern_dep_link,
     libnm_nm_default_dep,
     glib_dep,
   ],
   link_with: [
+    libnm_core_aux_extern,
     libnm_log_null,
     libnm_glib_aux,
     libnm_std_aux,

clients/tui/meson.build

@@ -51,10 +51,10 @@ executable(
     libnmc_dep,
     libnmt_newt_dep,
     libnm_client_aux_extern_dep,
-    libnm_core_aux_extern_dep_link,
     glib_dep,
   ],
   link_with: [
+    libnm_core_aux_extern,
     libnm_core_aux_intern,
     libnm_base,
     libnm_log_null,

dispatcher/meson.build

@@ -37,10 +37,10 @@ executable(
   dependencies: [
     libnm_dep,
     libnm_nm_default_dep,
-    libnm_core_aux_extern_dep_link,
     glib_dep,
   ],
   link_with: [
+    libnm_core_aux_extern,
     libnm_dispatcher_core,
     libnm_glib_aux,
     libnm_std_aux,

src/libnm-core-aux-extern/meson.build

@@ -10,18 +10,3 @@ libnm_core_aux_extern = static_library(
     glib_dep,
   ],
 )
-
-libnm_core_aux_extern_dep = declare_dependency(
-  include_directories: [
-    src_inc,
-  ],
-  dependencies: [
-    libnm_core_public_dep,
-    glib_dep,
-  ],
-)
-
-libnm_core_aux_extern_dep_link = declare_dependency(
-  dependencies: libnm_core_aux_extern_dep,
-  link_with: libnm_core_aux_extern,
-)