system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-04 15:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: move "shared/nm-{base,udev-aux}" to "src/libnm-{base,udev-aux}"

Browse source
This commit is contained in:
Thomas Haller 2021-02-18 08:13:35 +01:00
parent 174bd45344
commit 4d12a6ac3d
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
34 changed files with 107 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
Makefile.am
View file

@ -115,13 +115,13 @@ $(src_libnm_core_public_mkenums_c): config-extra.h
src/libnm-core-impl/.dirstamp: config-extra.h
src/libnm-core-impl/.dirstamp: config-extra.h
shared/.dirstamp: config-extra.h
shared/nm-base/.dirstamp: config-extra.h
src/libnm-base/.dirstamp: config-extra.h
shared/nm-glib-aux/.dirstamp: config-extra.h
shared/nm-glib-aux/tests/.dirstamp: config-extra.h
src/libnm-platform/.dirstamp: config-extra.h
src/libnm-platform/tests/.dirstamp: config-extra.h
shared/nm-std-aux/.dirstamp: config-extra.h
shared/nm-udev-aux/.dirstamp: config-extra.h
src/libnm-udev-aux/.dirstamp: config-extra.h
src/libnm-systemd-shared/.dirstamp: config-extra.h
src/libnm-systemd-shared/src/basic/.dirstamp: config-extra.h
src/libnm-systemd-shared/src/shared/.dirstamp: config-extra.h
@ -445,52 +445,58 @@ shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \
###############################################################################
noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la
noinst_LTLIBRARIES += src/libnm-udev-aux/libnm-udev-aux.la
shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
src_libnm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
$(shared_nm_glib_aux_cppflags) \
$(LIBUDEV_CFLAGS) \
$(NULL)
shared_nm_udev_aux_libnm_udev_aux_la_SOURCES = \
shared/nm-udev-aux/nm-udev-utils.c \
shared/nm-udev-aux/nm-udev-utils.h \
src_libnm_udev_aux_libnm_udev_aux_la_SOURCES = \
src/libnm-udev-aux/nm-udev-utils.c \
src/libnm-udev-aux/nm-udev-utils.h \
$(NULL)
shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
src_libnm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(SANITIZER_LIB_LDFLAGS) \
$(NULL)
shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
src_libnm_udev_aux_libnm_udev_aux_la_LIBADD = \
$(GLIB_LIBS) \
$(LIBUDEV_LIBS) \
$(NULL)
EXTRA_DIST += src/libnm-udev-aux/meson.build
###############################################################################
noinst_LTLIBRARIES += shared/nm-base/libnm-base.la
noinst_LTLIBRARIES += src/libnm-base/libnm-base.la
shared_nm_base_libnm_base_la_CPPFLAGS = \
src_libnm_base_libnm_base_la_CPPFLAGS = \
$(shared_nm_glib_aux_cppflags) \
-I$(srcdir)/src \
-I$(builddir)/src \
$(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 \
src_libnm_base_libnm_base_la_SOURCES = \
src/libnm-base/nm-base.h \
src/libnm-base/nm-ethtool-base.c \
src/libnm-base/nm-ethtool-base.h \
src/libnm-base/nm-ethtool-utils-base.h \
$(NULL)
shared_nm_base_libnm_base_la_LDFLAGS = \
src_libnm_base_libnm_base_la_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(SANITIZER_LIB_LDFLAGS) \
$(NULL)
shared_nm_base_libnm_base_la_LIBADD = \
src_libnm_base_libnm_base_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
EXTRA_DIST += src/libnm-base/meson.build
###############################################################################
noinst_LTLIBRARIES += shared/nm-log-core/libnm-log-core.la
@ -1385,7 +1391,7 @@ src_libnm_core_impl_tests_ldadd = \
src/libnm-core-impl/libnm-core-impl.la \
$(libnm_crypto_lib) \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
src/libnm-systemd-shared/libnm-systemd-shared.la \
shared/nm-log-null/libnm-log-null.la \
shared/nm-glib-aux/libnm-glib-aux.la \
@ -1613,12 +1619,12 @@ libnm_libnm_static_la_LIBADD = \
src/libnm-core-impl/libnm-core-impl.la \
$(libnm_crypto_lib) \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
introspection/libnmdbus.la \
shared/nm-glib-aux/libnm-glib-aux.la \
src/libnm-systemd-shared/libnm-systemd-shared.la \
shared/nm-log-null/libnm-log-null.la \
shared/nm-udev-aux/libnm-udev-aux.la \
src/libnm-udev-aux/libnm-udev-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
shared/libcsiphash.la \
$(GLIB_LIBS) \
@ -2484,9 +2490,9 @@ src_core_libNetworkManager_la_LIBADD = \
$(libnm_crypto_lib) \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
src/libnm-platform/libnm-platform.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-log-core/libnm-log-core.la \
shared/nm-udev-aux/libnm-udev-aux.la \
src/libnm-udev-aux/libnm-udev-aux.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
src/core/libnm-systemd-core.la \
@ -2597,9 +2603,9 @@ src_core_nm_iface_helper_LDADD = \
$(libnm_crypto_lib) \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
src/libnm-platform/libnm-platform.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-log-core/libnm-log-core.la \
shared/nm-udev-aux/libnm-udev-aux.la \
src/libnm-udev-aux/libnm-udev-aux.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
src/core/libnm-systemd-core.la \
@ -2651,9 +2657,9 @@ src_core_initrd_nm_initrd_generator_LDADD = \
$(libnm_crypto_lib) \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
src/libnm-platform/libnm-platform.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-log-core/libnm-log-core.la \
shared/nm-udev-aux/libnm-udev-aux.la \
src/libnm-udev-aux/libnm-udev-aux.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
src/libnm-systemd-shared/libnm-systemd-shared.la \
@ -4644,7 +4650,7 @@ clients_common_tests_test_clients_common_LDADD = \
clients/common/libnmc-base.la \
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
shared/libcsiphash.la \
@ -4736,7 +4742,7 @@ clients_cli_nmcli_LDADD = \
clients/common/libnmc-base.la \
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
shared/libcsiphash.la \
@ -4784,7 +4790,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
libnm/nm-libnm-aux/libnm-libnm-aux.la \
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
libnm/libnm.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
@ -4974,7 +4980,7 @@ clients_tui_nmtui_LDADD = \
libnm/nm-libnm-aux/libnm-libnm-aux.la \
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
shared/libcsiphash.la \
@ -5060,7 +5066,7 @@ clients_cloud_setup_nm_cloud_setup_LDADD = \
libnm/nm-libnm-aux/libnm-libnm-aux.la \
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
shared/libcsiphash.la \
@ -5125,7 +5131,7 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
libnm/nm-libnm-aux/libnm-libnm-aux.la \
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
shared/nm-base/libnm-base.la \
src/libnm-base/libnm-base.la \
shared/nm-glib-aux/libnm-glib-aux.la \
shared/nm-std-aux/libnm-std-aux.la \
shared/libcsiphash.la \

2
clients/common/nm-meta-setting-desc.h
View file

@ -8,7 +8,7 @@
#include "nm-glib-aux/nm-obj.h"
#include "nm-meta-setting-base.h"
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
struct _NMDevice;

2
libnm/nm-device.c
View file

@ -25,7 +25,7 @@
#include "nm-dbus-helpers.h"
#include "nm-device-tun.h"
#include "nm-setting-connection.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "libnm-udev-aux/nm-udev-utils.h"
/*****************************************************************************/

32
shared/meson.build
View file

@ -147,38 +147,6 @@ libnm_glib_aux_dep_link = declare_dependency(
link_with: libnm_glib_aux,
)
libnm_udev_aux = static_library(
'nm-udev-aux',
sources: 'nm-udev-aux/nm-udev-utils.c',
dependencies: [
glib_nm_default_dep,
libudev_dep,
],
)
libnm_udev_aux_dep = declare_dependency(
include_directories: shared_inc,
link_with: libnm_udev_aux,
)
libnm_base = static_library(
'nm-base',
sources: files(
'nm-base/nm-ethtool-base.c',
),
dependencies: libnm_glib_aux_dep_link,
)
libnm_base_dep = declare_dependency(
include_directories: shared_inc,
dependencies: libnm_glib_aux_dep,
)
libnm_base_dep_link = declare_dependency(
dependencies: libnm_glib_aux_dep_link,
link_with: libnm_base,
)
libnm_log_core = static_library(
'nm-log-core',
sources: 'nm-log-core/nm-logging.c',

2
src/core/devices/adsl/nm-atm-manager.c
View file

@ -12,7 +12,7 @@
#include "nm-device-adsl.h"
#include "devices/nm-device-factory.h"
#include "platform/nm-platform.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "libnm-udev-aux/nm-udev-utils.h"
/*****************************************************************************/

2
src/core/devices/nm-device-ethernet.c
View file

@ -34,7 +34,7 @@
#include "nm-device-factory.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "libnm-udev-aux/nm-udev-utils.h"
#include "nm-device-veth.h"
#define _NMLOG_DEVICE_TYPE NMDeviceEthernet

2
src/core/devices/nm-device.c
View file

@ -28,7 +28,7 @@
#include "nm-glib-aux/nm-random-utils.h"
#include "libnm-systemd-shared/nm-sd-utils-shared.h"
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "libnm-core-aux-intern/nm-common-macros.h"
#include "nm-device-private.h"
#include "nm-l3cfg.h"

2
src/core/nm-rfkill-manager.c
View file

@ -9,7 +9,7 @@
#include <libudev.h>
#include "nm-udev-aux/nm-udev-utils.h"
#include "libnm-udev-aux/nm-udev-utils.h"
/*****************************************************************************/

2
src/core/platform/nm-linux-platform.c
View file

@ -50,7 +50,7 @@
#include "wifi/nm-wifi-utils-wext.h"
#include "wpan/nm-wpan-utils.h"
#include "nm-glib-aux/nm-io-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "libnm-udev-aux/nm-udev-utils.h"
/*****************************************************************************/

2
src/core/platform/nm-platform.c
View file

@ -25,7 +25,7 @@
#include "nm-utils.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "nm-glib-aux/nm-dedup-multi.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "libnm-udev-aux/nm-udev-utils.h"
#include "nm-glib-aux/nm-secret-utils.h"
#include "nm-core-utils.h"

2
src/core/platform/nm-platform.h
View file

@ -10,7 +10,7 @@
#include "libnm-core-intern/nm-core-types-internal.h"
#include "libnm-platform/nmp-base.h"
#include "nm-base/nm-base.h"
#include "libnm-base/nm-base.h"
#include "nm-core-utils.h"
#include "nm-setting-vlan.h"

2
src/core/platform/tests/test-link.c
View file

@ -12,7 +12,7 @@
#include <linux/if_tun.h>
#include "nm-glib-aux/nm-io-utils.h"
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "platform/nmp-object.h"
#include "libnm-platform/nmp-netns.h"
#include "libnm-platform/nm-platform-utils.h"

2
src/core/platform/tests/test-nmp-object.c
View file

@ -9,7 +9,7 @@
#include <linux/pkt_sched.h>
#include "platform/nmp-object.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "libnm-udev-aux/nm-udev-utils.h"
#include "nm-test-utils-core.h"

2
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -40,7 +40,7 @@
#include "nm-setting-generic.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "nm-utils.h"
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "platform/nm-platform.h"
#include "NetworkManagerUtils.h"

2
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
View file

@ -7,7 +7,7 @@
#define _UTILS_H_
#include "nm-connection.h"
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "shvar.h"

2
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -34,7 +34,7 @@
#include "nm-utils.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "nms-ifcfg-rh-common.h"
#include "nms-ifcfg-rh-reader.h"

4
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -37,8 +37,8 @@
#include "nm-setting-vlan.h"
#include "nm-setting-dcb.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "nm-base/nm-ethtool-base.h"
#include "nm-base/nm-ethtool-utils-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-utils-base.h"
#include "NetworkManagerUtils.h"

24
src/libnm-base/meson.build Normal file
View file

@ -0,0 +1,24 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
libnm_base = static_library(
'nm-base',
include_directories: [
shared_inc,
src_inc,
top_inc,
],
sources: files(
'nm-ethtool-base.c',
),
dependencies: libnm_glib_aux_dep_link,
)
libnm_base_dep = declare_dependency(
include_directories: shared_inc,
dependencies: libnm_glib_aux_dep,
)
libnm_base_dep_link = declare_dependency(
dependencies: libnm_glib_aux_dep_link,
link_with: libnm_base,
)

0
shared/nm-base/nm-base.h → src/libnm-base/nm-base.h
View file

0
shared/nm-base/nm-ethtool-base.c → src/libnm-base/nm-ethtool-base.c
View file

2
shared/nm-base/nm-ethtool-base.h → src/libnm-base/nm-ethtool-base.h
View file

@ -6,7 +6,7 @@
#ifndef __NM_ETHTOOL_BASE_H__
#define __NM_ETHTOOL_BASE_H__
#include "nm-base/nm-base.h"
#include "libnm-base/nm-base.h"
/*****************************************************************************/

0
shared/nm-base/nm-ethtool-utils-base.h → src/libnm-base/nm-ethtool-utils-base.h
View file

2
src/libnm-core-impl/nm-setting-ethtool.c
View file

@ -8,7 +8,7 @@
#include "nm-setting-ethtool.h"
#include "nm-setting-private.h"
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
/*****************************************************************************/

6
src/libnm-core-impl/tests/test-general.c
View file

@ -17,7 +17,7 @@
#include "nm-glib-aux/nm-enum-utils.h"
#include "nm-glib-aux/nm-str-buf.h"
#include "nm-glib-aux/nm-json-aux.h"
#include "nm-base/nm-base.h"
#include "libnm-base/nm-base.h"
#include "libnm-systemd-shared/nm-sd-utils-shared.h"
#include "nm-utils.h"
@ -59,8 +59,8 @@
#include "nm-simple-connection.h"
#include "libnm-core-intern/nm-keyfile-internal.h"
#include "nm-glib-aux/nm-dedup-multi.h"
#include "nm-base/nm-ethtool-base.h"
#include "nm-base/nm-ethtool-utils-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-utils-base.h"
#include "test-general-enums.h"

2
src/libnm-core-impl/tests/test-setting.c
View file

@ -9,7 +9,7 @@
#include <net/if.h>
#include "nm-glib-aux/nm-json-aux.h"
#include "nm-base/nm-ethtool-utils-base.h"
#include "libnm-base/nm-ethtool-utils-base.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "nm-utils.h"
#include "nm-utils-private.h"

2
src/libnm-core-intern/nm-core-internal.h
View file

@ -20,7 +20,7 @@
#error Cannot use this header.
#endif
#include "nm-base/nm-base.h"
#include "libnm-base/nm-base.h"
#include "nm-connection.h"
#include "nm-core-enum-types.h"
#include "nm-core-types-internal.h"

2
src/libnm-platform/nm-platform-utils.c
View file

@ -18,7 +18,7 @@
#include <fcntl.h>
#include <libudev.h>
#include "nm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-base.h"
#include "nm-log-core/nm-logging.h"
/*****************************************************************************/

2
src/libnm-platform/nm-platform-utils.h
View file

@ -6,7 +6,7 @@
#ifndef __NM_PLATFORM_UTILS_H__
#define __NM_PLATFORM_UTILS_H__
#include "nm-base/nm-base.h"
#include "libnm-base/nm-base.h"
#include "libnm-platform/nmp-base.h"
/*****************************************************************************/

2
src/libnm-platform/nmp-base.h
View file

@ -3,7 +3,7 @@
#ifndef __NMP_FWD_H__
#define __NMP_FWD_H__
#include "nm-base/nm-base.h"
#include "libnm-base/nm-base.h"
/*****************************************************************************/

15
src/libnm-udev-aux/meson.build Normal file
View file

@ -0,0 +1,15 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
libnm_udev_aux = static_library(
'nm-udev-aux',
sources: 'nm-udev-utils.c',
dependencies: [
glib_nm_default_dep,
libudev_dep,
],
)
libnm_udev_aux_dep = declare_dependency(
include_directories: shared_inc,
link_with: libnm_udev_aux,
)

0
shared/nm-udev-aux/nm-udev-utils.c → src/libnm-udev-aux/nm-udev-utils.c
View file

0
shared/nm-udev-aux/nm-udev-utils.h → src/libnm-udev-aux/nm-udev-utils.h
View file

2
src/meson.build
View file

@ -3,6 +3,8 @@
src_inc = include_directories('.')
subdir('libnm-systemd-shared')
subdir('libnm-udev-aux')
subdir('libnm-base')
subdir('libnm-platform')
subdir('libnm-core-public')
subdir('libnm-core-intern')

2
tools/check-tree.sh
View file

@ -19,6 +19,6 @@ check_cmp() {
die "files \"$a\" and \"$b\" differ!"
}
check_cmp shared/nm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h
check_cmp src/libnm-base/nm-ethtool-utils-base.h libnm/nm-ethtool-utils.h
check_cmp src/libnm-core-intern/nm-meta-setting-base-impl.h clients/common/nm-meta-setting-base-impl.h
check_cmp src/libnm-core-impl/nm-meta-setting-base-impl.c clients/common/nm-meta-setting-base-impl.c