build: move "clients/tui/newt/" to "src/libnmt-newt/"

68 files changed, 89 insertions, 93 deletions

diff --git a/Makefile.am b/Makefile.am
index 618b769b07..ab4b176573 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4848,65 +4848,75 @@ EXTRA_DIST += \
 	src/libnmc-setting/tests/meson.build
 
 ###############################################################################
-# clients/tui
+# src/libnmt-newt
 ###############################################################################
 
 if BUILD_NMTUI
 
-noinst_LIBRARIES += clients/tui/newt/libnmt-newt.a
-
-clients_tui_newt_libnmt_newt_a_SOURCES = \
-	clients/tui/newt/nmt-newt.h \
-	clients/tui/newt/nmt-newt-types.h \
-	clients/tui/newt/nmt-newt-button.c \
-	clients/tui/newt/nmt-newt-button.h \
-	clients/tui/newt/nmt-newt-button-box.c \
-	clients/tui/newt/nmt-newt-button-box.h \
-	clients/tui/newt/nmt-newt-checkbox.c \
-	clients/tui/newt/nmt-newt-checkbox.h \
-	clients/tui/newt/nmt-newt-component.c \
-	clients/tui/newt/nmt-newt-component.h \
-	clients/tui/newt/nmt-newt-container.c \
-	clients/tui/newt/nmt-newt-container.h \
-	clients/tui/newt/nmt-newt-entry.c \
-	clients/tui/newt/nmt-newt-entry.h \
-	clients/tui/newt/nmt-newt-entry-numeric.c \
-	clients/tui/newt/nmt-newt-entry-numeric.h \
-	clients/tui/newt/nmt-newt-form.c \
-	clients/tui/newt/nmt-newt-form.h \
-	clients/tui/newt/nmt-newt-grid.c \
-	clients/tui/newt/nmt-newt-grid.h \
-	clients/tui/newt/nmt-newt-hacks.c \
-	clients/tui/newt/nmt-newt-hacks.h \
-	clients/tui/newt/nmt-newt-label.c \
-	clients/tui/newt/nmt-newt-label.h \
-	clients/tui/newt/nmt-newt-listbox.c \
-	clients/tui/newt/nmt-newt-listbox.h \
-	clients/tui/newt/nmt-newt-popup.c \
-	clients/tui/newt/nmt-newt-popup.h \
-	clients/tui/newt/nmt-newt-section.c \
-	clients/tui/newt/nmt-newt-section.h \
-	clients/tui/newt/nmt-newt-separator.c \
-	clients/tui/newt/nmt-newt-separator.h \
-	clients/tui/newt/nmt-newt-stack.c \
-	clients/tui/newt/nmt-newt-stack.h \
-	clients/tui/newt/nmt-newt-textbox.c \
-	clients/tui/newt/nmt-newt-textbox.h \
-	clients/tui/newt/nmt-newt-toggle-button.c \
-	clients/tui/newt/nmt-newt-toggle-button.h \
-	clients/tui/newt/nmt-newt-utils.c \
-	clients/tui/newt/nmt-newt-utils.h \
-	clients/tui/newt/nmt-newt-widget.c \
-	clients/tui/newt/nmt-newt-widget.h \
-	$(NULL)
-
-clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
+noinst_LIBRARIES += src/libnmt-newt/libnmt-newt.a
+
+src_libnmt_newt_libnmt_newt_a_SOURCES = \
+	src/libnmt-newt/nmt-newt-button-box.c \
+	src/libnmt-newt/nmt-newt-button-box.h \
+	src/libnmt-newt/nmt-newt-button.c \
+	src/libnmt-newt/nmt-newt-button.h \
+	src/libnmt-newt/nmt-newt-checkbox.c \
+	src/libnmt-newt/nmt-newt-checkbox.h \
+	src/libnmt-newt/nmt-newt-component.c \
+	src/libnmt-newt/nmt-newt-component.h \
+	src/libnmt-newt/nmt-newt-container.c \
+	src/libnmt-newt/nmt-newt-container.h \
+	src/libnmt-newt/nmt-newt-entry-numeric.c \
+	src/libnmt-newt/nmt-newt-entry-numeric.h \
+	src/libnmt-newt/nmt-newt-entry.c \
+	src/libnmt-newt/nmt-newt-entry.h \
+	src/libnmt-newt/nmt-newt-form.c \
+	src/libnmt-newt/nmt-newt-form.h \
+	src/libnmt-newt/nmt-newt-grid.c \
+	src/libnmt-newt/nmt-newt-grid.h \
+	src/libnmt-newt/nmt-newt-hacks.c \
+	src/libnmt-newt/nmt-newt-hacks.h \
+	src/libnmt-newt/nmt-newt-label.c \
+	src/libnmt-newt/nmt-newt-label.h \
+	src/libnmt-newt/nmt-newt-listbox.c \
+	src/libnmt-newt/nmt-newt-listbox.h \
+	src/libnmt-newt/nmt-newt-popup.c \
+	src/libnmt-newt/nmt-newt-popup.h \
+	src/libnmt-newt/nmt-newt-section.c \
+	src/libnmt-newt/nmt-newt-section.h \
+	src/libnmt-newt/nmt-newt-separator.c \
+	src/libnmt-newt/nmt-newt-separator.h \
+	src/libnmt-newt/nmt-newt-stack.c \
+	src/libnmt-newt/nmt-newt-stack.h \
+	src/libnmt-newt/nmt-newt-textbox.c \
+	src/libnmt-newt/nmt-newt-textbox.h \
+	src/libnmt-newt/nmt-newt-toggle-button.c \
+	src/libnmt-newt/nmt-newt-toggle-button.h \
+	src/libnmt-newt/nmt-newt-types.h \
+	src/libnmt-newt/nmt-newt-utils.c \
+	src/libnmt-newt/nmt-newt-utils.h \
+	src/libnmt-newt/nmt-newt-widget.c \
+	src/libnmt-newt/nmt-newt-widget.h \
+	src/libnmt-newt/nmt-newt.h \
+	$(NULL)
+
+src_libnmt_newt_libnmt_newt_a_CPPFLAGS = \
 	$(clients_cppflags) \
 	$(NEWT_CFLAGS) \
 	$(NULL)
 
-$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(src_libnm_client_public_mkenums_h)
+$(src_libnmt_newt_libnmt_newt_a_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_libnmt_newt_libnmt_newt_a_OBJECTS): $(src_libnm_client_public_mkenums_h)
+
+endif
+
+EXTRA_DIST += src/libnmt-newt/meson.build
+
+###############################################################################
+# clients/tui
+###############################################################################
+
+if BUILD_NMTUI
 
 bin_PROGRAMS += clients/tui/nmtui
 
@@ -4996,7 +5006,6 @@ clients_tui_nmtui_SOURCES = \
 	$(NULL)
 
 clients_tui_nmtui_CPPFLAGS = \
-	-I$(srcdir)/clients/tui/newt \
 	$(clients_cppflags) \
 	$(NEWT_CFLAGS) \
 	$(NULL)
@@ -5006,7 +5015,7 @@ clients_tui_nmtui_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
 
 clients_tui_nmtui_LDADD = \
-	clients/tui/newt/libnmt-newt.a \
+	src/libnmt-newt/libnmt-newt.a \
 	src/libnmc-setting/libnmc-setting.la \
 	src/libnmc-base/libnmc-base.la \
 	src/libnm-client-aux-extern/libnm-client-aux-extern.la \
@@ -5042,9 +5051,7 @@ uninstall_hook += uninstall-hook-nmtui
 
 endif
 
-EXTRA_DIST += \
-	clients/tui/meson.build \
-	clients/tui/newt/meson.build
+EXTRA_DIST += clients/tui/meson.build
 
 ###############################################################################
 # clients/nm-cloud-setup
