mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-04 16:30:31 +01:00
all: merge branch 'th/move-to-src-shared'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/758
This commit is contained in:
Thomas Haller
commit
6a54c3ff29
716 changed files with 2009 additions and 1967 deletions
37
.gitignore
vendored
37
.gitignore
vendored
|
|
@ -135,10 +135,6 @@ test-*.trs
|
|||
/examples/C/qt/monitor-nm-running
|
||||
/examples/C/qt/monitor-nm-running.moc
|
||||
|
||||
/shared/nm-glib-aux/tests/test-json-aux
|
||||
/shared/nm-glib-aux/tests/test-shared-general
|
||||
/shared/nm-platform/tests/test-nm-platform
|
||||
|
||||
/introspection/org.freedesktop.NetworkManager*.[ch]
|
||||
|
||||
/src/libnm-core-public/nm-version-macros.h
|
||||
|
|
@ -152,16 +148,19 @@ test-*.trs
|
|||
/src/libnm-core-impl/tests/test-need-secrets
|
||||
/src/libnm-core-impl/tests/test-secrets
|
||||
/src/libnm-core-impl/tests/test-setting
|
||||
/src/libnm-glib-aux/tests/test-json-aux
|
||||
/src/libnm-glib-aux/tests/test-shared-general
|
||||
/src/libnm-platform/tests/test-nm-platform
|
||||
|
||||
/libnm/nm-property-infos-dbus.xml
|
||||
/libnm/nm-property-infos-ifcfg-rh.xml
|
||||
/libnm/nm-property-infos-keyfile.xml
|
||||
/libnm/nm-property-infos-nmcli.xml
|
||||
/libnm/nm-settings-docs-gir.xml
|
||||
/libnm/tests/test-libnm
|
||||
/libnm/tests/test-nm-client
|
||||
/libnm/tests/test-remote-settings-client
|
||||
/libnm/tests/test-secret-agent
|
||||
/src/libnm-client-impl/nm-property-infos-dbus.xml
|
||||
/src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml
|
||||
/src/libnm-client-impl/nm-property-infos-keyfile.xml
|
||||
/src/libnm-client-impl/nm-property-infos-nmcli.xml
|
||||
/src/libnm-client-impl/nm-settings-docs-gir.xml
|
||||
/src/libnm-client-impl/tests/test-libnm
|
||||
/src/libnm-client-impl/tests/test-nm-client
|
||||
/src/libnm-client-impl/tests/test-remote-settings-client
|
||||
/src/libnm-client-impl/tests/test-secret-agent
|
||||
|
||||
/clients/cli/generate-docs-nm-settings-nmcli
|
||||
/clients/cli/generate-docs-nm-settings-nmcli.xml
|
||||
|
|
@ -352,15 +351,27 @@ test-*.trs
|
|||
/libnm/nm-ifcfg-rh-docs.xml
|
||||
/libnm/nm-keyfile-docs.xml
|
||||
/libnm/nm-property-docs.xml
|
||||
/libnm/nm-property-infos-dbus.xml
|
||||
/libnm/nm-property-infos-ifcfg-rh.xml
|
||||
/libnm/nm-property-infos-keyfile.xml
|
||||
/libnm/nm-property-infos-nmcli.xml
|
||||
/libnm/nm-setting-docs-overrides.xml
|
||||
/libnm/nm-setting-docs.xml
|
||||
/libnm/nm-settings-docs-gir.xml
|
||||
/libnm/nm-settings-docs-overrides.xml
|
||||
/libnm/nm-settings-docs.xml
|
||||
/libnm/nm-settings-ifcfg-rh-docs.xml
|
||||
/libnm/nm-settings-keyfile-docs.xml
|
||||
/libnm/tests/test-general
|
||||
/libnm/tests/test-libnm
|
||||
/libnm/tests/test-nm-client
|
||||
/libnm/tests/test-remote-settings-client
|
||||
/libnm/tests/test-secret-agent
|
||||
/policy/org.freedesktop.NetworkManager.policy
|
||||
/policy/org.freedesktop.NetworkManager.policy.in
|
||||
/shared/nm-glib-aux/tests/test-json-aux
|
||||
/shared/nm-glib-aux/tests/test-shared-general
|
||||
/shared/nm-platform/tests/test-nm-platform
|
||||
/shared/nm-utils/tests/test-shared-general
|
||||
/shared/nm-version-macros.h
|
||||
/src/devices/tests/test-arping
|
||||
|
|
|
|||
1649
Makefile.am
1649
Makefile.am
File diff suppressed because it is too large
Load diff
|
|
@ -3,10 +3,10 @@
|
|||
###############################################################################
|
||||
|
||||
examples_C_glib_cppflags = \
|
||||
-I$(top_builddir)/src/libnm-core-public \
|
||||
-I$(top_srcdir)/src/libnm-core-public \
|
||||
-I$(top_builddir)/libnm \
|
||||
-I$(top_srcdir)/libnm \
|
||||
-I$(top_builddir)/src/libnm-core-public \
|
||||
-I$(top_srcdir)/src/libnm-client-public \
|
||||
-I$(top_builddir)/src/libnm-client-public \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags)
|
||||
|
|
@ -26,24 +26,24 @@ examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus
|
|||
examples_C_glib_add_connection_gdbus_LDADD = \
|
||||
$(GLIB_LIBS) \
|
||||
$(UUID_LIBS)
|
||||
$(examples_C_glib_add_connection_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
$(examples_C_glib_add_connection_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h)
|
||||
|
||||
examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
|
||||
examples_C_glib_add_connection_libnm_LDADD = \
|
||||
libnm/libnm.la \
|
||||
src/libnm-client-impl/libnm.la \
|
||||
$(GLIB_LIBS)
|
||||
$(examples_C_glib_add_connection_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
$(examples_C_glib_add_connection_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h)
|
||||
|
||||
examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
|
||||
examples_C_glib_get_active_connections_gdbus_LDADD = \
|
||||
$(GLIB_LIBS)
|
||||
$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
$(examples_C_glib_get_active_connections_gdbus_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h)
|
||||
|
||||
examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
|
||||
examples_C_glib_get_ap_info_libnm_LDADD = \
|
||||
libnm/libnm.la \
|
||||
src/libnm-client-impl/libnm.la \
|
||||
$(GLIB_LIBS)
|
||||
$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
$(examples_C_glib_get_ap_info_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h)
|
||||
|
||||
examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
|
||||
examples_C_glib_list_connections_gdbus_LDADD = \
|
||||
|
|
@ -51,9 +51,9 @@ examples_C_glib_list_connections_gdbus_LDADD = \
|
|||
|
||||
examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm)
|
||||
examples_C_glib_list_connections_libnm_LDADD = \
|
||||
libnm/libnm.la \
|
||||
src/libnm-client-impl/libnm.la \
|
||||
$(GLIB_LIBS)
|
||||
$(examples_C_glib_list_connections_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
$(examples_C_glib_list_connections_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_libnm_client_public_mkenums_h)
|
||||
|
||||
examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus)
|
||||
examples_C_glib_monitor_nm_running_gdbus_LDADD = \
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2012 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
|
@ -13,11 +13,11 @@
|
|||
#include <readline/readline.h>
|
||||
#include <readline/history.h>
|
||||
|
||||
#include "nm-libnm-aux/nm-libnm-aux.h"
|
||||
#include "libnm-client-aux-extern/nm-libnm-aux.h"
|
||||
|
||||
#include "nm-vpn-helpers.h"
|
||||
#include "nm-client-utils.h"
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2010 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "connections.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2010 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "devices.h"
|
||||
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
#include <readline/readline.h>
|
||||
#include <linux/if_ether.h>
|
||||
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
#include "common.h"
|
||||
#include "connections.h"
|
||||
#include "nm-client-utils.h"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2010 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-meta-setting-desc.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ executable(
|
|||
dependencies: [
|
||||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_client_aux_extern_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_base_dep_link,
|
||||
|
|
@ -46,7 +46,7 @@ generate_docs_nm_settings_nmcli = executable(
|
|||
dependencies: [
|
||||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_client_aux_extern_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_base_dep_link,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2010 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmcli.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "polkit-agent.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2010 - 2015 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2010 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-libnm-aux/nm-libnm-aux.h"
|
||||
#include "libnm-client-aux-extern/nm-libnm-aux.h"
|
||||
|
||||
#include "nm-cloud-setup-utils.h"
|
||||
#include "nmcs-provider-ec2.h"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ libnm_cloud_setup_core = static_library(
|
|||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libcurl_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_client_aux_extern_dep,
|
||||
],
|
||||
)
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ executable(
|
|||
libnm_glib_aux_dep_link,
|
||||
libcurl_dep,
|
||||
],
|
||||
link_with: libnm_systemd_logging_stub,
|
||||
link_with: libnm_log_null,
|
||||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true,
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-cloud-setup-utils.h"
|
||||
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_infiniband.h>
|
||||
|
||||
#include "nm-glib-aux/nm-time-utils.h"
|
||||
#include "nm-glib-aux/nm-logging-base.h"
|
||||
#include "nm-glib-aux/nm-str-buf.h"
|
||||
#include "libnm-glib-aux/nm-time-utils.h"
|
||||
#include "libnm-glib-aux/nm-logging-base.h"
|
||||
#include "libnm-glib-aux/nm-str-buf.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#ifndef __NM_CLOUD_SETUP_UTILS_H__
|
||||
#define __NM_CLOUD_SETUP_UTILS_H__
|
||||
|
||||
#include "nm-glib-aux/nm-logging-fwd.h"
|
||||
#include "libnm-glib-aux/nm-logging-fwd.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-http-client.h"
|
||||
|
||||
#include <curl/curl.h>
|
||||
|
||||
#include "nm-cloud-setup-utils.h"
|
||||
#include "nm-glib-aux/nm-str-buf.h"
|
||||
#include "libnm-glib-aux/nm-str-buf.h"
|
||||
|
||||
#define NM_CURL_DEBUG 0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmcs-provider-azure.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmcs-provider-ec2.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmcs-provider-gcp.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmcs-provider.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-cloud-setup-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
|
||||
#include "nm-utils/nm-test-utils.h"
|
||||
#include "libnm-glib-aux/nm-test-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
* Copyright (C) 2010 - 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-client-utils.h"
|
||||
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "nm-glib-aux/nm-io-utils.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-io-utils.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-device-bond.h"
|
||||
#include "nm-device-bridge.h"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2010 - 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-meta-setting-access.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2017 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-meta-setting-base.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2010 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-meta-setting-desc.h"
|
||||
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
#include <linux/if_infiniband.h>
|
||||
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
#include "nm-glib-aux/nm-enum-utils.h"
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-enum-utils.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
#include "libnm-core-aux-extern/nm-libnm-core-aux.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#ifndef __NM_META_SETTING_DESC_H__
|
||||
#define __NM_META_SETTING_DESC_H__
|
||||
|
||||
#include "nm-glib-aux/nm-obj.h"
|
||||
#include "libnm-glib-aux/nm-obj.h"
|
||||
#include "nm-meta-setting-base.h"
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
#include "libnm-base/nm-ethtool-base.h"
|
||||
|
||||
struct _NMDevice;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
* https://github.com/lxde/lxqt-policykit/tree/master/src
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-polkit-listener.h"
|
||||
|
||||
|
|
@ -26,10 +26,10 @@
|
|||
#include <pwd.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "nm-glib-aux/nm-dbus-aux.h"
|
||||
#include "nm-glib-aux/nm-str-buf.h"
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "nm-glib-aux/nm-io-utils.h"
|
||||
#include "libnm-glib-aux/nm-dbus-aux.h"
|
||||
#include "libnm-glib-aux/nm-str-buf.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-io-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-auth-subject.h"
|
||||
#include "c-list/src/c-list.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* replace ShellNetworkAgent.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-secret-agent-simple.h"
|
||||
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include "nm-vpn-service-plugin.h"
|
||||
#include "nm-vpn-helpers.h"
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: VPN-related utilities
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-vpn-helpers.h"
|
||||
|
||||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
#include "nm-client-utils.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-glib-aux/nm-io-utils.h"
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "libnm-glib-aux/nm-io-utils.h"
|
||||
#include "libnm-glib-aux/nm-secret-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ exe = executable(
|
|||
libnm_nm_default_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
link_with: libnm_systemd_logging_stub,
|
||||
link_with: libnm_log_null,
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
* Copyright (C) 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-meta-setting-access.h"
|
||||
#include "nm-vpn-helpers.h"
|
||||
#include "nm-client-utils.h"
|
||||
|
||||
#include "nm-utils/nm-test-utils.h"
|
||||
#include "libnm-glib-aux/nm-test-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
* Copyright (C) 2019 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "libnm-core-aux-extern/nm-libnm-core-aux.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
|
||||
#include "nm-utils/nm-test-utils.h"
|
||||
#include "libnm-glib-aux/nm-test-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ executable(
|
|||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_client_aux_extern_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
link_args: ldflags_linker_script_binary,
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
* Robert Love <rml@novell.com>
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <getopt.h>
|
||||
#include <locale.h>
|
||||
|
||||
#include "nm-libnm-aux/nm-libnm-aux.h"
|
||||
#include "libnm-client-aux-extern/nm-libnm-aux.h"
|
||||
|
||||
#define PROGRESS_STEPS 15
|
||||
|
||||
|
|
|
|||
|
|
@ -50,13 +50,13 @@ executable(
|
|||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libnmt_newt_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_client_aux_extern_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_base_dep_link,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
link_with: libnm_systemd_logging_stub,
|
||||
link_with: libnm_log_null,
|
||||
link_args: ldflags_linker_script_binary,
|
||||
link_depends: linker_script_binary,
|
||||
install: true,
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* within each of the two sections.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-button-box.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* #NmtNewtButton implements a button widget.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-button.h"
|
||||
#include "nmt-newt-utils.h"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* #NmtNewtCheckbox implements a checkbox widget.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-checkbox.h"
|
||||
#include "nmt-newt-utils.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* wrap a (single) #newtComponent.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-component.h"
|
||||
#include "nmt-newt-form.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* #NmtNewtGrid is the most generic container type.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-container.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* #NmtNewtEntryValidator functions, so you should not set your own.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* See also #NmtNewtEntryNumeric, for numeric-only entries.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-entry.h"
|
||||
#include "nmt-newt-form.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* "form" (aka dialog) to the user.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
* must be implemented by the container...
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-grid.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* functions that were added after 0.52.15.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-hacks.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* See also #NmtNewtTextbox, for multiline.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-label.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
* presses Return on a selection.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-listbox.h"
|
||||
#include "nmt-newt-form.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* #NmtNewtForm containing an #NmtNewtListbox to select from.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-popup.h"
|
||||
#include "nmt-newt-form.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
* extent of the section.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-section.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* between widgets in containers that don't implement padding.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-separator.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* children.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-stack.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* word-wrapping.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-textbox.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* #NmtNewtToggleButton implements a two-state toggle button.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-toggle-button.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: Utility functions
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* FIXME: need RTL support
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt-widget.h"
|
||||
#include "nmt-newt-form.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* shared between nmtui, nm-connection-editor, and gnome-control-center.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-editor-bindings.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* nm-connection-editor, and gnome-control-center.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-editor-utils.h"
|
||||
#if 0
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* functions.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-address-list.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* access points displayed by "nmtui connect".
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* to implement that then we should make it just an #NmtNewtEntry.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-device-entry.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* "nmtui edit".
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmtui.h"
|
||||
#include "nmtui-edit.h"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* section border into account as well.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-editor-grid.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* an actual page type.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-editor-page-device.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* A "page" is a set of related #NmtEditorSections.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-editor-page.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* #NmtEditorSection is the abstract base class for #NmtEditor sections.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-editor-section.h"
|
||||
#include "nmt-newt-toggle-button.h"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* #NmtEditor is the top-level form for editing a connection.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-editor.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* contains a valid IP address.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* on whether it currently contains a valid hardware address.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-mac-entry.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* indicating the units used by the entry.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* can't just use #GBinding.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-bond.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for Bridge ports
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-bridge-port.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for Bridge connections
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-bridge.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for DSL connections
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-dsl.h"
|
||||
#include "nmt-page-ethernet.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for Ethernet connections
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-ethernet.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for InfiniBand connections
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-infiniband.h"
|
||||
#include "nmt-mtu-entry.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* @short_description: The editor page for IP tunnel connections
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-ip-tunnel.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for IP4 configuration
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for IP6 configuration
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for PPP configuration
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for Team ports.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-team-port.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for Team connections
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-page-team.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: The editor page for VLAN connections
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nm-editor-bindings.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* properties.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <linux/if_ether.h>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* secrets when activating a connection.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-password-dialog.h"
|
||||
#include "nm-secret-agent-simple.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* "Show password" checkbox that toggles whether the password is visible.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-password-fields.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* wide to fit into the main window.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-route-editor.h"
|
||||
#include "nmt-route-table.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* This is used as a building block by #NmtRouteTable.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* and buttons to add and remove entries.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* slaves of a connection.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-slave-list.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
* @short_description: Miscellaneous nmtui-specific utilities
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
* FIXME: The way this works is sort of weird.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-widget-list.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* including presenting a password dialog if necessary.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* nmtui-edit implements editing #NMConnections.
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
* nmtui-hostname implements the "set hostname" functionality
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmt-newt.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
* nmtui_edit(), and nmtui_hostname().
|
||||
*/
|
||||
|
||||
#include "libnm/nm-default-client.h"
|
||||
#include "libnm-client-aux-extern/nm-default-client.h"
|
||||
|
||||
#include "nmtui.h"
|
||||
|
||||
#include <locale.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "nm-libnm-aux/nm-libnm-aux.h"
|
||||
#include "libnm-client-aux-extern/nm-libnm-aux.h"
|
||||
|
||||
#include "nmt-newt.h"
|
||||
#include "nm-editor-bindings.h"
|
||||
|
|
|
|||
|
|
@ -1305,7 +1305,6 @@ AC_SUBST(AM_CFLAGS)
|
|||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
libnm/libnm.pc
|
||||
po/Makefile.in
|
||||
data/org.freedesktop.NetworkManager.policy.in
|
||||
docs/api/Makefile
|
||||
|
|
@ -1313,6 +1312,7 @@ docs/api/version.xml
|
|||
docs/libnm/Makefile
|
||||
docs/libnm/version.xml
|
||||
NetworkManager.pc
|
||||
src/libnm-client-impl/libnm.pc
|
||||
src/libnm-core-public/nm-version-macros.h
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@ die() {
|
|||
}
|
||||
|
||||
EXCLUDE=(
|
||||
":(exclude)shared/c-list"
|
||||
":(exclude)shared/c-list"
|
||||
":(exclude)shared/c-list"
|
||||
":(exclude)shared/c-rbtree"
|
||||
":(exclude)shared/c-siphash"
|
||||
":(exclude)shared/c-stdaux"
|
||||
":(exclude)shared/n-acd"
|
||||
":(exclude)shared/n-dhcp4"
|
||||
":(exclude)shared/nm-std-aux/unaligned.h"
|
||||
":(exclude)shared/systemd/src"
|
||||
":(exclude)src/c-list"
|
||||
":(exclude)src/c-list"
|
||||
":(exclude)src/c-list"
|
||||
":(exclude)src/c-rbtree"
|
||||
":(exclude)src/c-siphash"
|
||||
":(exclude)src/c-stdaux"
|
||||
":(exclude)src/core/systemd/src"
|
||||
":(exclude)src/libnm-std-aux/unaligned.h"
|
||||
":(exclude)src/libnm-systemd-shared/src"
|
||||
":(exclude)src/n-acd"
|
||||
":(exclude)src/n-dhcp4"
|
||||
)
|
||||
|
||||
NM_ROOT="$(git rev-parse --show-toplevel)" || die "not inside a git repository"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue