mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-07 00:31:11 +00:00
libnm,shared: move nm-ethtool helper to "libnm-base"
We want to use this by "shared/nm-platform", which should have no dependency on "libnm-core". Move "libnm-core/nm-ethtool-utils.h" to "libnm/nm-ethtool-utils.h" so that it is only used by libnm. This file contains the defines for the option names. Also, symlink "libnm/nm-ethtool-utils.h" as "shared/nm-base/nm-ethtool-utils-base.h". We want to use the same defines also internally. Since they are both public API (must be in libnm) and should be in "shared/nm-base", this is the way.
This commit is contained in:
parent
19242f56d7
commit
874bd8994e
42
Makefile.am
42
Makefile.am
|
@ -464,6 +464,30 @@ shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
|
|||
|
||||
###############################################################################
|
||||
|
||||
noinst_LTLIBRARIES += shared/nm-base/libnm-base.la
|
||||
|
||||
shared_nm_base_libnm_base_la_CPPFLAGS = \
|
||||
$(shared_nm_glib_aux_cppflags) \
|
||||
$(NULL)
|
||||
|
||||
shared_nm_base_libnm_base_la_SOURCES = \
|
||||
shared/nm-base/nm-base.h \
|
||||
shared/nm-base/nm-ethtool-base.c \
|
||||
shared/nm-base/nm-ethtool-base.h \
|
||||
shared/nm-base/nm-ethtool-utils-base.h \
|
||||
$(NULL)
|
||||
|
||||
shared_nm_base_libnm_base_la_LDFLAGS = \
|
||||
$(CODE_COVERAGE_LDFLAGS) \
|
||||
$(SANITIZER_LIB_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
shared_nm_base_libnm_base_la_LIBADD = \
|
||||
$(GLIB_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
###############################################################################
|
||||
|
||||
noinst_LTLIBRARIES += shared/nm-log-core/libnm-log-core.la
|
||||
|
||||
shared_nm_log_core_libnm_log_core_la_CPPFLAGS = \
|
||||
|
@ -553,10 +577,6 @@ EXTRA_DIST += \
|
|||
|
||||
###############################################################################
|
||||
|
||||
EXTRA_DIST += shared/nm-base/nm-base.h
|
||||
|
||||
###############################################################################
|
||||
|
||||
noinst_LTLIBRARIES += libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la
|
||||
|
||||
libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
|
||||
|
@ -576,8 +596,6 @@ libnm_core_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \
|
|||
libnm-core/nm-libnm-core-intern/nm-auth-subject.c \
|
||||
libnm-core/nm-libnm-core-intern/nm-auth-subject.h \
|
||||
libnm-core/nm-libnm-core-intern/nm-common-macros.h \
|
||||
libnm-core/nm-libnm-core-intern/nm-ethtool-base.c \
|
||||
libnm-core/nm-libnm-core-intern/nm-ethtool-base.h \
|
||||
libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c \
|
||||
libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h \
|
||||
$(NULL)
|
||||
|
@ -1024,7 +1042,6 @@ libnm_core_lib_h_pub_real = \
|
|||
libnm-core/nm-core-types.h \
|
||||
libnm-core/nm-dbus-interface.h \
|
||||
libnm-core/nm-errors.h \
|
||||
libnm-core/nm-ethtool-utils.h \
|
||||
libnm-core/nm-keyfile.h \
|
||||
libnm-core/nm-setting-6lowpan.h \
|
||||
libnm-core/nm-setting-8021x.h \
|
||||
|
@ -1363,6 +1380,7 @@ libnm_core_tests_ldadd = \
|
|||
libnm-core/libnm-core.la \
|
||||
$(libnm_crypto_lib) \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/systemd/libnm-systemd-shared.la \
|
||||
shared/systemd/libnm-systemd-logging-stub.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
|
@ -1473,6 +1491,7 @@ libnm_lib_h_pub_real = \
|
|||
libnm/nm-device-wpan.h \
|
||||
libnm/nm-device.h \
|
||||
libnm/nm-dhcp-config.h \
|
||||
libnm/nm-ethtool-utils.h \
|
||||
libnm/nm-ip-config.h \
|
||||
libnm/nm-object.h \
|
||||
libnm/nm-remote-connection.h \
|
||||
|
@ -1594,6 +1613,7 @@ libnm_liblibnm_la_LIBADD = \
|
|||
libnm-core/libnm-core.la \
|
||||
$(libnm_crypto_lib) \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
introspection/libnmdbus.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
shared/systemd/libnm-systemd-shared.la \
|
||||
|
@ -2479,6 +2499,7 @@ src_libNetworkManager_la_LIBADD = \
|
|||
$(libnm_crypto_lib) \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-platform/libnm-platform.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/nm-log-core/libnm-log-core.la \
|
||||
shared/nm-udev-aux/libnm-udev-aux.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
|
@ -2592,6 +2613,7 @@ src_nm_iface_helper_LDADD = \
|
|||
$(libnm_crypto_lib) \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-platform/libnm-platform.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/nm-log-core/libnm-log-core.la \
|
||||
shared/nm-udev-aux/libnm-udev-aux.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
|
@ -2646,6 +2668,7 @@ src_initrd_nm_initrd_generator_LDADD = \
|
|||
$(libnm_crypto_lib) \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-platform/libnm-platform.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/nm-log-core/libnm-log-core.la \
|
||||
shared/nm-udev-aux/libnm-udev-aux.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
|
@ -4646,6 +4669,7 @@ clients_common_tests_test_clients_common_LDADD = \
|
|||
clients/common/libnmc-base.la \
|
||||
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
shared/nm-std-aux/libnm-std-aux.la \
|
||||
shared/libcsiphash.la \
|
||||
|
@ -4737,6 +4761,7 @@ clients_cli_nmcli_LDADD = \
|
|||
clients/common/libnmc-base.la \
|
||||
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
shared/nm-std-aux/libnm-std-aux.la \
|
||||
shared/libcsiphash.la \
|
||||
|
@ -4785,6 +4810,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
|
|||
libnm/nm-libnm-aux/libnm-libnm-aux.la \
|
||||
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
libnm/libnm.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
shared/nm-std-aux/libnm-std-aux.la \
|
||||
|
@ -4975,6 +5001,7 @@ clients_tui_nmtui_LDADD = \
|
|||
libnm/nm-libnm-aux/libnm-libnm-aux.la \
|
||||
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
shared/nm-std-aux/libnm-std-aux.la \
|
||||
shared/libcsiphash.la \
|
||||
|
@ -5046,6 +5073,7 @@ clients_cloud_setup_nm_cloud_setup_LDADD = \
|
|||
libnm/nm-libnm-aux/libnm-libnm-aux.la \
|
||||
libnm-core/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
||||
libnm-core/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
||||
shared/nm-base/libnm-base.la \
|
||||
shared/nm-glib-aux/libnm-glib-aux.la \
|
||||
shared/nm-std-aux/libnm-std-aux.la \
|
||||
shared/libcsiphash.la \
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
#include "nm-glib-aux/nm-obj.h"
|
||||
#include "nm-meta-setting.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
|
||||
struct _NMDevice;
|
||||
|
||||
|
|
|
@ -95,17 +95,22 @@ libnm_libnm_core_intern = static_library(
|
|||
'nm-libnm-core-intern',
|
||||
sources: files(
|
||||
'nm-libnm-core-intern/nm-auth-subject.c',
|
||||
'nm-libnm-core-intern/nm-ethtool-base.c',
|
||||
'nm-libnm-core-intern/nm-libnm-core-utils.c',
|
||||
) + [libnm_core_enum_sources[1]],
|
||||
dependencies: libnm_core_nm_default_dep,
|
||||
dependencies: [
|
||||
libnm_core_nm_default_dep,
|
||||
libnm_base_dep,
|
||||
],
|
||||
c_args: common_c_flags,
|
||||
)
|
||||
|
||||
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,
|
||||
dependencies: [
|
||||
libnm_utils_base_dep,
|
||||
libnm_base_dep,
|
||||
],
|
||||
link_with: libnm_libnm_core_intern,
|
||||
)
|
||||
|
||||
|
@ -232,7 +237,10 @@ libnm_libnm_core_aux = static_library(
|
|||
) + [libnm_core_enum_sources[1]],
|
||||
dependencies: libnm_utils_base_dep,
|
||||
c_args: c_flags,
|
||||
link_with: libnm_libnm_core_intern,
|
||||
link_with: [
|
||||
libnm_libnm_core_intern,
|
||||
libnm_base,
|
||||
],
|
||||
)
|
||||
|
||||
libnm_libnm_core_aux_dep = declare_dependency(
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include "nm-setting-ethtool.h"
|
||||
|
||||
#include "nm-setting-private.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#endif
|
||||
|
||||
#include "nm-setting.h"
|
||||
#include "nm-ethtool-utils.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -18,12 +18,6 @@ enum_sources = gnome.mkenums_simple(
|
|||
body_prefix: '#include "nm-default.h"',
|
||||
)
|
||||
|
||||
deps = [
|
||||
libnm_keyfile_dep,
|
||||
libnm_core_dep,
|
||||
libnm_core_nm_default_dep,
|
||||
]
|
||||
|
||||
c_flags = [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
|
||||
|
@ -45,7 +39,12 @@ foreach test_unit: test_units
|
|||
exe = executable(
|
||||
'libnm-core-' + test_unit,
|
||||
[test_unit + '.c'] + enum_sources,
|
||||
dependencies: deps,
|
||||
dependencies: [
|
||||
libnm_keyfile_dep,
|
||||
libnm_core_dep,
|
||||
libnm_core_nm_default_dep,
|
||||
libnm_base_dep,
|
||||
],
|
||||
c_args: c_flags,
|
||||
link_with: libnm_systemd_logging_stub,
|
||||
)
|
||||
|
|
|
@ -59,7 +59,8 @@
|
|||
#include "nm-simple-connection.h"
|
||||
#include "nm-keyfile/nm-keyfile-internal.h"
|
||||
#include "nm-glib-aux/nm-dedup-multi.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-utils-base.h"
|
||||
|
||||
#include "test-general-enums.h"
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include <net/if.h>
|
||||
|
||||
#include "nm-glib-aux/nm-json-aux.h"
|
||||
#include "nm-base/nm-ethtool-utils-base.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-utils-private.h"
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
#include "nm-device.h"
|
||||
#include "nm-dhcp-config.h"
|
||||
#include "nm-enum-types.h"
|
||||
#include "nm-ethtool-utils.h"
|
||||
#include "nm-ip-config.h"
|
||||
#include "nm-keyfile.h"
|
||||
#include "nm-object.h"
|
||||
|
|
|
@ -51,6 +51,7 @@ libnm_headers = files(
|
|||
'nm-device-wpan.h',
|
||||
'nm-device.h',
|
||||
'nm-dhcp-config.h',
|
||||
'nm-ethtool-utils.h',
|
||||
'nm-ip-config.h',
|
||||
'nm-object.h',
|
||||
'nm-remote-connection.h',
|
||||
|
|
|
@ -182,6 +182,21 @@ libnm_udev_aux_dep = declare_dependency(
|
|||
link_with: libnm_udev_aux,
|
||||
)
|
||||
|
||||
libnm_base = static_library(
|
||||
'nm-base',
|
||||
sources: files(
|
||||
'nm-base/nm-ethtool-base.c',
|
||||
),
|
||||
dependencies: libnm_utils_base_dep,
|
||||
c_args: c_flags,
|
||||
)
|
||||
|
||||
libnm_base_dep = declare_dependency(
|
||||
include_directories: shared_inc,
|
||||
dependencies: libnm_utils_base_dep,
|
||||
link_with: libnm_base,
|
||||
)
|
||||
|
||||
libnm_log_core = static_library(
|
||||
'nm-log-core',
|
||||
sources: 'nm-log-core/nm-logging.c',
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "nm-ethtool-base.h"
|
||||
|
||||
#include "nm-setting-ethtool.h"
|
||||
#include "nm-ethtool-utils-base.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
1
shared/nm-base/nm-ethtool-utils-base.h
Symbolic link
1
shared/nm-base/nm-ethtool-utils-base.h
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../libnm/nm-ethtool-utils.h
|
|
@ -28,7 +28,7 @@
|
|||
#include "nm-glib-aux/nm-random-utils.h"
|
||||
#include "systemd/nm-sd-utils-shared.h"
|
||||
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-l3cfg.h"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <libudev.h>
|
||||
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include <linux/if_tun.h>
|
||||
|
||||
#include "nm-glib-aux/nm-io-utils.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
#include "platform/nmp-object.h"
|
||||
#include "nm-platform/nmp-netns.h"
|
||||
#include "platform/nm-platform-utils.h"
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "nm-setting-generic.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#define _UTILS_H_
|
||||
|
||||
#include "nm-connection.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
|
||||
#include "shvar.h"
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "nm-core-internal.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-meta-setting.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
|
||||
#include "nms-ifcfg-rh-common.h"
|
||||
#include "nms-ifcfg-rh-reader.h"
|
||||
|
|
|
@ -37,7 +37,8 @@
|
|||
#include "nm-setting-vlan.h"
|
||||
#include "nm-setting-dcb.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-libnm-core-intern/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
#include "nm-base/nm-ethtool-utils-base.h"
|
||||
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue