Commit 4b288136 authored by Thomas Haller's avatar Thomas Haller
Browse files

shared: move shared files to subdirectory "shared/nm-utils/"

The "shared" directory contains files that are possibly used by all components
of NetworkManager repository.

Some of these files are even copied as-is to other projects (VPN plugins, nm-applet)
and used there without modification. Move those files to a separate directory.
By moving them to a common directory, it is clearer that they belong
together. Also, you can easier compare the copied versions to their
original via

  $ diff -r ./shared/nm-utils/ /path/to/nm-vpn-plugin/shared/nm-utils/
parent b6b84d04
......@@ -28,7 +28,7 @@
#include "nm-dispatcher-utils.h"
#include "nm-dispatcher-api.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
/*******************************************/
......
......@@ -52,7 +52,7 @@ libnm_core_headers = \
$(core)/nm-vpn-plugin-info.h
libnm_core_private_headers = \
$(top_builddir)/shared/nm-shared-utils.h \
$(top_builddir)/shared/nm-utils/nm-shared-utils.h \
$(core)/crypto.h \
$(core)/nm-connection-private.h \
$(core)/nm-core-internal.h \
......@@ -64,7 +64,7 @@ libnm_core_private_headers = \
$(core)/nm-utils-private.h
libnm_core_sources = \
$(top_builddir)/shared/nm-shared-utils.c \
$(top_builddir)/shared/nm-utils/nm-shared-utils.c \
$(core_build)/nm-core-enum-types.c \
$(core)/crypto.c \
$(core)/nm-connection.c \
......
......@@ -26,7 +26,7 @@
#include "nm-property-compare.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
static void
compare_ints (void)
......
......@@ -33,7 +33,7 @@
#include "nm-errors.h"
#include "nm-core-internal.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
#if 0
static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----";
......
......@@ -62,7 +62,7 @@
#include "test-general-enums.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
/* When passing a "bool" typed argument to a variadic function that
* expects a gboolean, the compiler will promote the integer type
......
......@@ -28,7 +28,7 @@
#include "nm-setting-wired.h"
#include "nm-setting-8021x.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
#define TEST_WIRED_TLS_CA_CERT TEST_CERT_DIR"/test-ca-cert.pem"
......
......@@ -38,7 +38,7 @@
#include "nm-utils.h"
#include "nm-core-internal.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
#define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem"
......
......@@ -27,7 +27,7 @@
#include "nm-setting-connection.h"
#include "nm-setting-8021x.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
static void
compare_blob_data (const char *test,
......
......@@ -26,7 +26,7 @@
#include "nm-setting-connection.h"
#include "nm-errors.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
static void
create_bond_connection (NMConnection **con, NMSettingBond **s_bond)
......
......@@ -28,7 +28,7 @@
#include "nm-connection.h"
#include "nm-errors.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
#define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \
NM_SETTING_DCB_FLAG_ADVERTISE | \
......
......@@ -38,7 +38,7 @@
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
static void
test_defaults (GType type, const char *name)
......
......@@ -62,7 +62,7 @@ nodist_libnm_util_include_HEADERS = \
nm-utils-enum-types.h
libnm_util_la_private_headers = \
$(top_builddir)/shared/nm-shared-utils.h \
$(top_builddir)/shared/nm-utils/nm-shared-utils.h \
crypto.h \
nm-dbus-glib-types.h \
nm-gvaluearray-compat.h \
......@@ -71,7 +71,7 @@ libnm_util_la_private_headers = \
nm-utils-private.h
libnm_util_la_csources = \
$(top_builddir)/shared/nm-shared-utils.c \
$(top_builddir)/shared/nm-utils/nm-shared-utils.c \
crypto.c \
nm-connection.c \
nm-param-spec-specialized.c \
......
......@@ -31,7 +31,7 @@
#include "crypto.h"
#include "nm-utils.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
#if 0
static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----";
......
......@@ -47,7 +47,7 @@
#include "nm-utils.h"
#include "nm-dbus-glib-types.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
static void
vpn_check_func (const char *key, const char *value, gpointer user_data)
......
......@@ -37,7 +37,7 @@
#include "nm-setting-pppoe.h"
#include "nm-setting-vpn.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
#define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem"
......
......@@ -27,7 +27,7 @@
#include "nm-setting-connection.h"
#include "nm-setting-8021x.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
static void
compare_blob_data (const char *test,
......
......@@ -27,7 +27,7 @@
#include "nm-default.h"
#include "nm-setting-dcb.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
#define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \
NM_SETTING_DCB_FLAG_ADVERTISE | \
......
......@@ -38,7 +38,7 @@
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
static void
test_defaults (GType type, const char *name)
......
......@@ -1312,5 +1312,5 @@ nm_vpn_service_plugin_initable_iface_init (GInitableIface *iface)
/* this header is intended to be copied to users of nm_vpn_editor_plugin_call(),
* to simplify invocation of generic functions. Include it here, to complile
* the code. */
#include "nm-vpn-editor-plugin-call.h"
#include "nm-utils/nm-vpn-editor-plugin-call.h"
......@@ -140,7 +140,7 @@ libnm/nm-remote-settings.c
libnm/nm-vpn-plugin-old.c
libnm/nm-vpn-service-plugin.c
policy/org.freedesktop.NetworkManager.policy.in.in
shared/nm-shared-utils.c
shared/nm-utils/nm-shared-utils.c
src/NetworkManagerUtils.c
src/main.c
src/main-utils.c
......
......@@ -6,6 +6,6 @@ vpn-daemons/openvpn
vpn-daemons/pptp
vpn-daemons/vpnc
contrib/fedora/rpm/
shared/nm-vpn-editor-plugin-call.h
shared/nm-utils/nm-vpn-editor-plugin-call.h
# https://bugs.launchpad.net/intltool/+bug/1117944
sub/policy/org.freedesktop.NetworkManager.policy.in
EXTRA_DIST = \
gsystem-local-alloc.h \
nm-utils/gsystem-local-alloc.h \
nm-utils/nm-glib.h \
nm-utils/nm-macros-internal.h \
nm-utils/nm-shared-utils.c \
nm-utils/nm-shared-utils.h \
nm-utils/nm-test-utils.h \
nm-utils/nm-vpn-editor-plugin-call.h \
nm-common-macros.h \
nm-dbus-compat.h \
nm-default.h \
nm-glib.h \
nm-macros-internal.h \
nm-shared-utils.c \
nm-shared-utils.h \
nm-test-libnm-utils.h \
nm-test-utils.h \
nm-test-utils-impl.c \
nm-version-macros.h.in \
nm-vpn-editor-plugin-call.h
$(NULL)
CLEANFILES=nm-version.h
......@@ -98,11 +98,11 @@ _nm_g_return_if_fail_warning (const char *log_domain,
/*****************************************************************************/
#include "nm-glib.h"
#include "nm-utils/nm-glib.h"
#include "nm-version.h"
#include "gsystem-local-alloc.h"
#include "nm-macros-internal.h"
#include "nm-shared-utils.h"
#include "nm-utils/gsystem-local-alloc.h"
#include "nm-utils/nm-macros-internal.h"
#include "nm-utils/nm-shared-utils.h"
/*****************************************************************************/
......
......@@ -20,7 +20,7 @@
#include "NetworkManager.h"
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.h"
/*****************************************************************************/
......
......@@ -26,7 +26,7 @@
#define _NMTST_INSIDE_CORE 1
#include "nm-test-utils.h"
#include "nm-utils/nm-test-utils.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