From beb29ffb3ca24bc704dd00993916d069e93e81c7 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 27 Jan 2021 21:23:57 +0100
Subject: [PATCH] build: rename static "liblibnm" to "libnm-static"

This is basically all of libnm as a static-library. The name
liblibnm isn't great. Arguably, we do have quite a lot of
libnmxyz, so finding a good name is hard. But libnm-static seems
a better name. Rename.
---
 Makefile.am             | 20 ++++++++++----------
 libnm/meson.build       |  6 +++---
 libnm/tests/meson.build |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 99d8b214c..6b3fabc80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1026,7 +1026,7 @@ dbusinterfaces_DATA = \
 CLEANFILES += $(introspection_sources)
 CLEANFILES += $(DBUS_INTERFACE_DOCS)
 
-$(libnm_liblibnm_la_OBJECTS):                   $(introspection_sources)
+$(libnm_libnm_static_la_OBJECTS):               $(introspection_sources)
 $(libnm_libnm_la_OBJECTS):                      $(introspection_sources)
 
 EXTRA_DIST += \
@@ -1595,23 +1595,23 @@ nodist_libnminclude_HEADERS += \
 
 ###############################################################################
 
-noinst_LTLIBRARIES += libnm/liblibnm.la
+noinst_LTLIBRARIES += libnm/libnm_static.la
 
-libnm_liblibnm_la_CPPFLAGS = \
+libnm_libnm_static_la_CPPFLAGS = \
 	$(INTROSPECTION_CFLAGS) \
 	$(libnm_lib_cppflags) \
 	$(NULL)
 
-libnm_liblibnm_la_SOURCES = \
+libnm_libnm_static_la_SOURCES = \
 	$(libnm_lib_c_real) \
 	$(NULL)
 
-nodist_libnm_liblibnm_la_SOURCES = \
+nodist_libnm_libnm_static_la_SOURCES = \
 	$(libnm_lib_h_pub_mkenums) \
 	$(libnm_lib_c_mkenums) \
 	$(NULL)
 
-libnm_liblibnm_la_LIBADD = \
+libnm_libnm_static_la_LIBADD = \
 	libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
 	libnm-core/nm-keyfile/libnm-keyfile.la \
 	libnm-core/libnm-core.la \
@@ -1631,8 +1631,8 @@ libnm_liblibnm_la_LIBADD = \
 	$(LIBUDEV_LIBS) \
 	$(NULL)
 
-$(libnm_liblibnm_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
-$(libnm_liblibnm_la_OBJECTS) : $(libnm_core_lib_h_pub_mkenums)
+$(libnm_libnm_static_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
+$(libnm_libnm_static_la_OBJECTS) : $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
@@ -1667,7 +1667,7 @@ EXTRA_libnm_libnm_la_DEPENDENCIES = \
 	libnm/libnm.ver
 
 libnm_libnm_la_LIBADD = \
-	libnm/liblibnm.la \
+	libnm/libnm_static.la \
 	$(NULL)
 
 libnm_libnm_la_LDFLAGS = \
@@ -1806,7 +1806,7 @@ libnm_tests_cppflags = \
 	$(NULL)
 
 libnm_tests_ldadd = \
-	libnm/liblibnm.la \
+	libnm/libnm_static.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
diff --git a/libnm/meson.build b/libnm/meson.build
index 58a31f759..a9d38f8de 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -130,8 +130,8 @@ libnm_sources = files(
   'nm-wimax-nsp.c',
 )
 
-liblibnm = static_library(
-  'libnm',
+libnm_static = static_library(
+  'nm-static',
   sources: libnm_sources + libnm_enum_sources,
   dependencies: [
     libnmdbus_dep,
@@ -155,7 +155,7 @@ libnm = shared_library(
   version: libnm_version,
   dependencies: libnm_nm_default_dep,
   link_whole: [
-    liblibnm,
+    libnm_static,
     libnm_core,
     libnm_keyfile,
     libnmdbus,
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index 36e2a1b29..cacab7937 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -23,7 +23,7 @@ foreach test_unit: test_units
     [test_unit[0] + '.c', nm_test_utils_impl_source, libnm_enum_sources[1]],
     dependencies: deps,
     c_args: c_flags,
-    link_with: liblibnm,
+    link_with: libnm_static,
   )
 
   test(