build: move "clients/common/" to "src/libnmc-{base,setting}/"

14 files changed, 27 insertions, 27 deletions

diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index fbbf9790cf..a0b23dd19b 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -12,9 +12,9 @@
 
 #include "common.h"
 #include "utils.h"
-#include "nm-secret-agent-simple.h"
+#include "libnmc-base/nm-secret-agent-simple.h"
 #include "polkit-agent.h"
-#include "nm-polkit-listener.h"
+#include "libnmc-base/nm-polkit-listener.h"
 
 static void
 usage(void)
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 6e21559f99..9309e36738 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -15,8 +15,8 @@
 
 #include "libnm-client-aux-extern/nm-libnm-aux.h"
 
-#include "nm-vpn-helpers.h"
-#include "nm-client-utils.h"
+#include "libnmc-base/nm-vpn-helpers.h"
+#include "libnmc-base/nm-client-utils.h"
 #include "libnm-glib-aux/nm-secret-utils.h"
 
 #include "utils.h"
diff --git a/clients/cli/common.h b/clients/cli/common.h
index 70773ed318..f7e7181cc7 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -7,7 +7,7 @@
 #define NMC_COMMON_H
 
 #include "nmcli.h"
-#include "nm-secret-agent-simple.h"
+#include "libnmc-base/nm-secret-agent-simple.h"
 
 gboolean print_ip_config(NMIPConfig *     cfg,
                          int              addr_family,
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 97c50f5ba7..74a5b6e260 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -15,10 +15,10 @@
 #include <readline/history.h>
 #include <fcntl.h>
 
-#include "nm-client-utils.h"
-#include "nm-vpn-helpers.h"
-#include "nm-meta-setting-access.h"
-#include "nm-secret-agent-simple.h"
+#include "libnmc-base/nm-client-utils.h"
+#include "libnmc-base/nm-vpn-helpers.h"
+#include "libnmc-setting/nm-meta-setting-access.h"
+#include "libnmc-base/nm-secret-agent-simple.h"
 
 #include "utils.h"
 #include "common.h"
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index dd231448b7..6cd8d0d196 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -15,8 +15,8 @@
 #include "libnm-glib-aux/nm-secret-utils.h"
 #include "common.h"
 #include "connections.h"
-#include "nm-client-utils.h"
-#include "nm-secret-agent-simple.h"
+#include "libnmc-base/nm-client-utils.h"
+#include "libnmc-base/nm-secret-agent-simple.h"
 #include "polkit-agent.h"
 #include "utils.h"
 
diff --git a/clients/cli/general.c b/clients/cli/general.c
index 960d635874..f0b4309e59 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -9,7 +9,7 @@
 
 #include "libnm-core-aux-intern/nm-common-macros.h"
 
-#include "nm-client-utils.h"
+#include "libnmc-base/nm-client-utils.h"
 
 #include "polkit-agent.h"
 #include "utils.h"
diff --git a/clients/cli/generate-docs-nm-settings-nmcli.c b/clients/cli/generate-docs-nm-settings-nmcli.c
index da2eed6d79..cd1bb67099 100644
--- a/clients/cli/generate-docs-nm-settings-nmcli.c
+++ b/clients/cli/generate-docs-nm-settings-nmcli.c
@@ -2,7 +2,7 @@
 
 #include "libnm-client-aux-extern/nm-default-client.h"
 
-#include "nm-meta-setting-desc.h"
+#include "libnmc-setting/nm-meta-setting-desc.h"
 
 #define INDENT 4
 
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index 59ef4e14a4..708b8aad9b 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -22,13 +22,13 @@ executable(
     'utils.c',
   ),
   dependencies: [
-    libnmc_base_dep,
-    libnmc_dep,
     libnm_dep,
     glib_dep,
     readline_dep,
   ],
   link_with: [
+    libnmc_setting,
+    libnmc_base,
     libnm_client_aux_extern,
     libnm_core_aux_extern,
     libnm_core_aux_intern,
@@ -50,12 +50,12 @@ generate_docs_nm_settings_nmcli = executable(
     'generate-docs-nm-settings-nmcli.c',
   ),
   dependencies: [
-    libnmc_base_dep,
-    libnmc_dep,
     libnm_dep,
     glib_dep,
   ],
   link_with: [
+    libnmc_setting,
+    libnmc_base,
     libnm_core_aux_extern,
     libnm_core_aux_intern,
     libnm_base,
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 49ade6827b..e592e05482 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -18,7 +18,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-client-utils.h"
+#include "libnmc-base/nm-client-utils.h"
 
 #include "polkit-agent.h"
 #include "utils.h"
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index 718d777ff8..f130337879 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -6,8 +6,8 @@
 #ifndef NMC_NMCLI_H
 #define NMC_NMCLI_H
 
-#include "nm-secret-agent-simple.h"
-#include "nm-meta-setting-desc.h"
+#include "libnmc-base/nm-secret-agent-simple.h"
+#include "libnmc-setting/nm-meta-setting-desc.h"
 
 struct _NMPolkitListener;
 
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index 9f5de2077f..7776d7e7b2 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "nm-polkit-listener.h"
+#include "libnmc-base/nm-polkit-listener.h"
 #include "common.h"
 
 static char *
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 5258c03f3a..6c93c021f1 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -12,9 +12,9 @@
 
 #include "libnm-core-aux-intern/nm-common-macros.h"
 
-#include "nm-client-utils.h"
-#include "nm-vpn-helpers.h"
-#include "nm-meta-setting-access.h"
+#include "libnmc-base/nm-client-utils.h"
+#include "libnmc-base/nm-vpn-helpers.h"
+#include "libnmc-setting/nm-meta-setting-access.h"
 
 #include "utils.h"
 #include "common.h"
diff --git a/clients/cli/settings.h b/clients/cli/settings.h
index f103b8fd06..2dbe76074f 100644
--- a/clients/cli/settings.h
+++ b/clients/cli/settings.h
@@ -6,7 +6,7 @@
 #ifndef NMC_SETTINGS_H
 #define NMC_SETTINGS_H
 
-#include "nm-meta-setting-desc.h"
+#include "libnmc-setting/nm-meta-setting-desc.h"
 
 #include "nmcli.h"
 
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 537cf1f35a..6dd93f7b22 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -16,8 +16,8 @@
 #include <sys/auxv.h>
 #include <sys/prctl.h>
 
-#include "nm-client-utils.h"
-#include "nm-meta-setting-access.h"
+#include "libnmc-base/nm-client-utils.h"
+#include "libnmc-setting/nm-meta-setting-access.h"
 
 #include "common.h"
 #include "nmcli.h"