libnm: add "nm-keyfile.h" header

Keyfile API will become part of public libnm API. Add "nm-keyfile.h"
header for that.

8 files changed, 29 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 61437e4cbf..592c3c90b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -925,6 +925,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-core-types.h \
 	libnm-core/nm-dbus-interface.h \
 	libnm-core/nm-errors.h \
+	libnm-core/nm-keyfile.h \
 	libnm-core/nm-setting-6lowpan.h \
 	libnm-core/nm-setting-8021x.h \
 	libnm-core/nm-setting-adsl.h \
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index 0509deaa54..2df54f918e 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -18,6 +18,7 @@ libnm_core_headers = files(
   'nm-core-types.h',
   'nm-dbus-interface.h',
   'nm-errors.h',
+  'nm-keyfile.h',
   'nm-setting-6lowpan.h',
   'nm-setting-8021x.h',
   'nm-setting-adsl.h',
diff --git a/libnm-core/nm-keyfile.h b/libnm-core/nm-keyfile.h
new file mode 100644
index 0000000000..1b1058c28c
--- /dev/null
+++ b/libnm-core/nm-keyfile.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: LGPL-2.1+
+
+#ifndef __NM_KEYFILE_H__
+#define __NM_KEYFILE_H__
+
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
+#endif
+
+#include "nm-core-types.h"
+
+G_BEGIN_DECLS
+
+G_END_DECLS
+
+#endif /* __NM_KEYFILE_H__ */
diff --git a/libnm-core/nm-keyfile/nm-keyfile-internal.h b/libnm-core/nm-keyfile/nm-keyfile-internal.h
index a0a153d75c..10fc4393be 100644
--- a/libnm-core/nm-keyfile/nm-keyfile-internal.h
+++ b/libnm-core/nm-keyfile/nm-keyfile-internal.h
@@ -13,6 +13,8 @@
 
 #include <sys/types.h>
 
+#include "nm-keyfile.h"
+
 #include "nm-connection.h"
 #include "nm-setting-8021x.h"
 
diff --git a/libnm-core/nm-keyfile/nm-keyfile-utils.c b/libnm-core/nm-keyfile/nm-keyfile-utils.c
index 05a4412469..db2a2ea2d5 100644
--- a/libnm-core/nm-keyfile/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile/nm-keyfile-utils.c
@@ -11,11 +11,13 @@
 
 #include "nm-glib-aux/nm-str-buf.h"
 
-#include "nm-keyfile-internal.h"
+#include "nm-keyfile.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 
+#include "nm-keyfile-internal.h"
+
 /*****************************************************************************/
 
 /**
diff --git a/libnm-core/nm-keyfile/nm-keyfile.c b/libnm-core/nm-keyfile/nm-keyfile.c
index 4c09039d07..1c979c1d8e 100644
--- a/libnm-core/nm-keyfile/nm-keyfile.c
+++ b/libnm-core/nm-keyfile/nm-keyfile.c
@@ -20,11 +20,13 @@
 #include "nm-glib-aux/nm-secret-utils.h"
 #include "systemd/nm-sd-utils-shared.h"
 #include "nm-libnm-core-intern/nm-common-macros.h"
-#include "nm-core-internal.h"
-#include "nm-keyfile-utils.h"
 
+#include "nm-core-internal.h"
+#include "nm-keyfile.h"
 #include "nm-setting-user.h"
 
+#include "nm-keyfile-utils.h"
+
 /*****************************************************************************/
 
 typedef struct _ParseInfoProperty ParseInfoProperty;
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index e9cfad32b6..9193a08a0f 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -45,6 +45,7 @@
 #include "nm-dhcp-config.h"
 #include "nm-enum-types.h"
 #include "nm-ip-config.h"
+#include "nm-keyfile.h"
 #include "nm-object.h"
 #include "nm-remote-connection.h"
 #include "nm-setting-6lowpan.h"
diff --git a/libnm/meson.build b/libnm/meson.build
index d3991ab19c..9cfdb5433b 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -138,6 +138,7 @@ deps = [
   libnmdbus_dep,
   libnm_libnm_core_intern_dep,
   libnm_nm_default_dep,
+  libnm_keyfile_dep,
   libnm_udev_aux_dep,
   libudev_dep,
 ]