mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
all: move "shared/nm-libnm-aux" to "libnm/nm-libnm-aux"
Like the previous commit. Move code that depends on libnm out of shared to avoid circular dependency. Also add a readme file explaining the reason for existence of the helper library.
This commit is contained in:
parent
a9408e3497
commit
caa70a50d7
28
Makefile.am
28
Makefile.am
|
@ -567,9 +567,9 @@ $(libnm_core_nm_keyfile_libnm_keyfile_la_OBJECTS): $(libnm_core_lib_h_pub_mkenum
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
noinst_LTLIBRARIES += shared/nm-libnm-aux/libnm-libnm-aux.la
|
noinst_LTLIBRARIES += libnm/nm-libnm-aux/libnm-libnm-aux.la
|
||||||
|
|
||||||
shared_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
|
libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
|
||||||
$(dflt_cppflags) \
|
$(dflt_cppflags) \
|
||||||
-I$(srcdir)/shared \
|
-I$(srcdir)/shared \
|
||||||
-I$(builddir)/shared \
|
-I$(builddir)/shared \
|
||||||
|
@ -584,23 +584,25 @@ shared_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
|
||||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
shared_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
|
libnm_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
|
||||||
shared/nm-libnm-aux/nm-libnm-aux.c \
|
libnm/nm-libnm-aux/nm-libnm-aux.c \
|
||||||
shared/nm-libnm-aux/nm-libnm-aux.h \
|
libnm/nm-libnm-aux/nm-libnm-aux.h \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
shared_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS = \
|
libnm_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS = \
|
||||||
$(CODE_COVERAGE_LDFLAGS) \
|
$(CODE_COVERAGE_LDFLAGS) \
|
||||||
$(SANITIZER_LIB_LDFLAGS) \
|
$(SANITIZER_LIB_LDFLAGS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
shared_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \
|
libnm_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
libnm/libnm.la \
|
libnm/libnm.la \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
$(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||||
$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
$(libnm_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
||||||
|
|
||||||
|
EXTRA_DIST += libnm/nm-libnm-aux/README.md
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
@ -4306,7 +4308,7 @@ clients_nm_online_LDFLAGS = \
|
||||||
|
|
||||||
clients_nm_online_LDADD = \
|
clients_nm_online_LDADD = \
|
||||||
libnm/libnm.la \
|
libnm/libnm.la \
|
||||||
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
libnm/nm-libnm-aux/libnm-libnm-aux.la \
|
||||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||||
shared/nm-std-aux/libnm-std-aux.la \
|
shared/nm-std-aux/libnm-std-aux.la \
|
||||||
shared/libcsiphash.la \
|
shared/libcsiphash.la \
|
||||||
|
@ -4532,7 +4534,7 @@ clients_cli_nmcli_LDADD = \
|
||||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||||
shared/nm-std-aux/libnm-std-aux.la \
|
shared/nm-std-aux/libnm-std-aux.la \
|
||||||
shared/libcsiphash.la \
|
shared/libcsiphash.la \
|
||||||
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
libnm/nm-libnm-aux/libnm-libnm-aux.la \
|
||||||
libnm/libnm.la \
|
libnm/libnm.la \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(READLINE_LIBS)
|
$(READLINE_LIBS)
|
||||||
|
@ -4727,7 +4729,7 @@ clients_tui_nmtui_LDADD = \
|
||||||
clients/tui/newt/libnmt-newt.a \
|
clients/tui/newt/libnmt-newt.a \
|
||||||
clients/common/libnmc.la \
|
clients/common/libnmc.la \
|
||||||
clients/common/libnmc-base.la \
|
clients/common/libnmc-base.la \
|
||||||
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
libnm/nm-libnm-aux/libnm-libnm-aux.la \
|
||||||
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
||||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||||
|
@ -4794,7 +4796,7 @@ clients_cloud_setup_nm_cloud_setup_LDFLAGS = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
clients_cloud_setup_nm_cloud_setup_LDADD = \
|
clients_cloud_setup_nm_cloud_setup_LDADD = \
|
||||||
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
libnm/nm-libnm-aux/libnm-libnm-aux.la \
|
||||||
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
||||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||||
|
|
|
@ -66,6 +66,8 @@ IGNORE_HFILES= \
|
||||||
nm-dispatcher-api.h \
|
nm-dispatcher-api.h \
|
||||||
nm-libnm-core-aux.h \
|
nm-libnm-core-aux.h \
|
||||||
\
|
\
|
||||||
|
nm-libnm-aux.h \
|
||||||
|
\
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
# Images to copy into HTML directory.
|
# Images to copy into HTML directory.
|
||||||
|
|
|
@ -329,7 +329,9 @@ endif
|
||||||
|
|
||||||
libnm_libnm_aux = static_library(
|
libnm_libnm_aux = static_library(
|
||||||
'nm-libnm-aux',
|
'nm-libnm-aux',
|
||||||
sources: nm_libnm_aux_source,
|
sources: files(
|
||||||
|
'nm-libnm-aux/nm-libnm-aux.c',
|
||||||
|
),
|
||||||
c_args: [
|
c_args: [
|
||||||
'-DG_LOG_DOMAIN="@0@"'.format('libnmc'),
|
'-DG_LOG_DOMAIN="@0@"'.format('libnmc'),
|
||||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
|
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
|
||||||
|
|
15
libnm/nm-libnm-aux/README.md
Normal file
15
libnm/nm-libnm-aux/README.md
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
nm-libnm-aux is a static library that:
|
||||||
|
|
||||||
|
- uses the public parts of "libnm"
|
||||||
|
- that can also be statically linked into other users of libnm.
|
||||||
|
|
||||||
|
Basically, it is a static library with utility functions that extends
|
||||||
|
libnm.
|
||||||
|
|
||||||
|
That means:
|
||||||
|
|
||||||
|
- you can use it everywhere where you dynamically link with libnm.
|
||||||
|
|
||||||
|
Also, since nm-libnm-aux itself only uses public (stable)
|
||||||
|
API of libnm, you theoretically can copy the sources into your
|
||||||
|
own source tree.
|
|
@ -107,8 +107,6 @@ nm_version_macro_header = configure_file(
|
||||||
configuration: data_conf,
|
configuration: data_conf,
|
||||||
)
|
)
|
||||||
|
|
||||||
nm_libnm_aux_source = files('nm-libnm-aux/nm-libnm-aux.c')
|
|
||||||
|
|
||||||
nm_meta_setting_source = files('nm-meta-setting.c')
|
nm_meta_setting_source = files('nm-meta-setting.c')
|
||||||
|
|
||||||
nm_test_utils_impl_source = files('nm-test-utils-impl.c')
|
nm_test_utils_impl_source = files('nm-test-utils-impl.c')
|
||||||
|
|
Loading…
Reference in a new issue