Commit 95621586 authored by Thomas Haller's avatar Thomas Haller

shared: move udev helper to separate directory "shared/nm-udev-aux"

We built (among others) two libraries from the sources in "shared/nm-utils":
"libnm-utils-base.la" and "libnm-utils-udev.la".

It's confusing. Instead use directories so there is a direct
correspondence between these internal libraries and the source files.

(cherry picked from commit 2973d682)
parent 0a6f21fb
......@@ -372,24 +372,24 @@ shared_nm_utils_libnm_utils_base_la_LIBADD = \
###############################################################################
noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-udev.la
noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la
shared_nm_utils_libnm_utils_udev_la_CPPFLAGS = \
shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
$(shared_nm_utils_libnm_utils_cppflags) \
$(LIBUDEV_CFLAGS) \
$(NULL)
shared_nm_utils_libnm_utils_udev_la_SOURCES = \
shared/nm-utils/nm-udev-utils.c \
shared/nm-utils/nm-udev-utils.h \
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 \
$(NULL)
shared_nm_utils_libnm_utils_udev_la_LDFLAGS = \
shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
$(SANITIZER_LIB_LDFLAGS) \
$(NULL)
shared_nm_utils_libnm_utils_udev_la_LIBADD = \
shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
$(GLIB_LIBS) \
$(LIBUDEV_LIBS) \
$(NULL)
......@@ -1255,7 +1255,7 @@ libnm_libnm_la_LIBADD = \
libnm/libnm-utils.la \
shared/systemd/libnm-systemd-shared.la \
shared/systemd/libnm-systemd-logging-stub.la \
shared/nm-utils/libnm-utils-udev.la \
shared/nm-udev-aux/libnm-udev-aux.la \
$(DL_LIBS) \
$(GLIB_LIBS) \
$(UUID_LIBS) \
......@@ -1895,7 +1895,7 @@ endif
src_libNetworkManagerBase_la_LIBADD = \
libnm-core/libnm-core.la \
$(libnm_crypto_lib) \
shared/nm-utils/libnm-utils-udev.la \
shared/nm-udev-aux/libnm-udev-aux.la \
shared/nm-utils/libnm-utils-base.la \
$(GLIB_LIBS) \
$(SYSTEMD_JOURNAL_LIBS) \
......@@ -4895,7 +4895,7 @@ libnm_glib_libnm_glib_la_LDFLAGS = \
libnm_glib_libnm_glib_la_LIBADD = \
libnm-util/libnm-util.la \
libnm-glib/libdeprecated-nm-glib.la \
shared/nm-utils/libnm-utils-udev.la \
shared/nm-udev-aux/libnm-udev-aux.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(LIBUDEV_LIBS) \
......
......@@ -146,7 +146,7 @@ deps = [
glib_dep,
shared_c_siphash_dep,
shared_nm_utils_base_dep,
shared_nm_utils_udev_dep,
shared_nm_udev_aux_dep,
]
cflags = [
......
......@@ -196,7 +196,7 @@ libnm_glib = shared_library(
dependencies: common_deps + [
libnm_util_dep,
libudev_dep,
shared_nm_utils_udev_dep,
shared_nm_udev_aux_dep,
],
c_args: cflags,
link_whole: libdeprecated_nm_glib,
......
......@@ -26,7 +26,7 @@
#include "NetworkManager.h"
#include "nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "nm-device-ethernet.h"
#include "nm-device-adsl.h"
#include "nm-device-wifi.h"
......
......@@ -40,7 +40,7 @@
#include "nm-dbus-helpers.h"
#include "nm-device-tun.h"
#include "nm-setting-connection.h"
#include "shared/nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "introspection/org.freedesktop.NetworkManager.Device.h"
......
......@@ -144,9 +144,9 @@ shared_nm_utils_base_dep = declare_dependency(
dependencies: glib_dep,
)
shared_nm_utils_udev = static_library(
'nm-utils-udev',
sources: files('nm-utils/nm-udev-utils.c'),
shared_nm_udev_aux = static_library(
'nm-udev-aux',
sources: files('nm-udev-aux/nm-udev-utils.c'),
c_args: shared_nm_utils_c_args,
include_directories: [
top_inc,
......@@ -159,8 +159,8 @@ shared_nm_utils_udev = static_library(
],
)
shared_nm_utils_udev_dep = declare_dependency(
link_with: shared_nm_utils_udev,
shared_nm_udev_aux_dep = declare_dependency(
link_with: shared_nm_udev_aux,
include_directories: [
top_inc,
shared_inc,
......
......@@ -27,7 +27,7 @@
#include "nm-device-adsl.h"
#include "devices/nm-device-factory.h"
#include "platform/nm-platform.h"
#include "nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
/*****************************************************************************/
......
......@@ -48,7 +48,7 @@
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceEthernet);
......
......@@ -24,7 +24,7 @@
#include <libudev.h>
#include "nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
/*****************************************************************************/
......
......@@ -59,7 +59,7 @@
#include "wifi/nm-wifi-utils-wext.h"
#include "wpan/nm-wpan-utils.h"
#include "nm-utils/nm-io-utils.h"
#include "nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
/*****************************************************************************/
......
......@@ -39,7 +39,7 @@
#include "nm-utils.h"
#include "nm-core-internal.h"
#include "nm-utils/nm-dedup-multi.h"
#include "nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "nm-utils/nm-secret-utils.h"
#include "nm-core-utils.h"
......
......@@ -24,7 +24,7 @@
#include <linux/pkt_sched.h>
#include "platform/nmp-object.h"
#include "nm-utils/nm-udev-utils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#include "nm-test-utils-core.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment