mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-07 00:31:11 +00:00
build: move "clients/tui/newt/" to "src/libnmt-newt/"
This commit is contained in:
parent
54976f23cd
commit
7e81f4478d
113
Makefile.am
113
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
|
||||
noinst_LIBRARIES += src/libnmt-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 \
|
||||
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)
|
||||
|
||||
clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
|
||||
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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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())
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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) \
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "nmt-newt.h"
|
||||
#include "libnmt-newt/nmt-newt.h"
|
||||
|
||||
#include "nmtui.h"
|
||||
#include "nmtui-connect.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);
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
)
|
|
@ -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')
|
||||
|
|
Loading…
Reference in a new issue