fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 07:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: merge branch 'th/build-include-paths'

Browse source
This commit is contained in:
Thomas Haller 2016-11-21 14:29:46 +01:00
commit 44f9d16d18
175 changed files with 546 additions and 586 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.gitignore vendored
View file

@ -242,11 +242,11 @@ test-*.trs
/src/devices/tests/test-arping
/src/devices/tests/test-lldp
/src/devices/wifi/tests/test-general
/src/dhcp-manager/nm-dhcp-helper
/src/dhcp-manager/tests/test-dhcp-dhclient
/src/dhcp-manager/tests/test-dhcp-options
/src/dhcp-manager/tests/test-dhcp-utils
/src/dnsmasq-manager/tests/test-dnsmasq-utils
/src/dhcp/nm-dhcp-helper
/src/dhcp/tests/test-dhcp-dhclient
/src/dhcp/tests/test-dhcp-options
/src/dhcp/tests/test-dhcp-utils
/src/dnsmasq/tests/test-dnsmasq-utils
/src/nm-iface-helper
/src/ndisc/tests/test-ndisc-fake
/src/ndisc/tests/test-ndisc-linux
@ -256,7 +256,7 @@ test-*.trs
/src/settings/plugins/ifnet/tests/test-ifnet
/src/settings/plugins/ifupdown/tests/test-ifupdown
/src/settings/plugins/keyfile/tests/test-keyfile
/src/supplicant-manager/tests/test-supplicant-config
/src/supplicant/tests/test-supplicant-config
/src/tests/config/test-config
/src/tests/test-dcb
/src/tests/test-general
@ -288,6 +288,12 @@ test-*.trs
/initscript/Slackware/rc.networkmanager
/initscript/*/[Nn]etwork[Mm]anager
/src/devices/wifi/tests/test-wifi-ap-utils
/src/dhcp-manager/nm-dhcp-helper
/src/dhcp-manager/tests/test-dhcp-dhclient
/src/dhcp-manager/tests/test-dhcp-options
/src/dhcp-manager/tests/test-dhcp-utils
/src/dnsmasq-manager/tests/test-dnsmasq-utils
/src/rdisc/
/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
/src/settings/plugins/ifnet/tests/check_ifnet
/src/rdisc/
/src/supplicant-manager/tests/test-supplicant-config

599
Makefile.am
View file

@ -464,10 +464,10 @@ nodist_libnminclude_HEADERS += \
###############################################################################
dflt_cppflags_libnm_core = \
-I${srcdir}/shared \
-I${builddir}/shared \
-I${srcdir}/libnm-core \
-I${builddir}/libnm-core \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
$(CODE_COVERAGE_CFLAGS) \
$(GLIB_CFLAGS) \
$(JANSSON_CFLAGS)
@ -887,8 +887,8 @@ check_programs += $(libnm_tests_programs)
libnm_tests_cppflags = \
$(dflt_cppflags_libnm_core) \
-I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\"
@ -926,20 +926,20 @@ libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd)
check_ltlibraries += libnm/tests/libnm-vpn-plugin-utils-test.la
libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
shared/nm-utils/nm-vpn-plugin-utils.c \
shared/nm-utils/nm-vpn-plugin-utils.h
shared/nm-utils/nm-vpn-plugin-utils.c \
shared/nm-utils/nm-vpn-plugin-utils.h
libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
$(GLIB_CFLAGS)
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
$(GLIB_CFLAGS)
libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
$(GLIB_LIBS)
$(GLIB_LIBS)
###############################################################################
# src/
@ -947,20 +947,9 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
src_cppflags = \
$(dflt_cppflags_libnm_core) \
-I$(top_builddir)/introspection \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/devices \
-I$(top_srcdir)/src/dhcp-manager \
-I$(top_srcdir)/src/dns-manager \
-I$(top_srcdir)/src/dnsmasq-manager \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/platform/wifi \
-I$(top_srcdir)/src/ppp-manager \
-I$(top_srcdir)/src/ndisc \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/supplicant-manager \
-I$(top_srcdir)/src/vpn-manager \
-I$(builddir)/introspection \
-I$(srcdir)/src \
-I$(builddir)/src \
\
-DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
@ -1013,16 +1002,16 @@ noinst_LTLIBRARIES += \
###############################################################################
src_libsystemd_nm_la_cppflags = \
-I$(top_srcdir)/shared/ \
-I$(top_builddir)/shared/ \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
-I$(top_srcdir)/src/systemd/sd-adapt/ \
-I$(top_srcdir)/src/systemd/src/systemd/ \
-I$(top_srcdir)/src/systemd/src/basic/ \
-I$(top_srcdir)/src/systemd/src/shared/ \
-I$(top_srcdir)/src/systemd/src/libsystemd-network/ \
-I$(srcdir)/src/systemd/sd-adapt \
-I$(srcdir)/src/systemd/src/systemd \
-I$(srcdir)/src/systemd/src/basic \
-I$(srcdir)/src/systemd/src/shared \
-I$(srcdir)/src/systemd/src/libsystemd-network \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS)
@ -1215,14 +1204,14 @@ src_libNetworkManagerBase_la_SOURCES = \
src/nm-route-manager.c \
src/nm-route-manager.h \
\
src/dhcp-manager/nm-dhcp-client.c \
src/dhcp-manager/nm-dhcp-client.h \
src/dhcp-manager/nm-dhcp-client-logging.h \
src/dhcp-manager/nm-dhcp-utils.c \
src/dhcp-manager/nm-dhcp-utils.h \
src/dhcp-manager/nm-dhcp-systemd.c \
src/dhcp-manager/nm-dhcp-manager.c \
src/dhcp-manager/nm-dhcp-manager.h \
src/dhcp/nm-dhcp-client.c \
src/dhcp/nm-dhcp-client.h \
src/dhcp/nm-dhcp-client-logging.h \
src/dhcp/nm-dhcp-utils.c \
src/dhcp/nm-dhcp-utils.h \
src/dhcp/nm-dhcp-systemd.c \
src/dhcp/nm-dhcp-manager.c \
src/dhcp/nm-dhcp-manager.h \
\
src/main-utils.c \
src/main-utils.h \
@ -1291,33 +1280,33 @@ src_libNetworkManager_la_SOURCES = \
src/devices/nm-device-vxlan.c \
src/devices/nm-device-vxlan.h \
\
src/dhcp-manager/nm-dhcp-dhclient.c \
src/dhcp-manager/nm-dhcp-dhcpcd.c \
src/dhcp-manager/nm-dhcp-helper-api.h \
src/dhcp-manager/nm-dhcp-listener.c \
src/dhcp-manager/nm-dhcp-listener.h \
src/dhcp-manager/nm-dhcp-dhclient-utils.c \
src/dhcp-manager/nm-dhcp-dhclient-utils.h \
src/dhcp/nm-dhcp-dhclient.c \
src/dhcp/nm-dhcp-dhcpcd.c \
src/dhcp/nm-dhcp-helper-api.h \
src/dhcp/nm-dhcp-listener.c \
src/dhcp/nm-dhcp-listener.h \
src/dhcp/nm-dhcp-dhclient-utils.c \
src/dhcp/nm-dhcp-dhclient-utils.h \
\
src/dns-manager/nm-dns-dnsmasq.c \
src/dns-manager/nm-dns-dnsmasq.h \
src/dns-manager/nm-dns-systemd-resolved.c \
src/dns-manager/nm-dns-systemd-resolved.h \
src/dns-manager/nm-dns-unbound.c \
src/dns-manager/nm-dns-unbound.h \
src/dns-manager/nm-dns-manager.c \
src/dns-manager/nm-dns-manager.h \
src/dns-manager/nm-dns-plugin.c \
src/dns-manager/nm-dns-plugin.h \
src/dns/nm-dns-dnsmasq.c \
src/dns/nm-dns-dnsmasq.h \
src/dns/nm-dns-systemd-resolved.c \
src/dns/nm-dns-systemd-resolved.h \
src/dns/nm-dns-unbound.c \
src/dns/nm-dns-unbound.h \
src/dns/nm-dns-manager.c \
src/dns/nm-dns-manager.h \
src/dns/nm-dns-plugin.c \
src/dns/nm-dns-plugin.h \
\
src/dnsmasq-manager/nm-dnsmasq-manager.c \
src/dnsmasq-manager/nm-dnsmasq-manager.h \
src/dnsmasq-manager/nm-dnsmasq-utils.c \
src/dnsmasq-manager/nm-dnsmasq-utils.h \
src/dnsmasq/nm-dnsmasq-manager.c \
src/dnsmasq/nm-dnsmasq-manager.h \
src/dnsmasq/nm-dnsmasq-utils.c \
src/dnsmasq/nm-dnsmasq-utils.h \
\
src/ppp-manager/nm-ppp-manager.c \
src/ppp-manager/nm-ppp-manager.h \
src/ppp-manager/nm-ppp-status.h \
src/ppp/nm-ppp-manager.c \
src/ppp/nm-ppp-manager.h \
src/ppp/nm-ppp-status.h \
\
src/settings/nm-agent-manager.c \
src/settings/nm-agent-manager.h \
@ -1343,20 +1332,20 @@ src_libNetworkManager_la_SOURCES = \
src/settings/plugins/keyfile/nms-keyfile-writer.c \
src/settings/plugins/keyfile/nms-keyfile-writer.h \
\
src/supplicant-manager/nm-supplicant-config.c \
src/supplicant-manager/nm-supplicant-config.h \
src/supplicant-manager/nm-supplicant-interface.c \
src/supplicant-manager/nm-supplicant-interface.h \
src/supplicant-manager/nm-supplicant-manager.c \
src/supplicant-manager/nm-supplicant-manager.h \
src/supplicant-manager/nm-supplicant-settings-verify.c \
src/supplicant-manager/nm-supplicant-settings-verify.h \
src/supplicant-manager/nm-supplicant-types.h \
src/supplicant/nm-supplicant-config.c \
src/supplicant/nm-supplicant-config.h \
src/supplicant/nm-supplicant-interface.c \
src/supplicant/nm-supplicant-interface.h \
src/supplicant/nm-supplicant-manager.c \
src/supplicant/nm-supplicant-manager.h \
src/supplicant/nm-supplicant-settings-verify.c \
src/supplicant/nm-supplicant-settings-verify.h \
src/supplicant/nm-supplicant-types.h \
\
src/vpn-manager/nm-vpn-connection.c \
src/vpn-manager/nm-vpn-connection.h \
src/vpn-manager/nm-vpn-manager.c \
src/vpn-manager/nm-vpn-manager.h \
src/vpn/nm-vpn-connection.c \
src/vpn/nm-vpn-connection.h \
src/vpn/nm-vpn-manager.c \
src/vpn/nm-vpn-manager.h \
\
src/nm-act-request.c \
src/nm-act-request.h \
@ -1429,8 +1418,7 @@ src_libNetworkManager_la_LIBADD = \
check_ltlibraries += src/libNetworkManagerTest.la
src_tests_cppflags = \
$(src_cppflags) \
-I$(top_srcdir)/src/platform/tests
$(src_cppflags)
if REQUIRE_ROOT_TESTS
src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1
@ -1506,86 +1494,86 @@ EXTRA_DIST += \
src/NetworkManager.ver-orig
###############################################################################
# src/dhcp-manager
# src/dhcp
###############################################################################
libexec_PROGRAMS += src/dhcp-manager/nm-dhcp-helper
libexec_PROGRAMS += src/dhcp/nm-dhcp-helper
src_dhcp_manager_nm_dhcp_helper_CPPFLAGS = \
src_dhcp_nm_dhcp_helper_CPPFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/shared \
-I${top_builddir}/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
-DNMRUNDIR=\"$(nmrundir)\"
src_dhcp_manager_nm_dhcp_helper_SOURCES = \
src/dhcp-manager/nm-dhcp-helper.c \
src/dhcp-manager/nm-dhcp-helper-api.h \
src_dhcp_nm_dhcp_helper_SOURCES = \
src/dhcp/nm-dhcp-helper.c \
src/dhcp/nm-dhcp-helper-api.h \
$(NULL)
src_dhcp_manager_nm_dhcp_helper_LDFLAGS = \
src_dhcp_nm_dhcp_helper_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
src_dhcp_manager_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
###############################################################################
# src/dhcp-manager/tests
# src/dhcp/tests
###############################################################################
src_dhcp_manager_tests_cppflags = \
src_dhcp_tests_cppflags = \
$(src_tests_cppflags) \
-DTESTDIR="\"$(abs_srcdir)/src/dhcp-manager/tests\""
-DTESTDIR="\"$(abs_srcdir)/src/dhcp/tests\""
src_dhcp_manager_tests_ldadd = \
src_dhcp_tests_ldadd = \
src/libNetworkManagerTest.la
check_programs += \
src/dhcp-manager/tests/test-dhcp-dhclient \
src/dhcp-manager/tests/test-dhcp-utils
src/dhcp/tests/test-dhcp-dhclient \
src/dhcp/tests/test-dhcp-utils
src_dhcp_manager_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_manager_tests_cppflags)
src_dhcp_manager_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_manager_tests_cppflags)
src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags)
src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags)
src_dhcp_manager_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_manager_tests_ldadd)
src_dhcp_manager_tests_test_dhcp_utils_LDADD = $(src_dhcp_manager_tests_ldadd)
src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd)
src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
EXTRA_DIST += \
src/dhcp-manager/tests/test-dhclient-duid.leases \
src/dhcp-manager/tests/test-dhclient-commented-duid.leases \
src/dhcp-manager/tests/leases/basic.leases \
src/dhcp-manager/tests/leases/malformed1.leases \
src/dhcp-manager/tests/leases/malformed2.leases \
src/dhcp-manager/tests/leases/malformed3.leases
src/dhcp/tests/test-dhclient-duid.leases \
src/dhcp/tests/test-dhclient-commented-duid.leases \
src/dhcp/tests/leases/basic.leases \
src/dhcp/tests/leases/malformed1.leases \
src/dhcp/tests/leases/malformed2.leases \
src/dhcp/tests/leases/malformed3.leases
###############################################################################
# src/ppp-manager
# src/ppp
###############################################################################
if WITH_PPP
pppd_plugin_LTLIBRARIES += src/ppp-manager/nm-pppd-plugin.la
pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la
src_ppp_manager_nm_pppd_plugin_la_CPPFLAGS = \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_srcdir}/src \
-I${top_builddir}/libnm-core \
src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(srcdir)/src \
-I$(builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
src_ppp_manager_nm_pppd_plugin_la_SOURCES = \
src/ppp-manager/nm-pppd-plugin.c \
src/ppp-manager/nm-pppd-plugin.h \
src/ppp-manager/nm-ppp-status.h
src_ppp_nm_pppd_plugin_la_SOURCES = \
src/ppp/nm-pppd-plugin.c \
src/ppp/nm-pppd-plugin.h \
src/ppp/nm-ppp-status.h
src_ppp_manager_nm_pppd_plugin_la_LDFLAGS = \
src_ppp_nm_pppd_plugin_la_LDFLAGS = \
-module -avoid-version
src_ppp_manager_nm_pppd_plugin_la_LIBADD = \
src_ppp_nm_pppd_plugin_la_LIBADD = \
$(GLIB_LIBS) \
$(DL_LIBS)
@ -1599,7 +1587,6 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
$(src_tests_cppflags) \
-I$(top_srcdir)/src/settings/plugins/keyfile \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\"
@ -1659,13 +1646,11 @@ core_plugins += src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la
src_settings_plugins_ibft_cppflags = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(srcdir)/src \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
@ -1698,14 +1683,11 @@ check_programs += src/settings/plugins/ibft/tests/test-ibft
src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ibft \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
@ -1750,15 +1732,12 @@ noinst_LTLIBRARIES += \
src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
src_settings_plugins_ifcfg_rh_cppflags = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
-I$(top_builddir)/src/settings/plugins/ifcfg-rh \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
$(NSS_CFLAGS) \
@ -1801,6 +1780,8 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
###############################################################################
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
@ -1819,6 +1800,9 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
$(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so)
@ -1835,7 +1819,6 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
$(src_tests_cppflags) \
-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
-DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\"
@ -2041,12 +2024,11 @@ core_plugins += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
src_settings_plugins_ifupdown_cppflags = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(srcdir)/src \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2088,13 +2070,11 @@ check_local += check-local-symbols-settings-ifupdown
check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown
src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ifupdown \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2146,13 +2126,11 @@ core_plugins += src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la
noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la
src_settings_plugins_ifnet_cppflags = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(srcdir)/src \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2196,14 +2174,11 @@ check_local += check-local-symbols-settings-ifnet
check_programs += src/settings/plugins/ifnet/tests/test-ifnet
src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings/plugins/ifnet \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2242,15 +2217,13 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
src/devices/adsl/nm-device-adsl.h
src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/introspection \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GUDEV_CFLAGS)
@ -2276,18 +2249,13 @@ check_local += check-local-devices-adsl
if WITH_MODEM_MANAGER_1
src_devices_wwan_cppflags = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/src/devices/wwan \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/introspection \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
@ -2378,19 +2346,13 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
src/devices/bluetooth/nm-device-bt.h
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-I${top_srcdir}/src/devices/bluetooth \
-I${top_builddir}/src/devices/bluetooth \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/introspection \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
@ -2443,17 +2405,13 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
src/devices/wifi/nm-device-olpc-mesh.h
src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/supplicant-manager \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/introspection \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
@ -2483,15 +2441,13 @@ src_devices_wifi_tests_test_general_SOURCES = \
src/devices/wifi/nm-wifi-utils.h
src_devices_wifi_tests_test_general_CPPFLAGS = \
-I$(top_builddir)/introspection \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I${top_srcdir}/src/platform \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/devices/wifi \
-I$(top_builddir)/src \
-I$(builddir)/introspection \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/src \
-I$(builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
@ -2514,16 +2470,13 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \
src/devices/team/nm-device-team.h
src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/settings \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-I$(srcdir)/src \
-I$(builddir)/src \
-I$(builddir)/introspection \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
${LIBTEAMDCTL_CFLAGS} \
@ -2548,16 +2501,16 @@ check_local += check-local-devices-team
endif
###############################################################################
# src/dnsmasq-manager/tests
# src/dnsmasq/tests
###############################################################################
check_programs += src/dnsmasq-manager/tests/test-dnsmasq-utils
check_programs += src/dnsmasq/tests/test-dnsmasq-utils
src_dnsmasq_manager_tests_test_dnsmasq_utils_CPPFLAGS = \
src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
$(src_tests_cppflags) \
-DTESTDIR="\"$(abs_srcdir)\""
src_dnsmasq_manager_tests_test_dnsmasq_utils_LDADD = \
src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
src/libNetworkManagerTest.la
###############################################################################
@ -2684,21 +2637,21 @@ src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags)
src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd)
###############################################################################
# src/supplicant-manager/tests
# src/supplicant/tests
###############################################################################
check_programs += src/supplicant-manager/tests/test-supplicant-config
check_programs += src/supplicant/tests/test-supplicant-config
src_supplicant_manager_tests_test_supplicant_config_CPPFLAGS = \
src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
$(src_tests_cppflags) \
-DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant-manager/tests/certs\"
-DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant/tests/certs\"
src_supplicant_manager_tests_test_supplicant_config_LDADD = \
src_supplicant_tests_test_supplicant_config_LDADD = \
src/libNetworkManagerTest.la
EXTRA_DIST += \
src/supplicant-manager/tests/certs/test-ca-cert.pem \
src/supplicant-manager/tests/certs/test-cert.p12
src/supplicant/tests/certs/test-ca-cert.pem \
src/supplicant/tests/certs/test-cert.p12
###############################################################################
# src/tests/config
@ -2823,12 +2776,12 @@ noinst_LTLIBRARIES += \
dispatcher/libnm-dispatcher-core.la
dispatcher_cppflags = \
-I${top_srcdir}/shared \
-I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/dispatcher \
-I${top_builddir}/dispatcher \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/dispatcher \
-I$(builddir)/dispatcher \
$(GLIB_CFLAGS) \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@ -2917,12 +2870,12 @@ EXTRA_DIST += \
check_programs += dispatcher/tests/test-dispatcher-envp
dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/dispatcher \
-I$(top_builddir)/dispatcher \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/dispatcher \
-I$(builddir)/dispatcher \
-DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \
$(GLIB_CFLAGS)
@ -2947,12 +2900,12 @@ EXTRA_DIST += \
bin_PROGRAMS += clients/nm-online
clients_nm_online_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}/libnm \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nm-online"\" \
-DNMLOCALEDIR=\"$(datadir)/locale\"
@ -2999,15 +2952,15 @@ clients_cli_nmcli_SOURCES = \
$(NULL)
clients_cli_nmcli_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}/libnm \
-I${top_srcdir}/clients/cli \
-I${top_builddir}/clients/cli \
-I${top_srcdir}/clients/common \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
-I$(srcdir)/clients/cli \
-I$(builddir)/clients/cli \
-I$(srcdir)/clients/common \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nmcli"\" \
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
@ -3110,10 +3063,10 @@ clients_tui_newt_libnmt_newt_a_SOURCES = \
$(NULL)
clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nmtui"\" \
$(GLIB_CFLAGS) \
$(NEWT_CFLAGS) \
@ -3211,14 +3164,14 @@ clients_tui_nmtui_SOURCES = \
$(NULL)
clients_tui_nmtui_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)/libnm \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-core \
-I$(builddir)/libnm-core \
-I$(srcdir)/libnm \
-I$(builddir)/libnm \
-I$(srcdir)/clients/tui/newt \
-I$(top_srcdir)/clients/common \
-I$(srcdir)/clients/common \
$(GLIB_CFLAGS) \
$(NEWT_CFLAGS) \
$(GUDEV_CFLAGS) \
@ -3342,10 +3295,10 @@ lib_LTLIBRARIES += libnm-util/libnm-util.la
libnm_util_libnm_util_includedir=$(includedir)/NetworkManager
libnm_util_cppflags = \
-I${top_srcdir}/libnm-util \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I$(srcdir)/libnm-util \
-I$(builddir)/libnm-util \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-DG_LOG_DOMAIN=\""libnm-util"\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
@ -3517,7 +3470,7 @@ libnm-util/NetworkManager-1.0.gir: libnm-util/libnm-util.la
libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
libnm_util_NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util
libnm_util_NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libnm-util
libnm_util_NetworkManager_1_0_gir_LIBS = libnm-util/libnm-util.la
libnm_util_NetworkManager_1_0_gir_FILES = \
$(libnm_util_lib_h_pub_mkenums) \
@ -3525,10 +3478,10 @@ libnm_util_NetworkManager_1_0_gir_FILES = \
$(libnm_util_lib_c_mkenums) \
$(libnm_util_lib_c_real)
libnm_util_NetworkManager_1_0_gir_SCANNERFLAGS = \
"-I$(srcdir)/shared" \
"-I$(builddir)/shared" \
"-I$(srcdir)/libnm-util" \
"-I$(builddir)/libnm-util" \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-util \
-I$(builddir)/libnm-util \
--warn-all --identifier-prefix=NM --symbol-prefix=nm
libnm-util/NetworkManager-1.0.typelib: libnm-util/NetworkManager-1.0.gir
@ -3549,10 +3502,10 @@ dist_dependencies += libnm-util/libnm-util.la
###############################################################################
libnm_util_tests_cppflags = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-util \
-I$(builddir)/libnm-util \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \
@ -3605,12 +3558,12 @@ libnm_util_tests_test_libnm_linking_LDADD = \
###############################################################################
libnm_glib_cppflags = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(top_builddir)/libnm-glib \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-util \
-I$(builddir)/libnm-util \
-I$(srcdir)/libnm-glib \
-I$(builddir)/libnm-glib \
-DG_LOG_DOMAIN=\""libnm-glib"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
$(DBUS_CFLAGS) \
@ -3848,10 +3801,10 @@ libnm_glib_NMClient_1_0_gir_FILES = \
$(libnm_glib_lib_c_mkenums) \
$(libnm_glib_lib_c_real)
libnm_glib_NMClient_1_0_gir_SCANNERFLAGS = \
"-I$(srcdir)/libnm-util" \
"-I$(builddir)/libnm-util" \
"-I$(srcdir)/libnm-glib" \
"-I$(builddir)/libnm-glib" \
-I$(srcdir)/libnm-util \
-I$(builddir)/libnm-util \
-I$(srcdir)/libnm-glib \
-I$(builddir)/libnm-glib \
--warn-all --identifier-prefix=NM --symbol-prefix=nm \
--include-uninstalled=$(builddir)/libnm-util/NetworkManager-1.0.gir
@ -3875,11 +3828,11 @@ dist_dependencies += \
###############################################################################
libnm_glib_tests_cppflags = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
-I$(srcdir)/shared \
-I$(builddir)/shared \
-I$(srcdir)/libnm-util \
-I$(builddir)/libnm-util \
-I$(srcdir)/libnm-glib \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS) \

8
po/POTFILES.in
View file

@ -147,10 +147,10 @@ shared/nm-utils/nm-shared-utils.c
src/NetworkManagerUtils.c
src/main.c
src/main-utils.c
src/dhcp-manager/nm-dhcp-dhclient.c
src/dhcp-manager/nm-dhcp-dhclient-utils.c
src/dhcp-manager/nm-dhcp-manager.c
src/dns-manager/nm-dns-manager.c
src/dhcp/nm-dhcp-dhclient.c
src/dhcp/nm-dhcp-dhclient-utils.c
src/dhcp/nm-dhcp-manager.c
src/dns/nm-dns-manager.c
src/devices/adsl/nm-device-adsl.c
src/devices/bluetooth/nm-bluez-device.c
src/devices/bluetooth/nm-device-bt.c

2
src/NetworkManagerUtils.c
View file

@ -30,7 +30,7 @@
#include "nm-setting-ip6-config.h"
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-exported-object.h"
#include "nm-auth-utils.h"

4
src/devices/adsl/nm-atm-manager.c
View file

@ -26,8 +26,8 @@
#include "nm-setting-adsl.h"
#include "nm-device-adsl.h"
#include "nm-device-factory.h"
#include "nm-platform.h"
#include "devices/nm-device-factory.h"
#include "platform/nm-platform.h"
/*****************************************************************************/

10
src/devices/adsl/nm-device-adsl.c
View file

@ -32,16 +32,16 @@
#include <stdlib.h>
#include <string.h>
#include "nm-device-private.h"
#include "nm-platform.h"
#include "ppp-manager/nm-ppp-manager.h"
#include "ppp-manager/nm-ppp-status.h"
#include "devices/nm-device-private.h"
#include "platform/nm-platform.h"
#include "ppp/nm-ppp-manager.h"
#include "ppp/nm-ppp-status.h"
#include "nm-setting-adsl.h"
#include "nm-utils.h"
#include "nmdbus-device-adsl.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF (NMDeviceAdsl);
/*****************************************************************************/

2
src/devices/adsl/nm-device-adsl.h
View file

@ -22,7 +22,7 @@
#ifndef __NETWORKMANAGER_DEVICE_ADSL_H__
#define __NETWORKMANAGER_DEVICE_ADSL_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#define NM_TYPE_DEVICE_ADSL (nm_device_adsl_get_type ())
#define NM_DEVICE_ADSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl))

4
src/devices/bluetooth/nm-bluez-device.c
View file

@ -28,8 +28,8 @@
#include "nm-core-internal.h"
#include "nm-bt-error.h"
#include "nm-bluez-common.h"
#include "nm-settings.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "NetworkManagerUtils.h"
#if WITH_BLUEZ5_DUN

6
src/devices/bluetooth/nm-bluez-manager.c
View file

@ -25,16 +25,16 @@
#include <stdlib.h>
#include <gmodule.h>
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-setting-bluetooth.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-bluez4-manager.h"
#include "nm-bluez5-manager.h"
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-device-bt.h"
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dbus-compat.h"
/*****************************************************************************/

2
src/devices/bluetooth/nm-bluez4-adapter.c
View file

@ -28,7 +28,7 @@
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-core-internal.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
/*****************************************************************************/

2
src/devices/bluetooth/nm-bluez4-manager.c
View file

@ -30,7 +30,7 @@
#include "nm-bluez4-adapter.h"
#include "nm-bluez-common.h"
#include "nm-core-internal.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
/*****************************************************************************/

2
src/devices/bluetooth/nm-bluez5-manager.c
View file

@ -32,7 +32,7 @@
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
/*****************************************************************************/

8
src/devices/bluetooth/nm-device-bt.c
View file

@ -27,8 +27,8 @@
#include "nm-bluez-common.h"
#include "nm-bluez-device.h"
#include "nm-device-private.h"
#include "ppp-manager/nm-ppp-manager.h"
#include "devices/nm-device-private.h"
#include "ppp/nm-ppp-manager.h"
#include "nm-setting-connection.h"
#include "nm-setting-bluetooth.h"
#include "nm-setting-cdma.h"
@ -38,11 +38,11 @@
#include "NetworkManagerUtils.h"
#include "nm-utils.h"
#include "nm-bt-error.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nmdbus-device-bt.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBt);
#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"

5
src/devices/bluetooth/nm-device-bt.h
View file

@ -21,9 +21,10 @@
#ifndef __NETWORKMANAGER_DEVICE_BT_H__
#define __NETWORKMANAGER_DEVICE_BT_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-bluez-device.h"
#include "nm-modem.h"
#include "devices/wwan/nm-modem.h"
#define NM_TYPE_DEVICE_BT (nm_device_bt_get_type ())
#define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt))

2
src/devices/nm-arping-manager.c
View file

@ -22,7 +22,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"

2
src/devices/nm-device-bond.c
View file

@ -27,7 +27,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"

2
src/devices/nm-device-bridge.c
View file

@ -26,7 +26,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"

18
src/devices/nm-device-ethernet.c
View file

@ -35,18 +35,18 @@
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "NetworkManagerUtils.h"
#include "nm-supplicant-manager.h"
#include "nm-supplicant-interface.h"
#include "nm-supplicant-config.h"
#include "ppp-manager/nm-ppp-manager.h"
#include "ppp-manager/nm-ppp-status.h"
#include "nm-platform.h"
#include "nm-platform-utils.h"
#include "supplicant/nm-supplicant-manager.h"
#include "supplicant/nm-supplicant-interface.h"
#include "supplicant/nm-supplicant-config.h"
#include "ppp/nm-ppp-manager.h"
#include "ppp/nm-ppp-status.h"
#include "platform/nm-platform.h"
#include "platform/nm-platform-utils.h"
#include "nm-dcb.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#include "nm-config.h"
#include "nm-device-ethernet-utils.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"

2
src/devices/nm-device-factory.c
View file

@ -28,7 +28,7 @@
#include <string.h>
#include <gmodule.h>
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
/*****************************************************************************/

2
src/devices/nm-device-generic.c
View file

@ -23,7 +23,7 @@
#include "nm-device-generic.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
#include "nmdbus-device-generic.h"

2
src/devices/nm-device-infiniband.c
View file

@ -28,7 +28,7 @@
#include "nm-device-private.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"

4
src/devices/nm-device-ip-tunnel.c
View file

@ -30,10 +30,10 @@
#include "nm-device-private.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"

4
src/devices/nm-device-macvlan.c
View file

@ -25,10 +25,10 @@
#include <string.h>
#include "nm-device-private.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-setting-macvlan.h"
#include "nm-setting-wired.h"

2
src/devices/nm-device-tun.c
View file

@ -29,7 +29,7 @@
#include "nm-act-request.h"
#include "nm-device-private.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-setting-tun.h"
#include "nm-core-internal.h"

2
src/devices/nm-device-veth.c
View file

@ -30,7 +30,7 @@
#include "nm-device-veth.h"
#include "nm-device-private.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nmdbus-device-veth.h"

6
src/devices/nm-device-vlan.c
View file

@ -28,14 +28,14 @@
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nm-manager.h"
#include "nm-core-internal.h"
#include "nmp-object.h"
#include "platform/nmp-object.h"
#include "nmdbus-device-vlan.h"

4
src/devices/nm-device-vxlan.c
View file

@ -26,12 +26,12 @@
#include "nm-device-private.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "nm-device-factory.h"
#include "nm-setting-vxlan.h"
#include "nm-setting-wired.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"

16
src/devices/nm-device.c
View file

@ -39,26 +39,26 @@
#include "nm-device-private.h"
#include "NetworkManagerUtils.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "nm-ndisc.h"
#include "nm-lndp-ndisc.h"
#include "nm-dhcp-manager.h"
#include "platform/nm-platform.h"
#include "ndisc/nm-ndisc.h"
#include "ndisc/nm-lndp-ndisc.h"
#include "dhcp/nm-dhcp-manager.h"
#include "nm-act-request.h"
#include "nm-proxy-config.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-pacrunner-manager.h"
#include "nm-dnsmasq-manager.h"
#include "dnsmasq/nm-dnsmasq-manager.h"
#include "nm-dhcp4-config.h"
#include "nm-dhcp6-config.h"
#include "nm-rfkill-manager.h"
#include "nm-firewall-manager.h"
#include "nm-settings-connection.h"
#include "nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "nm-auth-utils.h"
#include "nm-dispatcher.h"
#include "nm-config.h"
#include "nm-dns-manager.h"
#include "dns/nm-dns-manager.h"
#include "nm-core-internal.h"
#include "nm-default-route-manager.h"
#include "nm-route-manager.h"

2
src/devices/nm-lldp-listener.c
View file

@ -25,7 +25,7 @@
#include <net/ethernet.h>
#include <errno.h>
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "systemd/nm-sd.h"

6
src/devices/team/nm-device-team.c
View file

@ -30,15 +30,15 @@
#include <stdlib.h>
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "devices/nm-device-private.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"
#include "nm-dbus-compat.h"
#include "nmdbus-device-team.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTeam);
/*****************************************************************************/

2
src/devices/team/nm-device-team.h
View file

@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DEVICE_TEAM_H__
#define __NETWORKMANAGER_DEVICE_TEAM_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#define NM_TYPE_DEVICE_TEAM (nm_device_team_get_type ())
#define NM_DEVICE_TEAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeam))

4
src/devices/team/nm-team-factory.c
View file

@ -24,9 +24,9 @@
#include <gmodule.h>
#include "nm-manager.h"
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-device-team.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
/*****************************************************************************/

4
src/devices/tests/test-arping.c
View file

@ -20,8 +20,8 @@
#include "nm-default.h"
#include "nm-arping-manager.h"
#include "test-common.h"
#include "devices/nm-arping-manager.h"
#include "platform/tests/test-common.h"
#define IFACE_VETH0 "nm-test-veth0"
#define IFACE_VETH1 "nm-test-veth1"

4
src/devices/tests/test-lldp.c
View file

@ -26,10 +26,10 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "nm-lldp-listener.h"
#include "devices/nm-lldp-listener.h"
#include "systemd/nm-sd.h"
#include "test-common.h"
#include "platform/tests/test-common.h"
#include "nm-test-utils-core.h"

8
src/devices/wifi/nm-device-olpc-mesh.c
View file

@ -37,23 +37,23 @@
#include <sys/ioctl.h>
#include <errno.h>
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-device-wifi.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-act-request.h"
#include "nm-setting-connection.h"
#include "nm-setting-olpc-mesh.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
/* This is a bug; but we can't really change API now... */
#include "nm-vpn-dbus-interface.h"
#include "nmdbus-device-olpc-mesh.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOlpcMesh);
/*****************************************************************************/

2
src/devices/wifi/nm-device-olpc-mesh.h
View file

@ -28,7 +28,7 @@
#ifndef __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
#define __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#define NM_TYPE_DEVICE_OLPC_MESH (nm_device_olpc_mesh_get_type ())
#define NM_DEVICE_OLPC_MESH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMesh))

18
src/devices/wifi/nm-device-wifi.c
View file

@ -29,14 +29,14 @@
#include <errno.h>
#include "nm-common-macros.h"
#include "nm-device.h"
#include "nm-device-private.h"
#include "devices/nm-device.h"
#include "devices/nm-device-private.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-act-request.h"
#include "nm-supplicant-manager.h"
#include "nm-supplicant-interface.h"
#include "nm-supplicant-config.h"
#include "supplicant/nm-supplicant-manager.h"
#include "supplicant/nm-supplicant-interface.h"
#include "supplicant/nm-supplicant-config.h"
#include "nm-setting-connection.h"
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
@ -44,16 +44,16 @@
#include "nm-setting-ip4-config.h"
#include "nm-ip4-config.h"
#include "nm-setting-ip6-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-auth-utils.h"
#include "nm-settings-connection.h"
#include "nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "nm-core-internal.h"
#include "nm-config.h"
#include "nmdbus-device-wifi.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWifi);
/* All of these are in seconds */

2
src/devices/wifi/nm-device-wifi.h
View file

@ -22,7 +22,7 @@
#ifndef __NETWORKMANAGER_DEVICE_WIFI_H__
#define __NETWORKMANAGER_DEVICE_WIFI_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-wifi-ap.h"
#define NM_TYPE_DEVICE_WIFI (nm_device_wifi_get_type ())

6
src/devices/wifi/nm-wifi-factory.c
View file

@ -22,13 +22,13 @@
#include <gmodule.h>
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-setting-wireless.h"
#include "nm-setting-olpc-mesh.h"
#include "nm-device-wifi.h"
#include "nm-device-olpc-mesh.h"
#include "nm-settings-connection.h"
#include "nm-platform.h"
#include "settings/nm-settings-connection.h"
#include "platform/nm-platform.h"
/*****************************************************************************/

2
src/devices/wifi/tests/test-general.c
View file

@ -22,7 +22,7 @@
#include <string.h>
#include "nm-wifi-utils.h"
#include "devices/wifi/nm-wifi-utils.h"
#include "nm-core-internal.h"

6
src/devices/wwan/nm-device-modem.c
View file

@ -25,16 +25,16 @@
#include <string.h>
#include "nm-modem.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-rfkill-manager.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#include "nm-modem-broadband.h"
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#include "nmdbus-device-modem.h"
#include "nm-device-logging.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceModem);
/*****************************************************************************/

2
src/devices/wwan/nm-device-modem.h
View file

@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DEVICE_MODEM_H__
#define __NETWORKMANAGER_DEVICE_MODEM_H__
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-modem.h"
#define NM_TYPE_DEVICE_MODEM (nm_device_modem_get_type ())

4
src/devices/wwan/nm-modem-broadband.c
View file

@ -28,8 +28,8 @@
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
#include "devices/nm-device-private.h"
#include "platform/nm-platform.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"

4
src/devices/wwan/nm-modem-ofono.c
View file

@ -25,9 +25,9 @@
#include <string.h>
#include "nm-core-internal.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-modem.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-ip4-config.h"
#define VARIANT_IS_OF_TYPE_BOOLEAN(v) ((v) != NULL && ( g_variant_is_of_type ((v), G_VARIANT_TYPE_BOOLEAN) ))

6
src/devices/wwan/nm-modem.c
View file

@ -28,15 +28,15 @@
#include <termios.h>
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-setting-connection.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "devices/nm-device-private.h"
#include "nm-route-manager.h"
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "ppp-manager/nm-ppp-status.h"
#include "ppp/nm-ppp-status.h"
/*****************************************************************************/

4
src/devices/wwan/nm-modem.h
View file

@ -22,8 +22,8 @@
#ifndef __NETWORKMANAGER_MODEM_H__
#define __NETWORKMANAGER_MODEM_H__
#include "ppp-manager/nm-ppp-manager.h"
#include "nm-device.h"
#include "ppp/nm-ppp-manager.h"
#include "devices/nm-device.h"
#define NM_TYPE_MODEM (nm_modem_get_type ())
#define NM_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM, NMModem))

4
src/devices/wwan/nm-wwan-factory.c
View file

@ -23,12 +23,12 @@
#include <string.h>
#include <gmodule.h>
#include "nm-device-factory.h"
#include "devices/nm-device-factory.h"
#include "nm-setting-gsm.h"
#include "nm-setting-cdma.h"
#include "nm-modem-manager.h"
#include "nm-device-modem.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
/*****************************************************************************/

0
src/dhcp-manager/nm-dhcp-client-logging.h → src/dhcp/nm-dhcp-client-logging.h
View file

2
src/dhcp-manager/nm-dhcp-client.c → src/dhcp/nm-dhcp-client.c
View file

@ -33,7 +33,7 @@
#include "NetworkManagerUtils.h"
#include "nm-utils.h"
#include "nm-dhcp-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dhcp-client-logging.h"

0
src/dhcp-manager/nm-dhcp-client.h → src/dhcp/nm-dhcp-client.h
View file

2
src/dhcp-manager/nm-dhcp-dhclient-utils.c → src/dhcp/nm-dhcp-dhclient-utils.c
View file

@ -28,7 +28,7 @@
#include "nm-dhcp-utils.h"
#include "nm-ip4-config.h"
#include "nm-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "NetworkManagerUtils.h"
#define CLIENTID_TAG "send dhcp-client-identifier"

0
src/dhcp-manager/nm-dhcp-dhclient-utils.h → src/dhcp/nm-dhcp-dhclient-utils.h
View file

0
src/dhcp-manager/nm-dhcp-dhclient.c → src/dhcp/nm-dhcp-dhclient.c
View file

0
src/dhcp-manager/nm-dhcp-dhcpcd.c → src/dhcp/nm-dhcp-dhcpcd.c
View file

0
src/dhcp-manager/nm-dhcp-helper-api.h → src/dhcp/nm-dhcp-helper-api.h
View file

0
src/dhcp-manager/nm-dhcp-helper.c → src/dhcp/nm-dhcp-helper.c
View file

0
src/dhcp-manager/nm-dhcp-listener.c → src/dhcp/nm-dhcp-listener.c
View file

0
src/dhcp-manager/nm-dhcp-listener.h → src/dhcp/nm-dhcp-listener.h
View file

0
src/dhcp-manager/nm-dhcp-manager.c → src/dhcp/nm-dhcp-manager.c
View file

0
src/dhcp-manager/nm-dhcp-manager.h → src/dhcp/nm-dhcp-manager.h
View file

2
src/dhcp-manager/nm-dhcp-systemd.c → src/dhcp/nm-dhcp-systemd.c
View file

@ -31,7 +31,7 @@
#include "nm-utils.h"
#include "nm-dhcp-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dhcp-client-logging.h"
#include "systemd/nm-sd.h"

2
src/dhcp-manager/nm-dhcp-utils.c → src/dhcp/nm-dhcp-utils.c
View file

@ -27,7 +27,7 @@
#include "nm-dhcp-utils.h"
#include "nm-utils.h"
#include "NetworkManagerUtils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-dhcp-client-logging.h"
#include "nm-core-internal.h"

0
src/dhcp-manager/nm-dhcp-utils.h → src/dhcp/nm-dhcp-utils.h
View file

0
src/dhcp-manager/tests/leases/basic.leases → src/dhcp/tests/leases/basic.leases
View file

0
src/dhcp-manager/tests/leases/malformed1.leases → src/dhcp/tests/leases/malformed1.leases
View file

0
src/dhcp-manager/tests/leases/malformed2.leases → src/dhcp/tests/leases/malformed2.leases
View file

0
src/dhcp-manager/tests/leases/malformed3.leases → src/dhcp/tests/leases/malformed3.leases
View file

0
src/dhcp-manager/tests/test-dhclient-commented-duid.leases → src/dhcp/tests/test-dhclient-commented-duid.leases
View file

0
src/dhcp-manager/tests/test-dhclient-duid.leases → src/dhcp/tests/test-dhclient-duid.leases
View file

6
src/dhcp-manager/tests/test-dhcp-dhclient.c → src/dhcp/tests/test-dhcp-dhclient.c
View file

@ -25,11 +25,11 @@
#include <arpa/inet.h>
#include "NetworkManagerUtils.h"
#include "nm-dhcp-dhclient-utils.h"
#include "nm-dhcp-utils.h"
#include "dhcp/nm-dhcp-dhclient-utils.h"
#include "dhcp/nm-dhcp-utils.h"
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-test-utils-core.h"

4
src/dhcp-manager/tests/test-dhcp-utils.c → src/dhcp/tests/test-dhcp-utils.c
View file

@ -25,8 +25,8 @@
#include "nm-utils.h"
#include "nm-dhcp-utils.h"
#include "nm-platform.h"
#include "dhcp/nm-dhcp-utils.h"
#include "platform/nm-platform.h"
#include "nm-test-utils-core.h"

2
src/dns-manager/nm-dns-dnsmasq.c → src/dns/nm-dns-dnsmasq.c
View file

@ -31,7 +31,7 @@
#include <linux/if.h>
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"

0
src/dns-manager/nm-dns-dnsmasq.h → src/dns/nm-dns-dnsmasq.h
View file

0
src/dns-manager/nm-dns-manager.c → src/dns/nm-dns-manager.c
View file

0
src/dns-manager/nm-dns-manager.h → src/dns/nm-dns-manager.h
View file

0
src/dns-manager/nm-dns-plugin.c → src/dns/nm-dns-plugin.c
View file

0
src/dns-manager/nm-dns-plugin.h → src/dns/nm-dns-plugin.h
View file

4
src/dns-manager/nm-dns-systemd-resolved.c → src/dns/nm-dns-systemd-resolved.c
View file

@ -32,13 +32,13 @@
#include <linux/if.h>
#include "nm-core-internal.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-bus-manager.h"
#include "nm-manager.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "NetworkManagerUtils.h"
#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1"

0
src/dns-manager/nm-dns-systemd-resolved.h → src/dns/nm-dns-systemd-resolved.h
View file

0
src/dns-manager/nm-dns-unbound.c → src/dns/nm-dns-unbound.c
View file

0
src/dns-manager/nm-dns-unbound.h → src/dns/nm-dns-unbound.h
View file

0
src/dnsmasq-manager/nm-dnsmasq-manager.c → src/dnsmasq/nm-dnsmasq-manager.c
View file

0
src/dnsmasq-manager/nm-dnsmasq-manager.h → src/dnsmasq/nm-dnsmasq-manager.h
View file

2
src/dnsmasq-manager/nm-dnsmasq-utils.c → src/dnsmasq/nm-dnsmasq-utils.c
View file

@ -24,7 +24,7 @@
#include <arpa/inet.h>
#include "nm-dnsmasq-utils.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "nm-utils.h"
gboolean

2
src/dnsmasq-manager/nm-dnsmasq-utils.h → src/dnsmasq/nm-dnsmasq-utils.h
View file

@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__
#define __NETWORKMANAGER_DNSMASQ_UTILS_H__
#include "nm-platform.h"
#include "platform/nm-platform.h"
gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr,
char *out_first,

4
src/dnsmasq-manager/tests/test-dnsmasq-utils.c → src/dnsmasq/tests/test-dnsmasq-utils.c
View file

@ -22,7 +22,7 @@
#include <arpa/inet.h>
#include "nm-dnsmasq-utils.h"
#include "dnsmasq/nm-dnsmasq-utils.h"
#include "nm-test-utils-core.h"
@ -92,7 +92,7 @@ main (int argc, char **argv)
{
nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
g_test_add_func ("/dnsmasq-manager/address-ranges", test_address_ranges);
g_test_add_func ("/dnsmasq/address-ranges", test_address_ranges);
return g_test_run ();
}

10
src/main.c
View file

@ -38,14 +38,14 @@
#include "nm-dbus-interface.h"
#include "NetworkManagerUtils.h"
#include "nm-manager.h"
#include "nm-linux-platform.h"
#include "platform/nm-linux-platform.h"
#include "nm-bus-manager.h"
#include "nm-device.h"
#include "nm-dhcp-manager.h"
#include "devices/nm-device.h"
#include "dhcp/nm-dhcp-manager.h"
#include "nm-config.h"
#include "nm-session-monitor.h"
#include "nm-dispatcher.h"
#include "nm-settings.h"
#include "settings/nm-settings.h"
#include "nm-auth-manager.h"
#include "nm-core-internal.h"
#include "nm-exported-object.h"
@ -272,7 +272,7 @@ main (int argc, char *argv[])
/* don't free these strings, we need them for the entire
* process lifetime */
nm_dhcp_helper_path = g_strdup_printf ("%s/src/dhcp-manager/nm-dhcp-helper", path);
nm_dhcp_helper_path = g_strdup_printf ("%s/src/dhcp/nm-dhcp-helper", path);
g_free (path);
}

4
src/ndisc/nm-lndp-ndisc.c
View file

@ -31,8 +31,8 @@
#include "nm-ndisc-private.h"
#include "NetworkManagerUtils.h"
#include "nm-platform.h"
#include "nmp-netns.h"
#include "platform/nm-platform.h"
#include "platform/nmp-netns.h"
#define _NMLOG_PREFIX_NAME "ndisc-lndp"

4
src/ndisc/nm-ndisc.c
View file

@ -30,8 +30,8 @@
#include "nm-ndisc-private.h"
#include "nm-utils.h"
#include "nm-platform.h"
#include "nmp-netns.h"
#include "platform/nm-platform.h"
#include "platform/nmp-netns.h"
#define _NMLOG_PREFIX_NAME "ndisc"

6
src/ndisc/tests/test-ndisc-fake.c
View file

@ -23,10 +23,10 @@
#include <string.h>
#include <syslog.h>
#include "nm-ndisc.h"
#include "nm-fake-ndisc.h"
#include "ndisc/nm-ndisc.h"
#include "ndisc/nm-fake-ndisc.h"
#include "nm-fake-platform.h"
#include "platform/nm-fake-platform.h"
#include "nm-test-utils-core.h"

6
src/ndisc/tests/test-ndisc-linux.c
View file

@ -23,10 +23,10 @@
#include <string.h>
#include <syslog.h>
#include "nm-ndisc.h"
#include "nm-lndp-ndisc.h"
#include "ndisc/nm-ndisc.h"
#include "ndisc/nm-lndp-ndisc.h"
#include "nm-linux-platform.h"
#include "platform/nm-linux-platform.h"
#include "nm-test-utils-core.h"

4
src/nm-act-request.c
View file

@ -30,9 +30,9 @@
#include "nm-setting-wireless-security.h"
#include "nm-setting-8021x.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-active-connection.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
#include "nm-auth-subject.h"
typedef struct {

4
src/nm-active-connection.c
View file

@ -24,8 +24,8 @@
#include "nm-common-macros.h"
#include "nm-dbus-interface.h"
#include "nm-device.h"
#include "nm-settings-connection.h"
#include "devices/nm-device.h"
#include "settings/nm-settings-connection.h"
#include "nm-simple-connection.h"
#include "nm-auth-utils.h"
#include "nm-auth-subject.h"

2
src/nm-audit-manager.c
View file

@ -30,7 +30,7 @@
#include "nm-auth-subject.h"
#include "nm-config.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings-connection.h"
/*****************************************************************************/

2
src/nm-audit-manager.h
View file

@ -22,7 +22,7 @@
#define __NM_AUDIT_MANAGER_H__
#include "nm-connection.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-types.h"
#define NM_TYPE_AUDIT_MANAGER (nm_audit_manager_get_type ())

2
src/nm-checkpoint-manager.c
View file

@ -25,7 +25,7 @@
#include "nm-checkpoint.h"
#include "nm-connection.h"
#include "nm-core-utils.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-exported-object.h"
#include "nm-manager.h"
#include "nm-utils.h"

6
src/nm-checkpoint.c
View file

@ -27,10 +27,10 @@
#include "nm-auth-subject.h"
#include "nm-core-utils.h"
#include "nm-dbus-interface.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-manager.h"
#include "nm-settings.h"
#include "nm-settings-connection.h"
#include "settings/nm-settings.h"
#include "settings/nm-settings-connection.h"
#include "nm-simple-connection.h"
#include "nm-utils.h"
#include "nmdbus-checkpoint.h"

2
src/nm-config-data.c
View file

@ -26,7 +26,7 @@
#include <string.h>
#include "nm-config.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "nm-core-internal.h"
#include "nm-keyfile-internal.h"

2
src/nm-config.c
View file

@ -27,7 +27,7 @@
#include <stdio.h>
#include "nm-utils.h"
#include "nm-device.h"
#include "devices/nm-device.h"
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#include "nm-keyfile-internal.h"

2
src/nm-dcb.c
View file

@ -24,7 +24,7 @@
#include <string.h>
#include "nm-dcb.h"
#include "nm-platform.h"
#include "platform/nm-platform.h"
#include "NetworkManagerUtils.h"
static const char *helper_names[] = { "dcbtool", "fcoeadm" };

Some files were not shown because too many files have changed in this diff Show more