shared: move "nm-vpn-plugin-utils.c" to "src/contrib/"

This file is not actually to be used by NetworkManager itself.
Instead, every (glib based) VPN plugin will want something like this,
hence we have a copy here.

Move it to a new directory "src/contrib/".

Makefile.am

@@ -1309,7 +1309,7 @@ $(dispatcher_libnm_dispatcher_core_la_OBJECTS):                             $(sr
 $(dispatcher_nm_dispatcher_OBJECTS):                                        $(src_libnm_core_public_mkenums_h)
 $(src_libnm_core_impl_libnm_core_impl_la_OBJECTS):                          $(src_libnm_core_public_mkenums_h)
 $(src_libnm_client_impl_libnm_la_OBJECTS):                                  $(src_libnm_core_public_mkenums_h)
-$(src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):      $(src_libnm_core_public_mkenums_h)
+$(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):                $(src_libnm_core_public_mkenums_h)
 $(src_core_NetworkManager_OBJECTS):                                         $(src_libnm_core_public_mkenums_h)
 $(src_core_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS):               $(src_libnm_core_public_mkenums_h)
 $(src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS):     $(src_libnm_core_public_mkenums_h)
@@ -1724,7 +1724,7 @@ nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm-
 $(dispatcher_nm_dispatcher_OBJECTS):                                    $(src_libnm_client_public_mkenums_h)
 $(dispatcher_libnm_dispatcher_core_la_OBJECTS):                         $(src_libnm_client_public_mkenums_h)
 $(src_libnm_client_impl_libnm_la_OBJECTS):                              $(src_libnm_client_public_mkenums_h)
-$(src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):  $(src_libnm_core_public_mkenums_h)
+$(src_contrib_tests_libnm_vpn_plugin_utils_test_la_OBJECTS):            $(src_libnm_client_public_mkenums_h)
 
 src_libnm_client_impl_libnm_la_CPPFLAGS = \
 	-I$(builddir)/src/libnm-client-public \
@@ -1926,20 +1926,22 @@ $(src_libnm_client_impl_tests_test_nm_client_OBJECTS):              $(src_libnm_
 $(src_libnm_client_impl_tests_test_remote_settings_client_OBJECTS): $(src_libnm_client_impl_NM_1_0_typelib)
 $(src_libnm_client_impl_tests_test_secret_agent_OBJECTS):           $(src_libnm_client_impl_NM_1_0_typelib)
 
+EXTRA_DIST += \
+	src/libnm-client-impl/tests/meson.build
+
 ###############################################################################
 
 # just test, that we can build "nm-vpn-plugin-utils.c"
 
-check_ltlibraries += src/libnm-client-impl/tests/libnm-vpn-plugin-utils-test.la
+check_ltlibraries += src/contrib/tests/libnm-vpn-plugin-utils-test.la
 
-src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
-	shared/nm-utils/nm-vpn-plugin-utils.c \
-	shared/nm-utils/nm-vpn-plugin-utils.h \
+src_contrib_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
+	src/contrib/nm-vpn-plugin-utils.c \
+	src/contrib/nm-vpn-plugin-utils.h \
 	$(NULL)
 
-src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
+src_contrib_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	$(dflt_cppflags) \
-	-I$(srcdir)/shared \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
 	-I$(builddir)/src/libnm-core-public \
@@ -1950,12 +1952,14 @@ src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
-src_libnm_client_impl_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
+src_contrib_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
 EXTRA_DIST += \
-	src/libnm-client-impl/tests/meson.build
+	src/contrib/meson.build \
+	src/contrib/tests/meson.build \
+	$(NULL)
 
 ###############################################################################
 # src/core/
@@ -5520,8 +5524,6 @@ EXTRA_DIST += \
 	shared/nm-utils/nm-compat.h \
 	shared/nm-utils/nm-vpn-editor-plugin-call.h \
 	shared/nm-utils/nm-vpn-plugin-macros.h \
-	shared/nm-utils/nm-vpn-plugin-utils.c \
-	shared/nm-utils/nm-vpn-plugin-utils.h \
 	shared/meson.build \
 	\
 	src/meson.build \

po/POTFILES.skip

@@ -6,7 +6,7 @@ data/org.freedesktop.NetworkManager.policy.in
 examples/python/NetworkManager.py
 examples/python/systray/eggtrayicon.c
 shared/nm-utils/nm-vpn-editor-plugin-call.h
-shared/nm-utils/nm-vpn-plugin-utils.c
+src/contrib/nm-vpn-plugin-utils.c
 vpn-daemons/openvpn
 vpn-daemons/pptp
 vpn-daemons/vpnc

shared/meson.build

@@ -11,5 +11,3 @@ glib_nm_default_dep = declare_dependency(
     glib_dep,
   ],
 )
-
-nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c')

src/contrib/meson.build

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+nm_vpn_plugin_utils_source = files('nm-vpn-plugin-utils.c')

src/contrib/tests/meson.build

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# just test, that we can build "nm-vpn-plugin-utils.c"
+static_library(
+  'nm-vpn-plugin-utils-test',
+  sources: nm_vpn_plugin_utils_source,
+  dependencies: [
+    libnm_client_public_dep,
+    glib_dep,
+  ],
+)

src/libnm-client-impl/tests/meson.build

@@ -32,11 +32,3 @@ foreach test_unit: test_units
     args: test_args + [exe.full_path()],
   )
 endforeach
-
-# just test, that we can build "nm-vpn-plugin-utils.c"
-libnm_vpn_plugin_utils_test = static_library(
-  'nm-vpn-plugin-utils-test',
-  sources: nm_vpn_plugin_utils_source + [libnm_client_public_enum_sources[1]],
-  include_directories: libnm_client_public_inc,
-  dependencies: libnm_nm_default_dep,
-)

src/meson.build

@@ -107,6 +107,7 @@ subdir('libnm-client-public')
 subdir('libnm-client-impl')
 subdir('libnm-client-aux-extern')
 subdir('core')
+subdir('contrib')
 
 if enable_tests
   subdir('libnm-client-test')
@@ -114,4 +115,5 @@ if enable_tests
   subdir('libnm-platform/tests')
   subdir('libnm-core-impl/tests')
   subdir('libnm-client-impl/tests')
+  subdir('contrib/tests')
 endif