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.
This commit is contained in:
Thomas Haller 2021-01-27 21:23:57 +01:00
parent e795b297c9
commit beb29ffb3c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 14 additions and 14 deletions

View file

@ -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)

View file

@ -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,

View file

@ -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(