diff --git a/clients/tui/meson.build b/clients/tui/meson.build
index 29c608b7fa..1043c6619c 100644
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-subdir('newt')
-
 executable(
   'nmtui',
   files(
@@ -47,11 +45,11 @@ executable(
     'nmt-widget-list.c',
   ),
   dependencies: [
-    libnmt_newt_dep,
     libnm_dep,
     glib_dep,
   ],
   link_with: [
+    libnmt_newt,
     libnmc_setting,
     libnmc_base,
     libnm_client_aux_extern,
diff --git a/clients/tui/nmt-connect-connection-list.h b/clients/tui/nmt-connect-connection-list.h
index e36fd26384..15a319b13f 100644
--- a/clients/tui/nmt-connect-connection-list.h
+++ b/clients/tui/nmt-connect-connection-list.h
@@ -6,7 +6,7 @@
 #ifndef NMT_CONNECT_CONNECTION_LIST_H
 #define NMT_CONNECT_CONNECTION_LIST_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_CONNECT_CONNECTION_LIST (nmt_connect_connection_list_get_type())
 #define NMT_CONNECT_CONNECTION_LIST(obj) \
diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h
index 46ea8530e6..824f767a79 100644
--- a/clients/tui/nmt-edit-connection-list.h
+++ b/clients/tui/nmt-edit-connection-list.h
@@ -6,7 +6,7 @@
 #ifndef NMT_EDIT_CONNECTION_LIST_H
 #define NMT_EDIT_CONNECTION_LIST_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_EDIT_CONNECTION_LIST (nmt_edit_connection_list_get_type())
 #define NMT_EDIT_CONNECTION_LIST(obj) \
diff --git a/clients/tui/nmt-editor-grid.h b/clients/tui/nmt-editor-grid.h
index 76b0d420ff..39a860672d 100644
--- a/clients/tui/nmt-editor-grid.h
+++ b/clients/tui/nmt-editor-grid.h
@@ -6,7 +6,7 @@
 #ifndef NMT_EDITOR_GRID_H
 #define NMT_EDITOR_GRID_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_EDITOR_GRID (nmt_editor_grid_get_type())
 #define NMT_EDITOR_GRID(obj) \
diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c
index c95fc6ff9c..3fbfe7a31d 100644
--- a/clients/tui/nmt-editor-section.c
+++ b/clients/tui/nmt-editor-section.c
@@ -13,7 +13,7 @@
 #include "libnm-client-aux-extern/nm-default-client.h"
 
 #include "nmt-editor-section.h"
-#include "nmt-newt-toggle-button.h"
+#include "libnmt-newt/nmt-newt-toggle-button.h"
 
 G_DEFINE_TYPE(NmtEditorSection, nmt_editor_section, NMT_TYPE_NEWT_SECTION)
 
diff --git a/clients/tui/nmt-editor-section.h b/clients/tui/nmt-editor-section.h
index 71c39e9e78..b7baf82165 100644
--- a/clients/tui/nmt-editor-section.h
+++ b/clients/tui/nmt-editor-section.h
@@ -6,7 +6,7 @@
 #ifndef NMT_EDITOR_SECTION_H
 #define NMT_EDITOR_SECTION_H
 
-#include "nmt-newt-section.h"
+#include "libnmt-newt/nmt-newt-section.h"
 #include "nmt-editor-grid.h"
 
 #define NMT_TYPE_EDITOR_SECTION (nmt_editor_section_get_type())
diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h
index 964ff83ef5..49fe89d38f 100644
--- a/clients/tui/nmt-editor.h
+++ b/clients/tui/nmt-editor.h
@@ -6,7 +6,7 @@
 #ifndef NMT_EDITOR_H
 #define NMT_EDITOR_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_EDITOR            (nmt_editor_get_type())
 #define NMT_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), NMT_TYPE_EDITOR, NmtEditor))
diff --git a/clients/tui/nmt-ip-entry.h b/clients/tui/nmt-ip-entry.h
index 26ec1967f8..1489326d36 100644
--- a/clients/tui/nmt-ip-entry.h
+++ b/clients/tui/nmt-ip-entry.h
@@ -6,7 +6,7 @@
 #ifndef NMT_IP_ENTRY_H
 #define NMT_IP_ENTRY_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_IP_ENTRY (nmt_ip_entry_get_type())
 #define NMT_IP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NMT_TYPE_IP_ENTRY, NmtIPEntry))
diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index 74014f2c8e..0ed5a28cbd 100644
--- a/clients/tui/nmt-mac-entry.h
+++ b/clients/tui/nmt-mac-entry.h
@@ -7,7 +7,7 @@
 #define NMT_MAC_ENTRY_H
 
 #include "nm-utils.h"
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 typedef enum { /*< skip >*/
                NMT_MAC_ENTRY_TYPE_MAC,
diff --git a/clients/tui/nmt-mtu-entry.h b/clients/tui/nmt-mtu-entry.h
index 5ce17cd333..4654dabfca 100644
--- a/clients/tui/nmt-mtu-entry.h
+++ b/clients/tui/nmt-mtu-entry.h
@@ -6,7 +6,7 @@
 #ifndef NMT_MTU_ENTRY_H
 #define NMT_MTU_ENTRY_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_MTU_ENTRY (nmt_mtu_entry_get_type())
 #define NMT_MTU_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NMT_TYPE_MTU_ENTRY, NmtMtuEntry))
diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c
index b7cb554092..ffa1a8b20b 100644
--- a/clients/tui/nmt-page-ppp.c
+++ b/clients/tui/nmt-page-ppp.c
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 
 #include "nmt-page-ppp.h"
-#include "nmt-newt-section.h"
-#include "nmt-newt-separator.h"
+#include "libnmt-newt/nmt-newt-section.h"
+#include "libnmt-newt/nmt-newt-separator.h"
 
 G_DEFINE_TYPE(NmtPagePpp, nmt_page_ppp, NMT_TYPE_EDITOR_PAGE)
 
diff --git a/clients/tui/nmt-password-dialog.h b/clients/tui/nmt-password-dialog.h
index ef99b299a3..77e8f292cc 100644
--- a/clients/tui/nmt-password-dialog.h
+++ b/clients/tui/nmt-password-dialog.h
@@ -6,7 +6,7 @@
 #ifndef NMT_PASSWORD_DIALOG_H
 #define NMT_PASSWORD_DIALOG_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_PASSWORD_DIALOG (nmt_password_dialog_get_type())
 #define NMT_PASSWORD_DIALOG(obj) \
diff --git a/clients/tui/nmt-password-fields.h b/clients/tui/nmt-password-fields.h
index 5566173731..3e3d8145bd 100644
--- a/clients/tui/nmt-password-fields.h
+++ b/clients/tui/nmt-password-fields.h
@@ -6,7 +6,7 @@
 #ifndef NMT_PASSWORD_FIELDS_H
 #define NMT_PASSWORD_FIELDS_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_PASSWORD_FIELDS (nmt_password_fields_get_type())
 #define NMT_PASSWORD_FIELDS(obj) \
diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h
index 6c11a893ea..3255324f2b 100644
--- a/clients/tui/nmt-route-editor.h
+++ b/clients/tui/nmt-route-editor.h
@@ -6,7 +6,7 @@
 #ifndef NMT_ROUTE_EDITOR_H
 #define NMT_ROUTE_EDITOR_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_ROUTE_EDITOR (nmt_route_editor_get_type())
 #define NMT_ROUTE_EDITOR(obj) \
diff --git a/clients/tui/nmt-route-entry.h b/clients/tui/nmt-route-entry.h
index 641009f52c..102cb61cbd 100644
--- a/clients/tui/nmt-route-entry.h
+++ b/clients/tui/nmt-route-entry.h
@@ -6,7 +6,7 @@
 #ifndef NMT_ROUTE_ENTRY_H
 #define NMT_ROUTE_ENTRY_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_ROUTE_ENTRY (nmt_route_entry_get_type())
 #define NMT_ROUTE_ENTRY(obj) \
diff --git a/clients/tui/nmt-route-table.h b/clients/tui/nmt-route-table.h
index 14b86bc803..fb29fd33f2 100644
--- a/clients/tui/nmt-route-table.h
+++ b/clients/tui/nmt-route-table.h
@@ -6,7 +6,7 @@
 #ifndef NMT_ROUTE_TABLE_H
 #define NMT_ROUTE_TABLE_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #define NMT_TYPE_ROUTE_TABLE (nmt_route_table_get_type())
 #define NMT_ROUTE_TABLE(obj) \
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 9c8ac47519..cd0c6c3c0b 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -25,7 +25,7 @@
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 G_DEFINE_TYPE(NmtWidgetList, nmt_widget_list, NMT_TYPE_NEWT_GRID)
 
diff --git a/clients/tui/nmt-widget-list.h b/clients/tui/nmt-widget-list.h
index 9a800dc039..1825c884b5 100644
--- a/clients/tui/nmt-widget-list.h
+++ b/clients/tui/nmt-widget-list.h
@@ -6,7 +6,7 @@
 #ifndef NMT_WIDGET_LIST_H
 #define NMT_WIDGET_LIST_H
 
-#include "nmt-newt-grid.h"
+#include "libnmt-newt/nmt-newt-grid.h"
 
 #define NMT_TYPE_WIDGET_LIST (nmt_widget_list_get_type())
 #define NMT_WIDGET_LIST(obj) \
diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c
index fc942419f2..4aa91acb44 100644
--- a/clients/tui/nmtui-connect.c
+++ b/clients/tui/nmtui-connect.c
@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #include "nmtui.h"
 #include "nmtui-connect.h"
diff --git a/clients/tui/nmtui-edit.h b/clients/tui/nmtui-edit.h
index 856cf6386a..99e370b40e 100644
--- a/clients/tui/nmtui-edit.h
+++ b/clients/tui/nmtui-edit.h
@@ -6,7 +6,7 @@
 #ifndef NMTUI_EDIT_H
 #define NMTUI_EDIT_H
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 typedef gboolean (*NmtAddConnectionTypeFilter)(GType connection_type, gpointer user_data);
 
diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c
index 1d93fd04ae..2f2524285d 100644
--- a/clients/tui/nmtui-hostname.c
+++ b/clients/tui/nmtui-hostname.c
@@ -12,7 +12,7 @@
 
 #include "libnm-client-aux-extern/nm-default-client.h"
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 
 #include "nmtui.h"
 #include "nmtui-hostname.h"
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 914b043470..5edf70e589 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -20,7 +20,7 @@
 
 #include "libnm-client-aux-extern/nm-libnm-aux.h"
 
-#include "nmt-newt.h"
+#include "libnmt-newt/nmt-newt.h"
 #include "nm-editor-bindings.h"
 
 #include "nmtui-edit.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cd3efbdb6b..754e5a47cb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ clients/cli/settings.c
 clients/cli/utils.c
 clients/cli/utils.h
 clients/nm-online.c
-clients/tui/newt/nmt-newt-utils.c
 clients/tui/nm-editor-utils.c
 clients/tui/nmt-connect-connection-list.c
 clients/tui/nmt-device-entry.c
@@ -183,3 +182,4 @@ src/libnmc-base/nm-vpn-helpers.c
 src/libnmc-setting/nm-meta-setting-access.c
 src/libnmc-setting/nm-meta-setting-desc.c
 src/libnmc-setting/settings-docs.h.in
+src/libnmt-newt/nmt-newt-utils.c
diff --git a/clients/tui/newt/meson.build b/src/libnmt-newt/meson.build
index acca1e9145..9a07fd58b0 100644
--- a/clients/tui/newt/meson.build
+++ b/src/libnmt-newt/meson.build
@@ -8,8 +8,8 @@ libnmt_newt = static_library(
     'nmt-newt-checkbox.c',
     'nmt-newt-component.c',
     'nmt-newt-container.c',
-    'nmt-newt-entry.c',
     'nmt-newt-entry-numeric.c',
+    'nmt-newt-entry.c',
     'nmt-newt-form.c',
     'nmt-newt-grid.c',
     'nmt-newt-hacks.c',
@@ -24,19 +24,9 @@ libnmt_newt = static_library(
     'nmt-newt-utils.c',
     'nmt-newt-widget.c',
   ),
-  include_directories: [
-    src_inc,
-    top_inc,
-  ],
   dependencies: [
     libnm_dep,
     newt_dep,
     glib_dep,
   ],
 )
-
-libnmt_newt_dep = declare_dependency(
-  include_directories: include_directories('.'),
-  dependencies: newt_dep,
-  link_with: libnmt_newt,
-)
diff --git a/clients/tui/newt/nmt-newt-button-box.c b/src/libnmt-newt/nmt-newt-button-box.c
index d86a154cb2..d86a154cb2 100644
--- a/clients/tui/newt/nmt-newt-button-box.c
+++ b/src/libnmt-newt/nmt-newt-button-box.c
diff --git a/clients/tui/newt/nmt-newt-button-box.h b/src/libnmt-newt/nmt-newt-button-box.h
index 6d17778b4f..6d17778b4f 100644
--- a/clients/tui/newt/nmt-newt-button-box.h
+++ b/src/libnmt-newt/nmt-newt-button-box.h
diff --git a/clients/tui/newt/nmt-newt-button.c b/src/libnmt-newt/nmt-newt-button.c
index 09ca1648a8..09ca1648a8 100644
--- a/clients/tui/newt/nmt-newt-button.c
+++ b/src/libnmt-newt/nmt-newt-button.c
diff --git a/clients/tui/newt/nmt-newt-button.h b/src/libnmt-newt/nmt-newt-button.h
index 12649600f6..12649600f6 100644
--- a/clients/tui/newt/nmt-newt-button.h
+++ b/src/libnmt-newt/nmt-newt-button.h
diff --git a/clients/tui/newt/nmt-newt-checkbox.c b/src/libnmt-newt/nmt-newt-checkbox.c
index cf825e08d9..cf825e08d9 100644
--- a/clients/tui/newt/nmt-newt-checkbox.c
+++ b/src/libnmt-newt/nmt-newt-checkbox.c
diff --git a/clients/tui/newt/nmt-newt-checkbox.h b/src/libnmt-newt/nmt-newt-checkbox.h
index c33c086a8f..c33c086a8f 100644
--- a/clients/tui/newt/nmt-newt-checkbox.h
+++ b/src/libnmt-newt/nmt-newt-checkbox.h
diff --git a/clients/tui/newt/nmt-newt-component.c b/src/libnmt-newt/nmt-newt-component.c
index 8d7a9005c9..8d7a9005c9 100644
--- a/clients/tui/newt/nmt-newt-component.c
+++ b/src/libnmt-newt/nmt-newt-component.c
diff --git a/clients/tui/newt/nmt-newt-component.h b/src/libnmt-newt/nmt-newt-component.h
index 54164c54ef..54164c54ef 100644
--- a/clients/tui/newt/nmt-newt-component.h
+++ b/src/libnmt-newt/nmt-newt-component.h
diff --git a/clients/tui/newt/nmt-newt-container.c b/src/libnmt-newt/nmt-newt-container.c
index 4cc8db242a..4cc8db242a 100644
--- a/clients/tui/newt/nmt-newt-container.c
+++ b/src/libnmt-newt/nmt-newt-container.c
diff --git a/clients/tui/newt/nmt-newt-container.h b/src/libnmt-newt/nmt-newt-container.h
index 0258529418..0258529418 100644
--- a/clients/tui/newt/nmt-newt-container.h
+++ b/src/libnmt-newt/nmt-newt-container.h
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.c b/src/libnmt-newt/nmt-newt-entry-numeric.c
index 7e8edd6cad..7e8edd6cad 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.c
+++ b/src/libnmt-newt/nmt-newt-entry-numeric.c
diff --git a/clients/tui/newt/nmt-newt-entry-numeric.h b/src/libnmt-newt/nmt-newt-entry-numeric.h
index a10e4c5b22..a10e4c5b22 100644
--- a/clients/tui/newt/nmt-newt-entry-numeric.h
+++ b/src/libnmt-newt/nmt-newt-entry-numeric.h
diff --git a/clients/tui/newt/nmt-newt-entry.c b/src/libnmt-newt/nmt-newt-entry.c
index 76a96df2f2..76a96df2f2 100644
--- a/clients/tui/newt/nmt-newt-entry.c
+++ b/src/libnmt-newt/nmt-newt-entry.c
diff --git a/clients/tui/newt/nmt-newt-entry.h b/src/libnmt-newt/nmt-newt-entry.h
index da1a9aeee8..da1a9aeee8 100644
--- a/clients/tui/newt/nmt-newt-entry.h
+++ b/src/libnmt-newt/nmt-newt-entry.h
diff --git a/clients/tui/newt/nmt-newt-form.c b/src/libnmt-newt/nmt-newt-form.c
index 825f7cfe61..825f7cfe61 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/src/libnmt-newt/nmt-newt-form.c
diff --git a/clients/tui/newt/nmt-newt-form.h b/src/libnmt-newt/nmt-newt-form.h
index 55fb583b76..55fb583b76 100644
--- a/clients/tui/newt/nmt-newt-form.h
+++ b/src/libnmt-newt/nmt-newt-form.h
diff --git a/clients/tui/newt/nmt-newt-grid.c b/src/libnmt-newt/nmt-newt-grid.c
index a68a496bce..a68a496bce 100644
--- a/clients/tui/newt/nmt-newt-grid.c
+++ b/src/libnmt-newt/nmt-newt-grid.c
diff --git a/clients/tui/newt/nmt-newt-grid.h b/src/libnmt-newt/nmt-newt-grid.h
index 7aac18bc52..7aac18bc52 100644
--- a/clients/tui/newt/nmt-newt-grid.h
+++ b/src/libnmt-newt/nmt-newt-grid.h
diff --git a/clients/tui/newt/nmt-newt-hacks.c b/src/libnmt-newt/nmt-newt-hacks.c
index 40114a29a7..40114a29a7 100644
--- a/clients/tui/newt/nmt-newt-hacks.c
+++ b/src/libnmt-newt/nmt-newt-hacks.c
diff --git a/clients/tui/newt/nmt-newt-hacks.h b/src/libnmt-newt/nmt-newt-hacks.h
index 92b376f960..92b376f960 100644
--- a/clients/tui/newt/nmt-newt-hacks.h
+++ b/src/libnmt-newt/nmt-newt-hacks.h
diff --git a/clients/tui/newt/nmt-newt-label.c b/src/libnmt-newt/nmt-newt-label.c
index 32c7809d4d..32c7809d4d 100644
--- a/clients/tui/newt/nmt-newt-label.c
+++ b/src/libnmt-newt/nmt-newt-label.c
diff --git a/clients/tui/newt/nmt-newt-label.h b/src/libnmt-newt/nmt-newt-label.h
index ff2e471bff..ff2e471bff 100644
--- a/clients/tui/newt/nmt-newt-label.h
+++ b/src/libnmt-newt/nmt-newt-label.h
diff --git a/clients/tui/newt/nmt-newt-listbox.c b/src/libnmt-newt/nmt-newt-listbox.c
index cfe23647a1..cfe23647a1 100644
--- a/clients/tui/newt/nmt-newt-listbox.c
+++ b/src/libnmt-newt/nmt-newt-listbox.c
diff --git a/clients/tui/newt/nmt-newt-listbox.h b/src/libnmt-newt/nmt-newt-listbox.h
index 602e33807a..602e33807a 100644
--- a/clients/tui/newt/nmt-newt-listbox.h
+++ b/src/libnmt-newt/nmt-newt-listbox.h
diff --git a/clients/tui/newt/nmt-newt-popup.c b/src/libnmt-newt/nmt-newt-popup.c
index 1822c9d953..1822c9d953 100644
--- a/clients/tui/newt/nmt-newt-popup.c
+++ b/src/libnmt-newt/nmt-newt-popup.c
diff --git a/clients/tui/newt/nmt-newt-popup.h b/src/libnmt-newt/nmt-newt-popup.h
index 15e247b41b..15e247b41b 100644
--- a/clients/tui/newt/nmt-newt-popup.h
+++ b/src/libnmt-newt/nmt-newt-popup.h
diff --git a/clients/tui/newt/nmt-newt-section.c b/src/libnmt-newt/nmt-newt-section.c
index fa73ea4a07..fa73ea4a07 100644
--- a/clients/tui/newt/nmt-newt-section.c
+++ b/src/libnmt-newt/nmt-newt-section.c
diff --git a/clients/tui/newt/nmt-newt-section.h b/src/libnmt-newt/nmt-newt-section.h
index c3b9f909ee..c3b9f909ee 100644
--- a/clients/tui/newt/nmt-newt-section.h
+++ b/src/libnmt-newt/nmt-newt-section.h
diff --git a/clients/tui/newt/nmt-newt-separator.c b/src/libnmt-newt/nmt-newt-separator.c
index 70c505ca6b..70c505ca6b 100644
--- a/clients/tui/newt/nmt-newt-separator.c
+++ b/src/libnmt-newt/nmt-newt-separator.c
diff --git a/clients/tui/newt/nmt-newt-separator.h b/src/libnmt-newt/nmt-newt-separator.h
index 0aa0fd0eff..0aa0fd0eff 100644
--- a/clients/tui/newt/nmt-newt-separator.h
+++ b/src/libnmt-newt/nmt-newt-separator.h
diff --git a/clients/tui/newt/nmt-newt-stack.c b/src/libnmt-newt/nmt-newt-stack.c
index e0fdb3b9a2..e0fdb3b9a2 100644
--- a/clients/tui/newt/nmt-newt-stack.c
+++ b/src/libnmt-newt/nmt-newt-stack.c
diff --git a/clients/tui/newt/nmt-newt-stack.h b/src/libnmt-newt/nmt-newt-stack.h
index ca6ad2038c..ca6ad2038c 100644
--- a/clients/tui/newt/nmt-newt-stack.h
+++ b/src/libnmt-newt/nmt-newt-stack.h
diff --git a/clients/tui/newt/nmt-newt-textbox.c b/src/libnmt-newt/nmt-newt-textbox.c
index 128e539b91..128e539b91 100644
--- a/clients/tui/newt/nmt-newt-textbox.c
+++ b/src/libnmt-newt/nmt-newt-textbox.c
diff --git a/clients/tui/newt/nmt-newt-textbox.h b/src/libnmt-newt/nmt-newt-textbox.h
index f589d62cd0..f589d62cd0 100644
--- a/clients/tui/newt/nmt-newt-textbox.h
+++ b/src/libnmt-newt/nmt-newt-textbox.h
diff --git a/clients/tui/newt/nmt-newt-toggle-button.c b/src/libnmt-newt/nmt-newt-toggle-button.c
index c48931e5d7..c48931e5d7 100644
--- a/clients/tui/newt/nmt-newt-toggle-button.c
+++ b/src/libnmt-newt/nmt-newt-toggle-button.c
diff --git a/clients/tui/newt/nmt-newt-toggle-button.h b/src/libnmt-newt/nmt-newt-toggle-button.h
index bdaa445d18..bdaa445d18 100644
--- a/clients/tui/newt/nmt-newt-toggle-button.h
+++ b/src/libnmt-newt/nmt-newt-toggle-button.h
diff --git a/clients/tui/newt/nmt-newt-types.h b/src/libnmt-newt/nmt-newt-types.h
index daeb7c2457..daeb7c2457 100644
--- a/clients/tui/newt/nmt-newt-types.h
+++ b/src/libnmt-newt/nmt-newt-types.h
diff --git a/clients/tui/newt/nmt-newt-utils.c b/src/libnmt-newt/nmt-newt-utils.c
index 1216b8d356..1216b8d356 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/src/libnmt-newt/nmt-newt-utils.c
diff --git a/clients/tui/newt/nmt-newt-utils.h b/src/libnmt-newt/nmt-newt-utils.h
index 04089f9f8b..04089f9f8b 100644
--- a/clients/tui/newt/nmt-newt-utils.h
+++ b/src/libnmt-newt/nmt-newt-utils.h
diff --git a/clients/tui/newt/nmt-newt-widget.c b/src/libnmt-newt/nmt-newt-widget.c
index 8b5647aa9b..8b5647aa9b 100644
--- a/clients/tui/newt/nmt-newt-widget.c
+++ b/src/libnmt-newt/nmt-newt-widget.c
diff --git a/clients/tui/newt/nmt-newt-widget.h b/src/libnmt-newt/nmt-newt-widget.h
index 70b62d296f..70b62d296f 100644
--- a/clients/tui/newt/nmt-newt-widget.h
+++ b/src/libnmt-newt/nmt-newt-widget.h
diff --git a/clients/tui/newt/nmt-newt.h b/src/libnmt-newt/nmt-newt.h
index 984c65e2a4..984c65e2a4 100644
--- a/clients/tui/newt/nmt-newt.h
+++ b/src/libnmt-newt/nmt-newt.h
diff --git a/src/meson.build b/src/meson.build
index 5a5ba82e57..4c6d3ced0f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -87,6 +87,7 @@ subdir('libnm-client-impl')
 subdir('libnm-client-aux-extern')
 subdir('libnmc-base')
 subdir('libnmc-setting')
+subdir('libnmt-newt')
 subdir('core')
 subdir('nm-dispatcher')
 subdir('contrib')