From bd302341ef5923ee2f690b942a1298447cc01ff7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 27 Jan 2021 16:55:04 +0100
Subject: [PATCH] build/meson: rename "libnm_utils_base" to "libnm_glib_aux"

It's the better name.
---
 dispatcher/tests/meson.build         |  2 +-
 libnm-core/meson.build               | 10 +++++-----
 libnm/meson.build                    |  2 +-
 shared/meson.build                   | 17 ++++++++---------
 shared/nm-glib-aux/tests/meson.build |  4 ++--
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index 59169c0ead..90f3cad419 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -8,7 +8,7 @@ exe = executable(
   include_directories: dispatcher_inc,
   dependencies: [
     libnm_nm_default_dep,
-    libnm_utils_base_dep,
+    libnm_glib_aux_dep,
   ],
   c_args: [
     '-DNETWORKMANAGER_COMPILATION_TEST',
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index 843ff67efb..a6f4854211 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -108,7 +108,7 @@ libnm_libnm_core_intern_dep = declare_dependency(
   sources: [libnm_core_enum_sources[1], nm_version_macro_header],
   include_directories: [libnm_core_inc, shared_inc],
   dependencies: [
-    libnm_utils_base_dep,
+    libnm_glib_aux_dep,
     libnm_base_dep,
   ],
   link_with: libnm_libnm_core_intern,
@@ -116,7 +116,7 @@ libnm_libnm_core_intern_dep = declare_dependency(
 
 deps = [
   crypto_dep,
-  libnm_utils_base_dep,
+  libnm_glib_aux_dep,
 ]
 
 libnm_crypto = static_library(
@@ -198,7 +198,7 @@ libnm_core_sources = libnm_core_settings_sources + files(
 deps = [
   dl_dep,
   libnm_systemd_shared_dep,
-  libnm_utils_base_dep,
+  libnm_glib_aux_dep,
   uuid_dep,
 ]
 
@@ -235,7 +235,7 @@ libnm_libnm_core_aux = static_library(
   sources: files(
     'nm-libnm-core-aux/nm-libnm-core-aux.c',
   ) + [libnm_core_enum_sources[1]],
-  dependencies: libnm_utils_base_dep,
+  dependencies: libnm_glib_aux_dep,
   c_args: c_flags,
   link_with: [
     libnm_libnm_core_intern,
@@ -258,7 +258,7 @@ nm_keyfile_source = files(
 libnm_keyfile = static_library(
   'nm-keyfile',
   sources: nm_keyfile_source + [libnm_core_enum_sources[1]],
-  dependencies: libnm_utils_base_dep,
+  dependencies: libnm_glib_aux_dep,
   c_args: [
     '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
     '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
diff --git a/libnm/meson.build b/libnm/meson.build
index 27f51df684..6e0ef7af55 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -160,7 +160,7 @@ links = [
   libnm_keyfile,
   libnmdbus,
   libnm_systemd_logging_stub,
-  libnm_utils_base,
+  libnm_glib_aux,
 ]
 
 linker_script = join_paths(meson.current_source_dir(), 'libnm.ver')
diff --git a/shared/meson.build b/shared/meson.build
index 9cca02bc9a..86a50ddef9 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -119,8 +119,8 @@ libnm_std_aux = static_library(
   ],
 )
 
-libnm_utils_base = static_library(
-  'nm-utils-base',
+libnm_glib_aux = static_library(
+  'nm-glib-aux',
   sources: files(
     'nm-glib-aux/nm-dbus-aux.c',
     'nm-glib-aux/nm-dedup-multi.c',
@@ -148,12 +148,11 @@ libnm_utils_base = static_library(
   ],
 )
 
-libnm_utils_base_dep = declare_dependency(
+libnm_glib_aux_dep = declare_dependency(
   dependencies: glib_nm_default_dep,
-  link_with: libnm_utils_base,
+  link_with: libnm_glib_aux,
 )
 
-
 libnm_udev_aux = static_library(
   'nm-udev-aux',
   sources: 'nm-udev-aux/nm-udev-utils.c',
@@ -177,7 +176,7 @@ libnm_base = static_library(
   sources: files(
     'nm-base/nm-ethtool-base.c',
   ),
-  dependencies: libnm_utils_base_dep,
+  dependencies: libnm_glib_aux_dep,
   c_args: [
     '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
     '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
@@ -186,7 +185,7 @@ libnm_base = static_library(
 
 libnm_base_dep = declare_dependency(
   include_directories: shared_inc,
-  dependencies: libnm_utils_base_dep,
+  dependencies: libnm_glib_aux_dep,
   link_with: libnm_base,
 )
 
@@ -206,7 +205,7 @@ libnm_log_core = static_library(
 libnm_log_core_dep = declare_dependency(
   include_directories: shared_inc,
   dependencies: [
-    libnm_utils_base_dep,
+    libnm_glib_aux_dep,
   ],
   link_with: libnm_log_core,
 )
@@ -230,7 +229,7 @@ libnm_platform = static_library(
 libnm_platform_dep = declare_dependency(
   include_directories: shared_inc,
   dependencies: [
-    libnm_utils_base_dep,
+    libnm_glib_aux_dep,
   ],
   link_with: libnm_platform,
 )
diff --git a/shared/nm-glib-aux/tests/meson.build b/shared/nm-glib-aux/tests/meson.build
index 3e3b6a5de9..d1f23eedc0 100644
--- a/shared/nm-glib-aux/tests/meson.build
+++ b/shared/nm-glib-aux/tests/meson.build
@@ -7,7 +7,7 @@ exe = executable(
     '-DNETWORKMANAGER_COMPILATION_TEST',
     '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
   ],
-  dependencies: libnm_utils_base_dep,
+  dependencies: libnm_glib_aux_dep,
   link_with: libnm_systemd_logging_stub,
 )
 
@@ -27,7 +27,7 @@ if jansson_dep.found()
       '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
     ],
     dependencies: [
-      libnm_utils_base_dep,
+      libnm_glib_aux_dep,
       jansson_dep,
       dl_dep,
     ],