From d6681a0429582162f3717eb3efe3760f356aa451 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 24 Feb 2021 08:51:19 +0100
Subject: [PATCH] shared: move "nm-compat.[hc]" to "src/contrib/"

"nm-compat.h" is not intended to be used by NetworkManager itself.
Instead, it's intended to be copied into the source tree of VPN plugins,
as adapter for different libnm versions.

Move it to "src/contrib/".
---
 Makefile.am                                  | 5 ++---
 src/contrib/meson.build                      | 2 ++
 {shared/nm-utils => src/contrib}/nm-compat.c | 0
 {shared/nm-utils => src/contrib}/nm-compat.h | 0
 src/libnm-client-impl/tests/meson.build      | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename {shared/nm-utils => src/contrib}/nm-compat.c (100%)
 rename {shared/nm-utils => src/contrib}/nm-compat.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 1ba2b09ed0..75bc34c421 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1902,7 +1902,8 @@ src_libnm_client_impl_tests_test_remote_settings_client_CPPFLAGS = $(src_libnm_c
 src_libnm_client_impl_tests_test_secret_agent_CPPFLAGS = $(src_libnm_client_impl_tests_cppflags)
 
 src_libnm_client_impl_tests_test_libnm_SOURCES = \
-	shared/nm-utils/nm-compat.c \
+	src/contrib/nm-compat.c \
+	src/contrib/nm-compat.h \
 	src/libnm-client-impl/tests/test-libnm.c \
 	$(NULL)
 
@@ -5521,8 +5522,6 @@ EXTRA_DIST += \
 	\
 	po/meson.build \
 	\
-	shared/nm-utils/nm-compat.c \
-	shared/nm-utils/nm-compat.h \
 	shared/meson.build \
 	\
 	src/meson.build \
diff --git a/src/contrib/meson.build b/src/contrib/meson.build
index 023eb66b51..2745087a0b 100644
--- a/src/contrib/meson.build
+++ b/src/contrib/meson.build
@@ -1,3 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 nm_vpn_plugin_utils_source = files('nm-vpn-plugin-utils.c')
+
+src_contrib_nm_compat_source = files('nm-compat.c')
diff --git a/shared/nm-utils/nm-compat.c b/src/contrib/nm-compat.c
similarity index 100%
rename from shared/nm-utils/nm-compat.c
rename to src/contrib/nm-compat.c
diff --git a/shared/nm-utils/nm-compat.h b/src/contrib/nm-compat.h
similarity index 100%
rename from shared/nm-utils/nm-compat.h
rename to src/contrib/nm-compat.h
diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build
index a1cc19b3e7..3f7bf3a067 100644
--- a/src/libnm-client-impl/tests/meson.build
+++ b/src/libnm-client-impl/tests/meson.build
@@ -10,7 +10,7 @@ test_units = [
 foreach test_unit: test_units
   exe = executable(
     test_unit,
-    test_unit + '.c',
+    [ test_unit + '.c' ] + (test_unit == 'test-libnm' ? src_contrib_nm_compat_source : []),
     include_directories: [
       libnm_client_public_inc,
     ],