summaryrefslogtreecommitdiff
path: root/src/nm-test-utils-core.h
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-04-15 08:16:00 +0200
committerThomas Haller <thaller@redhat.com>2019-04-18 19:57:27 +0200
commitd984b2ce4a119428c2003120ea306198ba068df2 (patch)
tree69fa5e8707d38371cb8553279b4d1cf3c0fb5f6a /src/nm-test-utils-core.h
parent956215868cf4eb7809c9c823a9f2c2f0a7d20176 (diff)
downloadNetworkManager-d984b2ce4a119428c2003120ea306198ba068df2.tar.gz
shared: move most of "shared/nm-utils" to "shared/nm-glib-aux"
From the files under "shared/nm-utils" we build an internal library that provides glib-based helper utilities. Move the files of that basic library to a new subdirectory "shared/nm-glib-aux" and rename the helper library "libnm-core-base.la" to "libnm-glib-aux.la". Reasons: - the name "utils" is overused in our code-base. Everything's an "utils". Give this thing a more distinct name. - there were additional files under "shared/nm-utils", which are not part of this internal library "libnm-utils-base.la". All the files that are part of this library should be together in the same directory, but files that are not, should not be there. - the new name should better convey what this library is and what is isn't: it's a set of utilities and helper functions that extend glib with funcitonality that we commonly need. There are still some files left under "shared/nm-utils". They have less a unifying propose to be in their own directory, so I leave them there for now. But at least they are separate from "shared/nm-glib-aux", which has a very clear purpose. (cherry picked from commit 80db06f768e47541eae7d66ef48fbe47bf1a69ce)
Diffstat (limited to 'src/nm-test-utils-core.h')
-rw-r--r--src/nm-test-utils-core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-test-utils-core.h b/src/nm-test-utils-core.h
index dbfe71ada3..7f8b3327a0 100644
--- a/src/nm-test-utils-core.h
+++ b/src/nm-test-utils-core.h
@@ -310,7 +310,7 @@ nmtst_platform_ip6_routes_equal_aptr (const NMPObject *const*a, const NMPlatform
#ifdef __NETWORKMANAGER_IP4_CONFIG_H__
-#include "nm-utils/nm-dedup-multi.h"
+#include "nm-glib-aux/nm-dedup-multi.h"
static inline NMIP4Config *
nmtst_ip4_config_new (int ifindex)
@@ -324,7 +324,7 @@ nmtst_ip4_config_new (int ifindex)
#ifdef __NETWORKMANAGER_IP6_CONFIG_H__
-#include "nm-utils/nm-dedup-multi.h"
+#include "nm-glib-aux/nm-dedup-multi.h"
static inline NMIP6Config *
nmtst_ip6_config_new (int ifindex)