mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-01 13:55:36 +00:00
build: move "libnm-core/" to "src/" and split it
"libnm-core/" is rather complicated. It provides a static library that
is linked into libnm.so and NetworkManager. It also contains public
headers (like "nm-setting.h") which are part of public libnm API.
Then we have helper libraries ("libnm-core/nm-libnm-core-*/") which
only rely on public API of libnm-core, but are themself static
libraries that can be used by anybody who uses libnm-core. And
"libnm-core/nm-libnm-core-intern" is used by libnm-core itself.
Move "libnm-core/" to "src/". But also split it in different
directories so that they have a clearer purpose.
The goal is to have a flat directory hierarchy. The "src/libnm-core*/"
directories correspond to the different modules (static libraries and set
of headers that we have). We have different kinds of such modules because
of how we combine various code together. The directory layout now reflects
this.
This commit is contained in:
Thomas Haller
parent
2c1f8e9108
commit
fdf9614ba7
33
.gitignore
vendored
33
.gitignore
vendored
|
|
@ -141,17 +141,17 @@ test-*.trs
|
|||
|
||||
/introspection/org.freedesktop.NetworkManager*.[ch]
|
||||
|
||||
/libnm-core/tests/test-compare
|
||||
/libnm-core/tests/test-crypto
|
||||
/libnm-core/tests/test-settings-defaults
|
||||
/libnm-core/tests/test-general
|
||||
/libnm-core/tests/test-keyfile
|
||||
/libnm-core/tests/test-need-secrets
|
||||
/libnm-core/tests/test-secrets
|
||||
/libnm-core/tests/test-setting
|
||||
/libnm-core/nm-dbus-types.xml
|
||||
/libnm-core/nm-version-macros.h
|
||||
/libnm-core/nm-vpn-dbus-types.xml
|
||||
/src/libnm-core-public/nm-version-macros.h
|
||||
/src/libnm-core-public/nm-dbus-types.xml
|
||||
/src/libnm-core-public/nm-vpn-dbus-types.xml
|
||||
/src/libnm-core-impl/tests/test-compare
|
||||
/src/libnm-core-impl/tests/test-crypto
|
||||
/src/libnm-core-impl/tests/test-settings-defaults
|
||||
/src/libnm-core-impl/tests/test-general
|
||||
/src/libnm-core-impl/tests/test-keyfile
|
||||
/src/libnm-core-impl/tests/test-need-secrets
|
||||
/src/libnm-core-impl/tests/test-secrets
|
||||
/src/libnm-core-impl/tests/test-setting
|
||||
|
||||
/libnm/nm-property-infos-dbus.xml
|
||||
/libnm/nm-property-infos-ifcfg-rh.xml
|
||||
|
|
@ -323,6 +323,17 @@ test-*.trs
|
|||
/libnm-core/tests/test-setting-8021x
|
||||
/libnm-core/tests/test-setting-bond
|
||||
/libnm-core/tests/test-setting-dcb
|
||||
/libnm-core/tests/test-compare
|
||||
/libnm-core/tests/test-crypto
|
||||
/libnm-core/tests/test-settings-defaults
|
||||
/libnm-core/tests/test-general
|
||||
/libnm-core/tests/test-keyfile
|
||||
/libnm-core/tests/test-need-secrets
|
||||
/libnm-core/tests/test-secrets
|
||||
/libnm-core/tests/test-setting
|
||||
/libnm-core/nm-dbus-types.xml
|
||||
/libnm-core/nm-version-macros.h
|
||||
/libnm-core/nm-vpn-dbus-types.xml
|
||||
/libnm-glib/libnm-glib-test
|
||||
/libnm-glib/nm-secret-agent-glue.h
|
||||
/libnm-glib/nm-vpn-plugin-glue.h
|
||||
|
|
|
|||
996
Makefile.am
996
Makefile.am
File diff suppressed because it is too large
Load diff
|
|
@ -3,12 +3,10 @@
|
|||
###############################################################################
|
||||
|
||||
examples_C_glib_cppflags = \
|
||||
-I$(top_srcdir)/shared \
|
||||
-I$(top_builddir)/shared \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-I$(top_srcdir)/libnm \
|
||||
-I$(top_builddir)/src/libnm-core-public \
|
||||
-I$(top_srcdir)/src/libnm-core-public \
|
||||
-I$(top_builddir)/libnm \
|
||||
-I$(top_srcdir)/libnm \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags)
|
||||
|
|
@ -75,8 +73,10 @@ EXTRA_DIST += \
|
|||
if WITH_QT
|
||||
|
||||
examples_C_qt_cppflags = \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-I$(top_builddir)/src/libnm-core-public \
|
||||
-I$(top_srcdir)/src/libnm-core-public \
|
||||
-I$(top_builddir)/libnm \
|
||||
-I$(top_srcdir)/libnm \
|
||||
-I$(builddir)/examples/C/qt \
|
||||
$(DBUS_CFLAGS) \
|
||||
$(QT_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
|
||||
#include "nm-client-utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -24,8 +24,12 @@ executable(
|
|||
dependencies: [
|
||||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
readline_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_base_dep_link,
|
||||
libnm_glib_aux_dep_link,
|
||||
readline_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="nmcli"',
|
||||
|
|
@ -46,6 +50,10 @@ generate_docs_nm_settings_nmcli = executable(
|
|||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_base_dep_link,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="nmcli"',
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
|
||||
#include "nm-client-utils.h"
|
||||
#include "nm-vpn-helpers.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include "nmcs-provider-ec2.h"
|
||||
#include "nmcs-provider-gcp.h"
|
||||
#include "nmcs-provider-azure.h"
|
||||
#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -53,11 +53,13 @@ executable(
|
|||
'main.c',
|
||||
),
|
||||
dependencies: [
|
||||
libnm_cloud_setup_core_dep,
|
||||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_glib_aux_dep_link,
|
||||
libcurl_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_cloud_setup_core_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="nm-cloud-setup"',
|
||||
|
|
|
|||
|
|
@ -4,9 +4,10 @@ exe = executable(
|
|||
'test-cloud-setup-general',
|
||||
'test-cloud-setup-general.c',
|
||||
dependencies: [
|
||||
libnm_cloud_setup_core_dep,
|
||||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libnm_cloud_setup_core_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include "libnm/nm-default-client.h"
|
||||
|
||||
#include "nm-cloud-setup-utils.h"
|
||||
#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
|
||||
#include "nm-utils/nm-test-utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ libnmc = static_library(
|
|||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_libnm_core_aux_dep,
|
||||
libnm_core_aux_extern_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="libnmc"',
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "nm-meta-setting-desc.h"
|
||||
#include "nm-active-connection.h"
|
||||
#include "nm-device.h"
|
||||
#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
|
||||
const NMObject **nmc_objects_sort_by_path(const NMObject *const *objs, gssize len);
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
#include <linux/if_ether.h>
|
||||
#include <linux/if_infiniband.h>
|
||||
|
||||
#include "nm-libnm-core-intern/nm-common-macros.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 "nm-libnm-core-intern/nm-libnm-core-utils.h"
|
||||
#include "nm-libnm-core-aux/nm-libnm-core-aux.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
#include "libnm-core-aux-extern/nm-libnm-core-aux.h"
|
||||
|
||||
#include "nm-vpn-helpers.h"
|
||||
#include "nm-client-utils.h"
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#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 "nm-libnm-core-intern/nm-auth-subject.h"
|
||||
#include "libnm-core-aux-intern/nm-auth-subject.h"
|
||||
#include "c-list/src/c-list.h"
|
||||
|
||||
#define LOGIND_BUS_NAME "org.freedesktop.login1"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,10 @@ exe = executable(
|
|||
dependencies: [
|
||||
libnmc_base_dep,
|
||||
libnmc_dep,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_glib_aux_dep_link,
|
||||
libnm_base_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
|
|
@ -23,8 +27,9 @@ exe = executable(
|
|||
'test-libnm-core-aux.c',
|
||||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_libnm_core_aux_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_nm_default_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include "libnm/nm-default-client.h"
|
||||
|
||||
#include "nm-libnm-core-aux/nm-libnm-core-aux.h"
|
||||
#include "nm-libnm-core-intern/nm-libnm-core-utils.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"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ executable(
|
|||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="nm-online"',
|
||||
|
|
|
|||
|
|
@ -51,6 +51,10 @@ executable(
|
|||
libnmc_dep,
|
||||
libnmt_newt_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_core_aux_intern_dep_link,
|
||||
libnm_base_dep_link,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="nmtui"',
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <linux/if_ether.h>
|
||||
#include <linux/if_infiniband.h>
|
||||
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
|
||||
G_DEFINE_TYPE(NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY)
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/if_ether.h>
|
||||
#include <linux/if_infiniband.h>
|
||||
|
||||
#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
#include "nmt-mac-entry.h"
|
||||
#include "nmt-address-list.h"
|
||||
#include "nmt-slave-list.h"
|
||||
|
|
|
|||
|
|
@ -1305,7 +1305,6 @@ AC_SUBST(AM_CFLAGS)
|
|||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
libnm-core/nm-version-macros.h
|
||||
libnm/libnm.pc
|
||||
po/Makefile.in
|
||||
data/org.freedesktop.NetworkManager.policy.in
|
||||
|
|
@ -1314,6 +1313,7 @@ docs/api/version.xml
|
|||
docs/libnm/Makefile
|
||||
docs/libnm/version.xml
|
||||
NetworkManager.pc
|
||||
src/libnm-core-public/nm-version-macros.h
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ executable(
|
|||
dependencies: [
|
||||
libnm_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_libnm_aux_dep,
|
||||
libnm_core_aux_extern_dep_link,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="nm-dispatcher"',
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include "nm-setting-ip6-config.h"
|
||||
#include "nm-setting-connection.h"
|
||||
|
||||
#include "nm-libnm-core-aux/nm-dispatcher-api.h"
|
||||
#include "libnm-core-aux-extern/nm-dispatcher-api.h"
|
||||
#include "nm-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <arpa/inet.h>
|
||||
#include <glib-unix.h>
|
||||
|
||||
#include "nm-libnm-core-aux/nm-dispatcher-api.h"
|
||||
#include "libnm-core-aux-extern/nm-dispatcher-api.h"
|
||||
#include "nm-dispatcher-utils.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ exe = executable(
|
|||
include_directories: dispatcher_inc,
|
||||
dependencies: [
|
||||
libnm_nm_default_dep,
|
||||
libnm_glib_aux_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#include "nm-dispatcher-utils.h"
|
||||
#include "nm-libnm-core-aux/nm-dispatcher-api.h"
|
||||
#include "libnm-core-aux-extern/nm-dispatcher-api.h"
|
||||
|
||||
#include "nm-utils/nm-test-utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@ content_files = \
|
|||
dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
|
||||
dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
|
||||
dbus-org.freedesktop.NetworkManager.xml \
|
||||
$(top_builddir)/libnm-core/nm-dbus-types.xml \
|
||||
$(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \
|
||||
$(top_builddir)/src/libnm-core-public/nm-dbus-types.xml \
|
||||
$(top_builddir)/src/libnm-core-public/nm-vpn-dbus-types.xml \
|
||||
$(top_builddir)/man/nmcli.xml \
|
||||
$(top_builddir)/man/nmtui.xml \
|
||||
$(top_builddir)/man/nm-online.xml \
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@
|
|||
|
||||
<chapter id="dbus-types">
|
||||
<title>Types</title>
|
||||
<xi:include href="../../libnm-core/nm-dbus-types.xml"/>
|
||||
<xi:include href="../../src/libnm-core-public/nm-dbus-types.xml"/>
|
||||
</chapter>
|
||||
</part>
|
||||
|
||||
|
|
@ -289,7 +289,7 @@
|
|||
</chapter>
|
||||
<chapter id="dbus-vpn-types">
|
||||
<title>Types</title>
|
||||
<xi:include href="../../libnm-core/nm-vpn-dbus-types.xml"/>
|
||||
<xi:include href="../../src/libnm-core-public/nm-vpn-dbus-types.xml"/>
|
||||
</chapter>
|
||||
</part>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,10 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
|
|||
# gtk-doc will search all .c & .h files beneath here for inline comments
|
||||
# documenting functions and macros.
|
||||
DOC_SOURCE_DIR= \
|
||||
$(top_srcdir)/libnm-core \
|
||||
$(top_builddir)/libnm-core \
|
||||
$(top_builddir)/src/libnm-core-public \
|
||||
$(top_srcdir)/src/libnm-core-public \
|
||||
$(top_builddir)/src/libnm-core-impl \
|
||||
$(top_srcdir)/src/libnm-core-impl \
|
||||
$(top_srcdir)/libnm \
|
||||
$(top_builddir)/libnm
|
||||
|
||||
|
|
@ -28,8 +30,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
|
|||
FIXXREF_OPTIONS=
|
||||
|
||||
# Used for dependencies.
|
||||
HFILE_GLOB=$(top_srcdir)/libnm-core/*.h $(top_srcdir)/libnm/*.h
|
||||
CFILE_GLOB=$(top_srcdir)/libnm-core/*.c $(top_srcdir)/libnm/*.c
|
||||
HFILE_GLOB=$(top_srcdir)/src/libnm-core-public/*.h $(top_srcdir)/libnm/*.h
|
||||
CFILE_GLOB=$(top_srcdir)/src/libnm-core-impl/*.c $(top_srcdir)/libnm/*.c
|
||||
|
||||
# Header files to ignore when scanning.
|
||||
IGNORE_HFILES= \
|
||||
|
|
@ -84,10 +86,10 @@ extra_files = libnm.png
|
|||
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
||||
# if $(DOC_MODULE).types is non-empty.
|
||||
GTKDOC_CFLAGS = \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-I$(top_srcdir)/libnm \
|
||||
-I$(top_builddir)/src/libnm-core-public \
|
||||
-I$(top_srcdir)/src/libnm-core-public \
|
||||
-I$(top_builddir)/libnm \
|
||||
-I$(top_srcdir)/libnm \
|
||||
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(SANITIZER_EXEC_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
src_dirs = [
|
||||
libnm_core_inc,
|
||||
libnm_inc,
|
||||
]
|
||||
|
||||
private_headers = [
|
||||
'common.h',
|
||||
'nm-core-internal.h',
|
||||
|
|
@ -57,7 +52,10 @@ version_xml = configure_file(
|
|||
gnome.gtkdoc(
|
||||
libnm_name,
|
||||
main_xml: libnm_name + '-docs.xml',
|
||||
src_dir: src_dirs,
|
||||
src_dir: [
|
||||
libnm_core_public_inc,
|
||||
libnm_inc,
|
||||
],
|
||||
dependencies: libnm_dep,
|
||||
scan_args: scan_args,
|
||||
scanobjs_args: '--type-init-func="g_type_init();"',
|
||||
|
|
|
|||
|
|
@ -6,13 +6,6 @@ examples = [
|
|||
['change-ipv4-addresses', []],
|
||||
]
|
||||
|
||||
deps = [
|
||||
dbus_dep,
|
||||
qt_core_dep,
|
||||
qt_dbus_dep,
|
||||
qt_network_dep,
|
||||
]
|
||||
|
||||
moc = find_program('moc-qt4', required: false)
|
||||
if not moc.found()
|
||||
moc = qt_core_dep.get_pkgconfig_variable('moc_location')
|
||||
|
|
@ -34,8 +27,13 @@ foreach example: examples
|
|||
executable(
|
||||
example[0],
|
||||
example[0] + '.cpp',
|
||||
include_directories: libnm_core_inc,
|
||||
dependencies: deps,
|
||||
include_directories: libnm_core_public_inc,
|
||||
dependencies: [
|
||||
dbus_dep,
|
||||
qt_core_dep,
|
||||
qt_dbus_dep,
|
||||
qt_network_dep,
|
||||
],
|
||||
link_depends: example[1],
|
||||
)
|
||||
endforeach
|
||||
|
|
|
|||
|
|
@ -1,280 +0,0 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
libnm_core_inc = include_directories('.')
|
||||
|
||||
nm_version_macro_header = configure_file(
|
||||
input: 'nm-version-macros.h.in',
|
||||
output: '@BASENAME@',
|
||||
configuration: data_conf,
|
||||
)
|
||||
|
||||
libnm_core_nm_default_dep = declare_dependency(
|
||||
sources: nm_version_macro_header,
|
||||
include_directories: libnm_core_inc,
|
||||
dependencies: glib_nm_default_dep,
|
||||
)
|
||||
|
||||
libnm_core_headers = files(
|
||||
'nm-connection.h',
|
||||
'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',
|
||||
'nm-setting-bluetooth.h',
|
||||
'nm-setting-bond.h',
|
||||
'nm-setting-bridge-port.h',
|
||||
'nm-setting-bridge.h',
|
||||
'nm-setting-cdma.h',
|
||||
'nm-setting-connection.h',
|
||||
'nm-setting-dcb.h',
|
||||
'nm-setting-dummy.h',
|
||||
'nm-setting-ethtool.h',
|
||||
'nm-setting-generic.h',
|
||||
'nm-setting-gsm.h',
|
||||
'nm-setting-hostname.h',
|
||||
'nm-setting-infiniband.h',
|
||||
'nm-setting-ip-config.h',
|
||||
'nm-setting-ip-tunnel.h',
|
||||
'nm-setting-ip4-config.h',
|
||||
'nm-setting-ip6-config.h',
|
||||
'nm-setting-macsec.h',
|
||||
'nm-setting-macvlan.h',
|
||||
'nm-setting-match.h',
|
||||
'nm-setting-olpc-mesh.h',
|
||||
'nm-setting-ovs-bridge.h',
|
||||
'nm-setting-ovs-dpdk.h',
|
||||
'nm-setting-ovs-external-ids.h',
|
||||
'nm-setting-ovs-interface.h',
|
||||
'nm-setting-ovs-patch.h',
|
||||
'nm-setting-ovs-port.h',
|
||||
'nm-setting-ppp.h',
|
||||
'nm-setting-pppoe.h',
|
||||
'nm-setting-proxy.h',
|
||||
'nm-setting-serial.h',
|
||||
'nm-setting-sriov.h',
|
||||
'nm-setting-tc-config.h',
|
||||
'nm-setting-team-port.h',
|
||||
'nm-setting-team.h',
|
||||
'nm-setting-tun.h',
|
||||
'nm-setting-user.h',
|
||||
'nm-setting-veth.h',
|
||||
'nm-setting-vlan.h',
|
||||
'nm-setting-vpn.h',
|
||||
'nm-setting-vrf.h',
|
||||
'nm-setting-vxlan.h',
|
||||
'nm-setting-wifi-p2p.h',
|
||||
'nm-setting-wimax.h',
|
||||
'nm-setting-wired.h',
|
||||
'nm-setting-wireguard.h',
|
||||
'nm-setting-wireless-security.h',
|
||||
'nm-setting-wireless.h',
|
||||
'nm-setting-wpan.h',
|
||||
'nm-setting.h',
|
||||
'nm-simple-connection.h',
|
||||
'nm-utils.h',
|
||||
'nm-version.h',
|
||||
'nm-vpn-dbus-interface.h',
|
||||
'nm-vpn-editor-plugin.h',
|
||||
'nm-vpn-plugin-info.h',
|
||||
)
|
||||
|
||||
libnm_core_enum_sources = gnome.mkenums_simple(
|
||||
'nm-core-enum-types',
|
||||
sources: libnm_core_headers + [nm_version_macro_header],
|
||||
identifier_prefix: nm_id_prefix,
|
||||
body_prefix: '#include "libnm-core/nm-default-libnm-core.h"',
|
||||
install_header: true,
|
||||
install_dir: libnm_pkgincludedir,
|
||||
)
|
||||
|
||||
libnm_libnm_core_intern = static_library(
|
||||
'nm-libnm-core-intern',
|
||||
sources: files(
|
||||
'nm-libnm-core-intern/nm-auth-subject.c',
|
||||
'nm-libnm-core-intern/nm-libnm-core-utils.c',
|
||||
) + [libnm_core_enum_sources[1]],
|
||||
dependencies: [
|
||||
libnm_core_nm_default_dep,
|
||||
libnm_base_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
)
|
||||
|
||||
libnm_libnm_core_intern_dep = declare_dependency(
|
||||
sources: [libnm_core_enum_sources[1], nm_version_macro_header],
|
||||
include_directories: [libnm_core_inc, shared_inc],
|
||||
dependencies: [
|
||||
libnm_glib_aux_dep,
|
||||
libnm_base_dep,
|
||||
],
|
||||
link_with: libnm_libnm_core_intern,
|
||||
)
|
||||
|
||||
libnm_crypto = static_library(
|
||||
'nm-crypto',
|
||||
sources: 'nm-crypto-@0@.c'.format(crypto),
|
||||
dependencies: [
|
||||
crypto_dep,
|
||||
libnm_glib_aux_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
)
|
||||
|
||||
libnm_core_settings_sources = files(
|
||||
'nm-setting-6lowpan.c',
|
||||
'nm-setting-8021x.c',
|
||||
'nm-setting-adsl.c',
|
||||
'nm-setting-bluetooth.c',
|
||||
'nm-setting-bond.c',
|
||||
'nm-setting-bridge-port.c',
|
||||
'nm-setting-bridge.c',
|
||||
'nm-setting-cdma.c',
|
||||
'nm-setting-connection.c',
|
||||
'nm-setting-dcb.c',
|
||||
'nm-setting-dummy.c',
|
||||
'nm-setting-ethtool.c',
|
||||
'nm-setting-generic.c',
|
||||
'nm-setting-gsm.c',
|
||||
'nm-setting-hostname.c',
|
||||
'nm-setting-infiniband.c',
|
||||
'nm-setting-ip-config.c',
|
||||
'nm-setting-ip-tunnel.c',
|
||||
'nm-setting-ip4-config.c',
|
||||
'nm-setting-ip6-config.c',
|
||||
'nm-setting-macsec.c',
|
||||
'nm-setting-macvlan.c',
|
||||
'nm-setting-match.c',
|
||||
'nm-setting-olpc-mesh.c',
|
||||
'nm-setting-ovs-bridge.c',
|
||||
'nm-setting-ovs-dpdk.c',
|
||||
'nm-setting-ovs-external-ids.c',
|
||||
'nm-setting-ovs-interface.c',
|
||||
'nm-setting-ovs-patch.c',
|
||||
'nm-setting-ovs-port.c',
|
||||
'nm-setting-ppp.c',
|
||||
'nm-setting-pppoe.c',
|
||||
'nm-setting-proxy.c',
|
||||
'nm-setting-serial.c',
|
||||
'nm-setting-sriov.c',
|
||||
'nm-setting-tc-config.c',
|
||||
'nm-setting-team-port.c',
|
||||
'nm-setting-team.c',
|
||||
'nm-setting-tun.c',
|
||||
'nm-setting-user.c',
|
||||
'nm-setting-veth.c',
|
||||
'nm-setting-vlan.c',
|
||||
'nm-setting-vpn.c',
|
||||
'nm-setting-vrf.c',
|
||||
'nm-setting-vxlan.c',
|
||||
'nm-setting-wifi-p2p.c',
|
||||
'nm-setting-wimax.c',
|
||||
'nm-setting-wired.c',
|
||||
'nm-setting-wireguard.c',
|
||||
'nm-setting-wireless-security.c',
|
||||
'nm-setting-wireless.c',
|
||||
'nm-setting-wpan.c',
|
||||
)
|
||||
|
||||
libnm_core_sources = libnm_core_settings_sources + files(
|
||||
'nm-connection.c',
|
||||
'nm-crypto.c',
|
||||
'nm-dbus-utils.c',
|
||||
'nm-errors.c',
|
||||
'nm-keyfile-utils.c',
|
||||
'nm-keyfile.c',
|
||||
'nm-meta-setting-base-impl.c',
|
||||
'nm-property-compare.c',
|
||||
'nm-setting.c',
|
||||
'nm-simple-connection.c',
|
||||
'nm-team-utils.c',
|
||||
'nm-utils.c',
|
||||
'nm-vpn-editor-plugin.c',
|
||||
'nm-vpn-plugin-info.c',
|
||||
)
|
||||
|
||||
libnm_core = static_library(
|
||||
'nm-core',
|
||||
sources: libnm_core_sources + libnm_core_enum_sources + [nm_version_macro_header],
|
||||
include_directories: top_inc,
|
||||
dependencies: [
|
||||
dl_dep,
|
||||
libnm_systemd_shared_dep,
|
||||
libnm_glib_aux_dep,
|
||||
uuid_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
link_with: [
|
||||
libnm_crypto,
|
||||
libnm_libnm_core_intern,
|
||||
],
|
||||
)
|
||||
|
||||
libnm_core_dep = declare_dependency(
|
||||
sources: [libnm_core_enum_sources[1], nm_version_macro_header],
|
||||
include_directories: [libnm_core_inc, shared_inc],
|
||||
dependencies: glib_dep,
|
||||
link_with: libnm_core,
|
||||
)
|
||||
|
||||
libnm_libnm_core_aux = static_library(
|
||||
'nm-libnm-core-aux',
|
||||
sources: files(
|
||||
'nm-libnm-core-aux/nm-libnm-core-aux.c',
|
||||
) + [libnm_core_enum_sources[1]],
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
link_with: [
|
||||
libnm_libnm_core_intern,
|
||||
libnm_base,
|
||||
],
|
||||
)
|
||||
|
||||
libnm_libnm_core_aux_dep = declare_dependency(
|
||||
sources: [libnm_core_enum_sources[1], nm_version_macro_header],
|
||||
include_directories: [libnm_core_inc, shared_inc],
|
||||
dependencies: glib_dep,
|
||||
link_with: libnm_libnm_core_aux,
|
||||
)
|
||||
|
||||
docbooks = [
|
||||
['nm-dbus-types', 'nm-dbus-interface.h', 'NetworkManager D-Bus API Types'],
|
||||
['nm-vpn-dbus-types', 'nm-vpn-dbus-interface.h', 'VPN Plugin D-Bus API Types'],
|
||||
]
|
||||
|
||||
foreach docbook: docbooks
|
||||
output = docbook[0] + '.xml'
|
||||
|
||||
xml = custom_target(
|
||||
output,
|
||||
input: docbook[1],
|
||||
output: output,
|
||||
capture: true,
|
||||
command: [
|
||||
perl,
|
||||
join_paths(source_root, 'tools', 'enums-to-docbook.pl'),
|
||||
docbook[0],
|
||||
docbook[2],
|
||||
'@INPUT@',
|
||||
],
|
||||
# FIXME: gtkdoc does not depend directly on this.
|
||||
# https://github.com/mesonbuild/meson/pull/2806
|
||||
build_by_default: true,
|
||||
)
|
||||
|
||||
content_files += xml.full_path()
|
||||
endforeach
|
||||
|
||||
if enable_tests
|
||||
subdir('tests')
|
||||
endif
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
nm-libnm-core-aux is a static library that:
|
||||
|
||||
- uses parts of "libnm-core", that are public API of "libnm"
|
||||
- can be statically linked into users of libnm-core (like libnm
|
||||
and NetworkManager).
|
||||
- that can also be statically linked into other users of libnm.
|
||||
|
||||
Basically, it is a static library with utility functions that extends
|
||||
libnm-core (the part that is public API of libnm), but can also be
|
||||
used without full libnm.
|
||||
|
||||
That means:
|
||||
|
||||
- you can use it everywhere where you either statically link
|
||||
with libnm-core, or dynamically link with libnm.
|
||||
- you cannot use it inside libnm-core itself. This is the difference
|
||||
between nm-libnm-core-intern and nm-libnm-core-aux.
|
||||
|
||||
Also, since nm-libnm-core-aux itself only uses public (stable)
|
||||
API of libnm, you theoretically can copy the sources into your
|
||||
own source tree.
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
nm-libnm-core-intern is a static library that:
|
||||
|
||||
- uses parts of "libnm-core", that are public API of "libnm"
|
||||
- that is statically linked into libnm-core (and thus libnm
|
||||
and NetworkManager).
|
||||
- that can also be statically linked into other users of libnm.
|
||||
|
||||
Basically, it is a static library with utility functions that extends
|
||||
libnm-core (the part that is public API of libnm), but it is used
|
||||
by libnm-core.
|
||||
|
||||
That means:
|
||||
|
||||
- you can use it everywhere where you either statically link
|
||||
with libnm-core, or dynamically link with libnm.
|
||||
- you can even use it inside of libnm-core itself. This is the difference
|
||||
between nm-libnm-core-intern and nm-libnm-core-aux.
|
||||
|
||||
Also, since nm-libnm-core-intern itself only uses public (stable)
|
||||
API of libnm, you theoretically can copy the sources into your
|
||||
own source tree.
|
||||
|
|
@ -3,9 +3,16 @@
|
|||
libnm_inc = include_directories('.')
|
||||
|
||||
libnm_nm_default_dep = declare_dependency(
|
||||
sources: libnm_core_enum_sources[1],
|
||||
include_directories: libnm_inc,
|
||||
dependencies: libnm_core_nm_default_dep,
|
||||
include_directories: [
|
||||
libnm_inc,
|
||||
libnm_core_public_inc,
|
||||
top_inc,
|
||||
shared_inc,
|
||||
src_inc,
|
||||
],
|
||||
dependencies: [
|
||||
libnm_core_public_dep,
|
||||
],
|
||||
)
|
||||
|
||||
libnm_headers = files(
|
||||
|
|
@ -135,7 +142,7 @@ libnm_static = static_library(
|
|||
sources: libnm_sources + libnm_enum_sources,
|
||||
dependencies: [
|
||||
libnmdbus_dep,
|
||||
libnm_libnm_core_intern_dep,
|
||||
libnm_core_aux_intern_dep,
|
||||
libnm_nm_default_dep,
|
||||
libnm_udev_aux_dep,
|
||||
libudev_dep,
|
||||
|
|
@ -154,10 +161,11 @@ libnm = shared_library(
|
|||
dependencies: libnm_nm_default_dep,
|
||||
link_whole: [
|
||||
libnm_static,
|
||||
libnm_core,
|
||||
libnm_core_impl,
|
||||
libnmdbus,
|
||||
libnm_systemd_logging_stub,
|
||||
libnm_glib_aux,
|
||||
libnm_base,
|
||||
],
|
||||
link_args: '-Wl,--version-script,@0@'.format(linker_script),
|
||||
link_depends: linker_script,
|
||||
|
|
@ -194,8 +202,11 @@ if enable_introspection
|
|||
|
||||
libnm_gir = gnome.generate_gir(
|
||||
libnm,
|
||||
sources: libnm_core_sources + libnm_core_headers + libnm_core_enum_sources + libnm_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header],
|
||||
sources: libnm_core_settings_sources + libnm_core_impl_sources + libnm_core_public_enum_sources + libnm_core_headers + libnm_sources + libnm_headers + libnm_enum_sources + [nm_version_macro_header],
|
||||
includes: 'Gio-2.0',
|
||||
include_directories: [
|
||||
libnm_core_public_inc,
|
||||
],
|
||||
nsversion: nm_gir_version,
|
||||
namespace: 'NM',
|
||||
identifier_prefix: nm_id_prefix,
|
||||
|
|
@ -300,8 +311,7 @@ libnm_libnm_aux = static_library(
|
|||
'-DG_LOG_DOMAIN="libnmc"',
|
||||
],
|
||||
dependencies: [
|
||||
libnm_core_nm_default_dep,
|
||||
libnm_libnm_core_intern_dep,
|
||||
libnm_core_aux_intern_dep,
|
||||
libnm_dep,
|
||||
],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-device.h"
|
||||
#include "nm-connection.h"
|
||||
#include "nm-vpn-connection.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "nm-checkpoint.h"
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-device.h"
|
||||
#include "nm-object-private.h"
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
#include "nm-std-aux/c-list-util.h"
|
||||
#include "nm-glib-aux/nm-c-list.h"
|
||||
#include "nm-glib-aux/nm-dbus-aux.h"
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
|
||||
#include "nm-access-point.h"
|
||||
#include "nm-active-connection.h"
|
||||
#include "nm-checkpoint.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
#include "nm-device-6lowpan.h"
|
||||
#include "nm-device-adsl.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-device-bond.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-device-bridge.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-setting-ip-tunnel.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-setting-ovs-bridge.h"
|
||||
#include "nm-setting-ovs-port.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-setting-ovs-port.h"
|
||||
#include "nm-setting-ovs-port.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-setting-team.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-wifi-p2p-peer.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-access-point.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include "nm-ip6-config.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-remote-connection.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
#include "nm-device-tun.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include "nm-client.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************
|
||||
* NMDnsEntry
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include "nm-dbus-interface.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#include "nm-libnm-utils.h"
|
||||
|
||||
#include "nm-glib-aux/nm-time-utils.h"
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
#include "nm-object.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "nm-object-private.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
#include "nm-client.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "c-list/src/c-list.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include "nm-dbus-interface.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-remote-connection-private.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#include "nm-secret-agent-old.h"
|
||||
|
||||
#include "c-list/src/c-list.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-enum-types.h"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-connection.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-simple-connection.h"
|
||||
#include "nm-vpn-service-plugin.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-connection.h"
|
||||
#include "nm-dbus-helpers.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-simple-connection.h"
|
||||
|
||||
#include "introspection/org.freedesktop.NetworkManager.VPN.Plugin.h"
|
||||
|
|
|
|||
|
|
@ -16,13 +16,16 @@ foreach test_unit: test_units
|
|||
libnm_enum_sources[1],
|
||||
],
|
||||
dependencies: [
|
||||
libnm_core_dep,
|
||||
libnm_core_impl_dep_link,
|
||||
libnm_nm_default_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
],
|
||||
link_with: libnm_static,
|
||||
link_with: [
|
||||
libnm_static,
|
||||
libnm_base,
|
||||
],
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "nm-libnm-utils.h"
|
||||
#include "nm-object.h"
|
||||
#include "nm-vpn-service-plugin.h"
|
||||
#include "nm-libnm-core-intern/nm-libnm-core-utils.h"
|
||||
#include "libnm-core-aux-intern/nm-libnm-core-utils.h"
|
||||
|
||||
#include "nm-utils/nm-test-utils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -917,8 +917,7 @@ content_files = []
|
|||
|
||||
subdir('introspection')
|
||||
subdir('shared')
|
||||
subdir('libnm-core')
|
||||
subdir('src/core')
|
||||
subdir('src')
|
||||
subdir('libnm')
|
||||
subdir('dispatcher')
|
||||
subdir('clients')
|
||||
|
|
|
|||
140
po/POTFILES.in
140
po/POTFILES.in
|
|
@ -33,9 +33,9 @@ clients/tui/nmt-page-bridge.c
|
|||
clients/tui/nmt-page-dsl.c
|
||||
clients/tui/nmt-page-ethernet.c
|
||||
clients/tui/nmt-page-infiniband.c
|
||||
clients/tui/nmt-page-ip-tunnel.c
|
||||
clients/tui/nmt-page-ip4.c
|
||||
clients/tui/nmt-page-ip6.c
|
||||
clients/tui/nmt-page-ip-tunnel.c
|
||||
clients/tui/nmt-page-ppp.c
|
||||
clients/tui/nmt-page-team-port.c
|
||||
clients/tui/nmt-page-team.c
|
||||
|
|
@ -51,67 +51,7 @@ clients/tui/nmtui-connect.c
|
|||
clients/tui/nmtui-edit.c
|
||||
clients/tui/nmtui-hostname.c
|
||||
clients/tui/nmtui.c
|
||||
libnm-core/nm-crypto.c
|
||||
libnm-core/nm-crypto-gnutls.c
|
||||
libnm-core/nm-crypto-nss.c
|
||||
libnm-core/nm-connection.c
|
||||
libnm-core/nm-dbus-utils.c
|
||||
libnm-core/nm-keyfile-utils.c
|
||||
libnm-core/nm-keyfile.c
|
||||
libnm-core/nm-libnm-core-aux/nm-libnm-core-aux.c
|
||||
libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
|
||||
libnm-core/nm-setting-6lowpan.c
|
||||
libnm-core/nm-setting-8021x.c
|
||||
libnm-core/nm-setting-adsl.c
|
||||
libnm-core/nm-setting-bluetooth.c
|
||||
libnm-core/nm-setting-bond.c
|
||||
libnm-core/nm-setting-bridge-port.c
|
||||
libnm-core/nm-setting-bridge.c
|
||||
libnm-core/nm-setting-cdma.c
|
||||
libnm-core/nm-setting-connection.c
|
||||
libnm-core/nm-setting-dcb.c
|
||||
libnm-core/nm-setting-ethtool.c
|
||||
libnm-core/nm-setting-gsm.c
|
||||
libnm-core/nm-setting-infiniband.c
|
||||
libnm-core/nm-setting-ip-config.c
|
||||
libnm-core/nm-setting-ip-tunnel.c
|
||||
libnm-core/nm-setting-ip4-config.c
|
||||
libnm-core/nm-setting-ip6-config.c
|
||||
libnm-core/nm-setting-macsec.c
|
||||
libnm-core/nm-setting-macvlan.c
|
||||
libnm-core/nm-setting-match.c
|
||||
libnm-core/nm-setting-olpc-mesh.c
|
||||
libnm-core/nm-setting-ovs-bridge.c
|
||||
libnm-core/nm-setting-ovs-external-ids.c
|
||||
libnm-core/nm-setting-ovs-interface.c
|
||||
libnm-core/nm-setting-ovs-patch.c
|
||||
libnm-core/nm-setting-ovs-port.c
|
||||
libnm-core/nm-setting-ppp.c
|
||||
libnm-core/nm-setting-pppoe.c
|
||||
libnm-core/nm-setting-proxy.c
|
||||
libnm-core/nm-setting-sriov.c
|
||||
libnm-core/nm-setting-tc-config.c
|
||||
libnm-core/nm-setting-team-port.c
|
||||
libnm-core/nm-setting-team.c
|
||||
libnm-core/nm-setting-tun.c
|
||||
libnm-core/nm-setting-user.c
|
||||
libnm-core/nm-setting-veth.c
|
||||
libnm-core/nm-setting-vlan.c
|
||||
libnm-core/nm-setting-vrf.c
|
||||
libnm-core/nm-setting-vpn.c
|
||||
libnm-core/nm-setting-vxlan.c
|
||||
libnm-core/nm-setting-wifi-p2p.c
|
||||
libnm-core/nm-setting-wimax.c
|
||||
libnm-core/nm-setting-wired.c
|
||||
libnm-core/nm-setting-wireguard.c
|
||||
libnm-core/nm-setting-wireless-security.c
|
||||
libnm-core/nm-setting-wireless.c
|
||||
libnm-core/nm-setting-wpan.c
|
||||
libnm-core/nm-setting.c
|
||||
libnm-core/nm-team-utils.c
|
||||
libnm-core/nm-utils.c
|
||||
libnm-core/nm-vpn-editor-plugin.c
|
||||
libnm-core/nm-vpn-plugin-info.c
|
||||
data/org.freedesktop.NetworkManager.policy.in.in
|
||||
libnm/nm-client.c
|
||||
libnm/nm-device-6lowpan.c
|
||||
libnm/nm-device-adsl.c
|
||||
|
|
@ -145,16 +85,9 @@ libnm/nm-remote-connection.c
|
|||
libnm/nm-secret-agent-old.c
|
||||
libnm/nm-vpn-plugin-old.c
|
||||
libnm/nm-vpn-service-plugin.c
|
||||
data/org.freedesktop.NetworkManager.policy.in.in
|
||||
shared/nm-glib-aux/nm-shared-utils.c
|
||||
shared/nm-log-core/nm-logging.c
|
||||
src/core/NetworkManagerUtils.c
|
||||
src/core/main.c
|
||||
src/core/main-utils.c
|
||||
src/core/dhcp/nm-dhcp-dhclient.c
|
||||
src/core/dhcp/nm-dhcp-dhclient-utils.c
|
||||
src/core/dhcp/nm-dhcp-manager.c
|
||||
src/core/dns/nm-dns-manager.c
|
||||
src/core/devices/adsl/nm-device-adsl.c
|
||||
src/core/devices/bluetooth/nm-bluez-manager.c
|
||||
src/core/devices/bluetooth/nm-device-bt.c
|
||||
|
|
@ -162,8 +95,8 @@ src/core/devices/nm-device-6lowpan.c
|
|||
src/core/devices/nm-device-bond.c
|
||||
src/core/devices/nm-device-bridge.c
|
||||
src/core/devices/nm-device-dummy.c
|
||||
src/core/devices/nm-device-ethernet.c
|
||||
src/core/devices/nm-device-ethernet-utils.c
|
||||
src/core/devices/nm-device-ethernet.c
|
||||
src/core/devices/nm-device-infiniband.c
|
||||
src/core/devices/nm-device-ip-tunnel.c
|
||||
src/core/devices/nm-device-macvlan.c
|
||||
|
|
@ -178,8 +111,75 @@ src/core/devices/wifi/nm-device-olpc-mesh.c
|
|||
src/core/devices/wifi/nm-device-wifi.c
|
||||
src/core/devices/wifi/nm-wifi-utils.c
|
||||
src/core/devices/wwan/nm-modem-broadband.c
|
||||
src/core/dhcp/nm-dhcp-dhclient-utils.c
|
||||
src/core/dhcp/nm-dhcp-dhclient.c
|
||||
src/core/dhcp/nm-dhcp-manager.c
|
||||
src/core/dns/nm-dns-manager.c
|
||||
src/core/main-utils.c
|
||||
src/core/main.c
|
||||
src/core/nm-config.c
|
||||
src/core/nm-iface-helper.c
|
||||
src/core/nm-manager.c
|
||||
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
|
||||
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
|
||||
src/libnm-core-aux-extern/nm-libnm-core-aux.c
|
||||
src/libnm-core-aux-intern/nm-libnm-core-utils.c
|
||||
src/libnm-core-impl/nm-connection.c
|
||||
src/libnm-core-impl/nm-crypto-gnutls.c
|
||||
src/libnm-core-impl/nm-crypto-nss.c
|
||||
src/libnm-core-impl/nm-crypto.c
|
||||
src/libnm-core-impl/nm-dbus-utils.c
|
||||
src/libnm-core-impl/nm-keyfile-utils.c
|
||||
src/libnm-core-impl/nm-keyfile.c
|
||||
src/libnm-core-impl/nm-setting-6lowpan.c
|
||||
src/libnm-core-impl/nm-setting-8021x.c
|
||||
src/libnm-core-impl/nm-setting-adsl.c
|
||||
src/libnm-core-impl/nm-setting-bluetooth.c
|
||||
src/libnm-core-impl/nm-setting-bond.c
|
||||
src/libnm-core-impl/nm-setting-bridge-port.c
|
||||
src/libnm-core-impl/nm-setting-bridge.c
|
||||
src/libnm-core-impl/nm-setting-cdma.c
|
||||
src/libnm-core-impl/nm-setting-connection.c
|
||||
src/libnm-core-impl/nm-setting-dcb.c
|
||||
src/libnm-core-impl/nm-setting-ethtool.c
|
||||
src/libnm-core-impl/nm-setting-gsm.c
|
||||
src/libnm-core-impl/nm-setting-infiniband.c
|
||||
src/libnm-core-impl/nm-setting-ip-config.c
|
||||
src/libnm-core-impl/nm-setting-ip-tunnel.c
|
||||
src/libnm-core-impl/nm-setting-ip4-config.c
|
||||
src/libnm-core-impl/nm-setting-ip6-config.c
|
||||
src/libnm-core-impl/nm-setting-macsec.c
|
||||
src/libnm-core-impl/nm-setting-macvlan.c
|
||||
src/libnm-core-impl/nm-setting-match.c
|
||||
src/libnm-core-impl/nm-setting-olpc-mesh.c
|
||||
src/libnm-core-impl/nm-setting-ovs-bridge.c
|
||||
src/libnm-core-impl/nm-setting-ovs-external-ids.c
|
||||
src/libnm-core-impl/nm-setting-ovs-interface.c
|
||||
src/libnm-core-impl/nm-setting-ovs-patch.c
|
||||
src/libnm-core-impl/nm-setting-ovs-port.c
|
||||
src/libnm-core-impl/nm-setting-ppp.c
|
||||
src/libnm-core-impl/nm-setting-pppoe.c
|
||||
src/libnm-core-impl/nm-setting-proxy.c
|
||||
src/libnm-core-impl/nm-setting-sriov.c
|
||||
src/libnm-core-impl/nm-setting-tc-config.c
|
||||
src/libnm-core-impl/nm-setting-team-port.c
|
||||
src/libnm-core-impl/nm-setting-team.c
|
||||
src/libnm-core-impl/nm-setting-tun.c
|
||||
src/libnm-core-impl/nm-setting-user.c
|
||||
src/libnm-core-impl/nm-setting-veth.c
|
||||
src/libnm-core-impl/nm-setting-vlan.c
|
||||
src/libnm-core-impl/nm-setting-vpn.c
|
||||
src/libnm-core-impl/nm-setting-vrf.c
|
||||
src/libnm-core-impl/nm-setting-vxlan.c
|
||||
src/libnm-core-impl/nm-setting-wifi-p2p.c
|
||||
src/libnm-core-impl/nm-setting-wimax.c
|
||||
src/libnm-core-impl/nm-setting-wired.c
|
||||
src/libnm-core-impl/nm-setting-wireguard.c
|
||||
src/libnm-core-impl/nm-setting-wireless-security.c
|
||||
src/libnm-core-impl/nm-setting-wireless.c
|
||||
src/libnm-core-impl/nm-setting-wpan.c
|
||||
src/libnm-core-impl/nm-setting.c
|
||||
src/libnm-core-impl/nm-team-utils.c
|
||||
src/libnm-core-impl/nm-utils.c
|
||||
src/libnm-core-impl/nm-vpn-editor-plugin.c
|
||||
src/libnm-core-impl/nm-vpn-plugin-info.c
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ shared_inc = include_directories('.')
|
|||
|
||||
glib_nm_default_dep = declare_dependency(
|
||||
include_directories: [
|
||||
top_inc,
|
||||
shared_inc,
|
||||
top_inc,
|
||||
],
|
||||
dependencies: [
|
||||
glib_dep,
|
||||
|
|
@ -139,7 +139,17 @@ libnm_glib_aux = static_library(
|
|||
)
|
||||
|
||||
libnm_glib_aux_dep = declare_dependency(
|
||||
dependencies: glib_nm_default_dep,
|
||||
include_directories: [
|
||||
shared_inc,
|
||||
top_inc,
|
||||
],
|
||||
dependencies: [
|
||||
glib_nm_default_dep,
|
||||
],
|
||||
)
|
||||
|
||||
libnm_glib_aux_dep_link = declare_dependency(
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
link_with: libnm_glib_aux,
|
||||
)
|
||||
|
||||
|
|
@ -165,7 +175,7 @@ libnm_base = static_library(
|
|||
sources: files(
|
||||
'nm-base/nm-ethtool-base.c',
|
||||
),
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
dependencies: libnm_glib_aux_dep_link,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
|
|
@ -174,6 +184,10 @@ libnm_base = static_library(
|
|||
libnm_base_dep = declare_dependency(
|
||||
include_directories: shared_inc,
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
)
|
||||
|
||||
libnm_base_dep_link = declare_dependency(
|
||||
dependencies: libnm_glib_aux_dep_link,
|
||||
link_with: libnm_base,
|
||||
)
|
||||
|
||||
|
|
@ -192,7 +206,7 @@ libnm_log_core = static_library(
|
|||
libnm_log_core_dep = declare_dependency(
|
||||
include_directories: shared_inc,
|
||||
dependencies: [
|
||||
libnm_glib_aux_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
link_with: libnm_log_core,
|
||||
)
|
||||
|
|
@ -215,7 +229,7 @@ libnm_platform = static_library(
|
|||
libnm_platform_dep = declare_dependency(
|
||||
include_directories: shared_inc,
|
||||
dependencies: [
|
||||
libnm_glib_aux_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
],
|
||||
link_with: libnm_platform,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ exe = executable(
|
|||
c_args: [
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
],
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
dependencies: libnm_glib_aux_dep_link,
|
||||
link_with: libnm_systemd_logging_stub,
|
||||
)
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ if jansson_dep.found()
|
|||
'-DG_LOG_DOMAIN="test"',
|
||||
],
|
||||
dependencies: [
|
||||
libnm_glib_aux_dep,
|
||||
libnm_glib_aux_dep_link,
|
||||
jansson_dep,
|
||||
dl_dep,
|
||||
],
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
|
||||
#include "nm-glib-aux/nm-c-list.h"
|
||||
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "nm-setting-ip4-config.h"
|
||||
#include "nm-setting-ip6-config.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nmp-object.h"
|
||||
|
||||
#include "platform/nm-platform.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,12 @@ libnm_device_plugin_bluetooth_static = static_library(
|
|||
'nm-bt-error.c',
|
||||
'nm-device-bt.c',
|
||||
) + (enable_bluez5_dun ? files('nm-bluez5-dun.c') : files()),
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="NetworkManager"',
|
||||
],
|
||||
dependencies: [
|
||||
libnm_core_public_dep,
|
||||
libnm_core_intern_dep,
|
||||
core_default_dep,
|
||||
libnm_wwan_dep,
|
||||
bluez5_dep,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include "nm-device-bt.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-bluez5-dun.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#include <stdio.h>
|
||||
#include <linux/if_ether.h>
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-bluez-common.h"
|
||||
#include "nm-bluez-manager.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-ip4-config.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceBond
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceBridge
|
||||
#include "nm-device-logging.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-dummy.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceDummy
|
||||
#include "nm-device-logging.h"
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#include "nm-device-ethernet-utils.h"
|
||||
#include "settings/nm-settings.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-udev-aux/nm-udev-utils.h"
|
||||
#include "nm-device-veth.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-utils.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-setting-bluetooth.h"
|
||||
|
||||
#define PLUGIN_PREFIX "libnm-device-plugin-"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "nm-ip4-config.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define NM_DEVICE_INFINIBAND_IS_PARTITION "is-partition"
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include "nm-manager.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "settings/nm-settings.h"
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-ip4-config.h"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include "nm-device-factory.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-setting-macsec.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "supplicant/nm-supplicant-manager.h"
|
||||
#include "supplicant/nm-supplicant-interface.h"
|
||||
#include "supplicant/nm-supplicant-config.h"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-tun.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceTun
|
||||
#include "nm-device-logging.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-device-veth.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-manager.h"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nmp-object.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceVlan
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "nm-device-vrf.h"
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-manager.h"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include "settings/nm-settings.h"
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceVxlan
|
||||
#include "nm-device-logging.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include <linux/fib_rules.h>
|
||||
|
||||
#include "nm-setting-wireguard.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-glib-aux/nm-secret-utils.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include "platform/nm-platform.h"
|
||||
#include "nm-device-factory.h"
|
||||
#include "nm-setting-wpan.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceWpan
|
||||
#include "nm-device-logging.h"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#include "systemd/nm-sd-utils-shared.h"
|
||||
|
||||
#include "nm-base/nm-ethtool-base.h"
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-l3cfg.h"
|
||||
#include "nm-l3-config-data.h"
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
#include "c-list/src/c-list.h"
|
||||
#include "dns/nm-dns-manager.h"
|
||||
#include "nm-acd-manager.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "systemd/nm-sd.h"
|
||||
#include "nm-lldp-listener.h"
|
||||
#include "nm-audit-manager.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "nm-setting-connection.h"
|
||||
#include "nm-setting-ovs-bridge.h"
|
||||
#include "nm-setting-ovs-external-ids.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceOvsBridge
|
||||
#include "devices/nm-device-logging.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "nm-device-ovs-port.h"
|
||||
#include "nm-device-ovs-bridge.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "settings/nm-settings.h"
|
||||
#include "devices/nm-device-factory.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include "nm-glib-aux/nm-jansson.h"
|
||||
#include "nm-glib-aux/nm-str-buf.h"
|
||||
#include "nm-core-utils.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "devices/nm-device.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-setting-ovs-external-ids.h"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include "devices/nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-config.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include "devices/nm-device-factory.h"
|
||||
#include "nm-device-team.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
#include "devices/nm-device.h"
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-config.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "nm-glib-aux/nm-ref-string.h"
|
||||
#include "nm-iwd-manager.h"
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
#include "nm-setting-8021x.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "nm-setting-wireless-security.h"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "nm-act-request.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-glib-aux/nm-ref-string.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-manager.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "nm-glib-aux/nm-c-list.h"
|
||||
#include "nm-device-wifi-p2p.h"
|
||||
#include "nm-wifi-ap.h"
|
||||
#include "nm-libnm-core-intern/nm-common-macros.h"
|
||||
#include "libnm-core-aux-intern/nm-common-macros.h"
|
||||
#include "devices/nm-device.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
#include "settings/nm-settings.h"
|
||||
#include "nm-wifi-utils.h"
|
||||
#include "nm-wifi-common.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-config.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceWifi
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include <net/if.h>
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-manager.h"
|
||||
#include "nm-device-iwd.h"
|
||||
#include "nm-wifi-utils.h"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "nm-glib-aux/nm-ref-string.h"
|
||||
#include "nm-setting-wireless.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "nm-glib-aux/nm-ref-string.h"
|
||||
#include "nm-setting-wireless.h"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#include <stdlib.h>
|
||||
|
||||
#include "nm-utils.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
static gboolean
|
||||
verify_no_wep(NMSettingWirelessSecurity *s_wsec, const char *tag, GError **error)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "devices/wifi/nm-wifi-utils.h"
|
||||
#include "devices/wifi/nm-device-wifi.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#include "nm-test-utils-core.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include "settings/nm-settings-connection.h"
|
||||
#include "nm-modem-broadband.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
|
||||
#define _NMLOG_DEVICE_TYPE NMDeviceModem
|
||||
#include "devices/nm-device-logging.h"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include <arpa/inet.h>
|
||||
#include <libmm-glib.h>
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "platform/nm-platform.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "nm-modem-ofono.h"
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "devices/nm-device-private.h"
|
||||
#include "nm-modem.h"
|
||||
#include "platform/nm-platform.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include <termios.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "nm-dhcp-helper-api.h"
|
||||
#include "nm-dhcp-client.h"
|
||||
#include "nm-dhcp-manager.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "libnm-core-intern/nm-core-internal.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue