summary refs log tree commit diff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in660
1 files changed, 398 insertions, 262 deletions
diff --git a/Makefile.in b/Makefile.in
index e9877b88..a632018a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -166,94 +166,96 @@ TESTS = $(am__EXEEXT_11)
 
 ###############################################################################
 @WITH_JANSSON_TRUE@am__append_6 = src/libnm-glib-aux/tests/test-json-aux
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am__append_7 = src/libnm-core-impl/libnm-crypto-gnutls.la
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am__append_8 = src/libnm-core-impl/libnm-crypto-nss.la
-@HAVE_INTROSPECTION_TRUE@am__append_9 = src/libnm-client-impl/NM-1.0.typelib
-@HAVE_INTROSPECTION_TRUE@am__append_10 = src/libnm-client-impl/NM-1.0.gir
-@HAVE_INTROSPECTION_TRUE@am__append_11 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_12 = src/nmcli/generate-docs-nm-settings-nmcli.xml.in \
+@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am__append_7 = src/libnm-crypto/libnm-crypto-gnutls.la
+@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am__append_8 = src/libnm-crypto/libnm-crypto-nss.la
+@WITH_GNUTLS_FALSE@@WITH_NSS_TRUE@am__append_9 = src/libnm-crypto/libnm-crypto-null.la
+@WITH_GNUTLS_TRUE@am__append_10 = src/libnm-crypto/libnm-crypto-null.la
+@HAVE_INTROSPECTION_TRUE@am__append_11 = src/libnm-client-impl/NM-1.0.typelib
+@HAVE_INTROSPECTION_TRUE@am__append_12 = src/libnm-client-impl/NM-1.0.gir
+@HAVE_INTROSPECTION_TRUE@am__append_13 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_14 = src/nmcli/generate-docs-nm-settings-nmcli.xml.in \
 @HAVE_INTROSPECTION_TRUE@	$(libnm_noinst_data)
-@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_13 = check-local-generate-docs-nm-settings-nmcli
-@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_14 = src/nmcli/generate-docs-nm-settings-nmcli.xml
-@HAVE_INTROSPECTION_TRUE@am__append_15 = $(libnm_noinst_data)
-@HAVE_INTROSPECTION_TRUE@am__append_16 = $(src_libnm_client_impl_tests_programs_req_introspection)
-@HAVE_INTROSPECTION_FALSE@am__append_17 = $(src_libnm_client_impl_tests_programs_req_introspection)
-@REQUIRE_ROOT_TESTS_TRUE@am__append_18 = -DREQUIRE_ROOT_TESTS=1
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_15 = check-local-generate-docs-nm-settings-nmcli
+@BUILD_DOCS_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_16 = src/nmcli/generate-docs-nm-settings-nmcli.xml
+@HAVE_INTROSPECTION_TRUE@am__append_17 = $(libnm_noinst_data)
+@HAVE_INTROSPECTION_TRUE@am__append_18 = $(src_libnm_client_impl_tests_programs_req_introspection)
+@HAVE_INTROSPECTION_FALSE@am__append_19 = $(src_libnm_client_impl_tests_programs_req_introspection)
+@REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1
 
 ###############################################################################
 # src/core/ppp
 ###############################################################################
-@WITH_PPP_TRUE@am__append_19 = src/core/ppp/libnm-ppp-plugin.la
-@WITH_PPP_TRUE@am__append_20 = src/core/ppp/nm-pppd-plugin.la
+@WITH_PPP_TRUE@am__append_21 = src/core/ppp/libnm-ppp-plugin.la
+@WITH_PPP_TRUE@am__append_22 = src/core/ppp/nm-pppd-plugin.la
 
 ###############################################################################
 # src/core/settings/plugins/ifcfg-rh
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_21 = src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_22 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_23 = src/core/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_23 = $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_24 = check-local-symbols-settings-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_25 = $(nodist_src_core_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = check-local-symbols-settings-ifcfg-rh
 
 ###############################################################################
 # src/core/settings/plugins/ifcfg-rh/tests
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_25 = src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = \
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nm-ifup \
 @CONFIG_PLUGIN_IFCFG_RH_TRUE@	src/core/settings/plugins/ifcfg-rh/nm-ifdown
 
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = install-data-hook-ifcfg-rh
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = install-data-hook-ifcfg-rh
 
 ###############################################################################
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = src/core/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
 
 ###############################################################################
 # src/core/settings/plugins/ifupdown
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_29 = src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_30 = src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_31 = check-local-symbols-settings-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_31 = src/core/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/core/settings/plugins/ifupdown/libnms-ifupdown-core.la
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_33 = check-local-symbols-settings-ifupdown
 
 ###############################################################################
-@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/core/settings/plugins/ifupdown/tests/test-ifupdown
+@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = src/core/settings/plugins/ifupdown/tests/test-ifupdown
 
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_33 = src/core/devices/wwan/libnm-wwan.la \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_35 = src/core/devices/wwan/libnm-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/libnm-device-plugin-wwan.la \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/libnm-device-plugin-bluetooth.la
-@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_34 = \
+@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_36 = \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/core/devices/wwan/nm-modem-ofono.c \
 @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@	src/core/devices/wwan/nm-modem-ofono.h
 
-@WITH_MODEM_MANAGER_1_TRUE@am__append_35 = check-local-devices-wwan \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_37 = check-local-devices-wwan \
 @WITH_MODEM_MANAGER_1_TRUE@	check-local-devices-bluetooth
-@WITH_MODEM_MANAGER_1_TRUE@am__append_36 = src/core/devices/wwan/tests/test-service-providers
+@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = src/core/devices/wwan/tests/test-service-providers
 
 ###############################################################################
 # src/core/devices/bluetooth
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_37 = src/core/devices/bluetooth/libnm-bluetooth-utils.la
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = src/core/devices/bluetooth/libnm-bluetooth-utils.la
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez5-dun.c \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez5-dun.h \
 @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@	$(NULL)
 
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_39 = $(BLUEZ5_CFLAGS)
-@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = $(BLUEZ5_LIBS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = $(BLUEZ5_CFLAGS)
+@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = $(BLUEZ5_LIBS)
 
 ###############################################################################
-@WITH_MODEM_MANAGER_1_TRUE@am__append_41 = \
+@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/tests/nm-bt-test
 
 
 ###############################################################################
 # src/core/devices/wifi
 ###############################################################################
-@WITH_WIFI_TRUE@am__append_42 = src/core/devices/wifi/libnm-wifi-base.la
-@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_43 = \
+@WITH_WIFI_TRUE@am__append_44 = src/core/devices/wifi/libnm-wifi-base.la
+@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_45 = \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-iwd.c \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-iwd.h \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-device-iwd-p2p.c \
@@ -262,52 +264,52 @@ TESTS = $(am__EXEEXT_11)
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	src/core/devices/wifi/nm-iwd-manager.h \
 @WITH_IWD_TRUE@@WITH_WIFI_TRUE@	$(NULL)
 
-@WITH_WIFI_TRUE@am__append_44 = src/core/devices/wifi/libnm-device-plugin-wifi.la
-@WITH_WIFI_TRUE@am__append_45 = check-local-devices-wifi
-@WITH_WIFI_TRUE@am__append_46 = src/core/devices/wifi/tests/test-devices-wifi
+@WITH_WIFI_TRUE@am__append_46 = src/core/devices/wifi/libnm-device-plugin-wifi.la
+@WITH_WIFI_TRUE@am__append_47 = check-local-devices-wifi
+@WITH_WIFI_TRUE@am__append_48 = src/core/devices/wifi/tests/test-devices-wifi
 
 ###############################################################################
 # src/core/devices/team
 ###############################################################################
-@WITH_TEAMDCTL_TRUE@am__append_47 = src/core/devices/team/libnm-device-plugin-team.la
-@WITH_TEAMDCTL_TRUE@am__append_48 = check-local-devices-team
-@WITH_OPENVSWITCH_TRUE@am__append_49 = src/core/devices/ovs/libnm-device-plugin-ovs.la
-@WITH_OPENVSWITCH_TRUE@am__append_50 = check-local-devices-ovs
-@BUILD_DOCS_TRUE@am__append_51 = $(libnmc_setting_settings_doc_h)
-@BUILD_DOCS_TRUE@am__append_52 = check-local-settings-docs
+@WITH_TEAMDCTL_TRUE@am__append_49 = src/core/devices/team/libnm-device-plugin-team.la
+@WITH_TEAMDCTL_TRUE@am__append_50 = check-local-devices-team
+@WITH_OPENVSWITCH_TRUE@am__append_51 = src/core/devices/ovs/libnm-device-plugin-ovs.la
+@WITH_OPENVSWITCH_TRUE@am__append_52 = check-local-devices-ovs
+@BUILD_DOCS_TRUE@am__append_53 = $(libnmc_setting_settings_doc_h)
+@BUILD_DOCS_TRUE@am__append_54 = check-local-settings-docs
 
 ###############################################################################
 # src/nmcli
 ###############################################################################
-@BUILD_NMCLI_TRUE@am__append_53 = src/nmcli/nmcli
-@BUILD_NMCLI_TRUE@am__append_54 = install-data-hook-nmcli
-@BUILD_NMCLI_TRUE@am__append_55 = uninstall-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_55 = src/nmcli/nmcli
+@BUILD_NMCLI_TRUE@am__append_56 = install-data-hook-nmcli
+@BUILD_NMCLI_TRUE@am__append_57 = uninstall-hook-nmcli
 
 ###############################################################################
 # src/libnmt-newt
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_56 = src/libnmt-newt/libnmt-newt.a
+@BUILD_NMTUI_TRUE@am__append_58 = src/libnmt-newt/libnmt-newt.a
 
 ###############################################################################
 # src/nmtui
 ###############################################################################
-@BUILD_NMTUI_TRUE@am__append_57 = src/nmtui/nmtui
-@BUILD_NMTUI_TRUE@am__append_58 = install-exec-hook-nmtui
-@BUILD_NMTUI_TRUE@am__append_59 = uninstall-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_59 = src/nmtui/nmtui
+@BUILD_NMTUI_TRUE@am__append_60 = install-exec-hook-nmtui
+@BUILD_NMTUI_TRUE@am__append_61 = uninstall-hook-nmtui
 
 ###############################################################################
 # src/nm-cloud-setup
 ###############################################################################
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_60 = src/nm-cloud-setup/libnm-cloud-setup-core.a
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_61 = src/nm-cloud-setup/nm-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_62 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_62 = src/nm-cloud-setup/libnm-cloud-setup-core.a
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_63 = src/nm-cloud-setup/nm-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_64 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	src/nm-cloud-setup/nm-cloud-setup.service \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	src/nm-cloud-setup/nm-cloud-setup.timer \
 @BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@	$(NULL)
 
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_63 = install-data-hook-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_64 = uninstall-hook-cloud-setup
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_65 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_65 = install-data-hook-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@@HAVE_SYSTEMD_TRUE@am__append_66 = uninstall-hook-cloud-setup
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_67 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	src/nm-cloud-setup/90-nm-cloud-setup.sh \
 @BUILD_NM_CLOUD_SETUP_TRUE@	src/nm-cloud-setup/meson.build \
 @BUILD_NM_CLOUD_SETUP_TRUE@	src/nm-cloud-setup/nm-cloud-setup.service.in \
@@ -315,63 +317,62 @@ TESTS = $(am__EXEEXT_11)
 @BUILD_NM_CLOUD_SETUP_TRUE@	src/nm-cloud-setup/tests/meson.build \
 @BUILD_NM_CLOUD_SETUP_TRUE@	$(NULL)
 
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_66 = \
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_68 = \
 @BUILD_NM_CLOUD_SETUP_TRUE@	src/nm-cloud-setup/nm-cloud-setup.service
 
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_67 = src/nm-cloud-setup/tests/test-cloud-setup-general
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_69 = src/nm-cloud-setup/tests/test-cloud-setup-general
 
 ###############################################################################
 # data
 ###############################################################################
-@HAVE_SYSTEMD_TRUE@am__append_68 = \
+@HAVE_SYSTEMD_TRUE@am__append_70 = \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager.service \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager-wait-online.service \
 @HAVE_SYSTEMD_TRUE@	data/NetworkManager-dispatcher.service \
 @HAVE_SYSTEMD_TRUE@	data/nm-priv-helper.service \
 @HAVE_SYSTEMD_TRUE@	$(NULL)
 
-@HAVE_INTROSPECTION_TRUE@am__append_69 = $(man_nm_settings_xml)
-@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_70 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_71 = man/nm-settings-ifcfg-rh.5
-@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_72 = man/nm-settings-ifcfg-rh.5
-@WITH_OPENVSWITCH_TRUE@am__append_73 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_74 = man/nm-openvswitch.7
-@WITH_OPENVSWITCH_FALSE@am__append_75 = man/nm-openvswitch.7
-@BUILD_NM_CLOUD_SETUP_TRUE@am__append_76 = man/nm-cloud-setup.8
-@BUILD_NM_CLOUD_SETUP_FALSE@am__append_77 = man/nm-cloud-setup.8
-@BUILD_NM_CLOUD_SETUP_FALSE@am__append_78 = man/nm-cloud-setup.8
-@HAVE_DOCS_TRUE@am__append_79 = install-data-hook-man
-@HAVE_DOCS_TRUE@am__append_80 = uninstall-hook-man
-@HAVE_DOCS_TRUE@am__append_81 = $(man_pages) $(man_pages_autogen)
-@BUILD_DOCS_TRUE@am__append_82 = $(man_pages) $(man_pages_autogen)
+@HAVE_INTROSPECTION_TRUE@am__append_71 = $(man_nm_settings_xml)
+@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_72 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_73 = man/nm-settings-ifcfg-rh.5
+@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_74 = man/nm-settings-ifcfg-rh.5
+@WITH_OPENVSWITCH_TRUE@am__append_75 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_76 = man/nm-openvswitch.7
+@WITH_OPENVSWITCH_FALSE@am__append_77 = man/nm-openvswitch.7
+@BUILD_NM_CLOUD_SETUP_TRUE@am__append_78 = man/nm-cloud-setup.8
+@BUILD_NM_CLOUD_SETUP_FALSE@am__append_79 = man/nm-cloud-setup.8
+@BUILD_NM_CLOUD_SETUP_FALSE@am__append_80 = man/nm-cloud-setup.8
+@HAVE_DOCS_TRUE@am__append_81 = install-data-hook-man
+@HAVE_DOCS_TRUE@am__append_82 = uninstall-hook-man
+@HAVE_DOCS_TRUE@am__append_83 = $(man_pages) $(man_pages_autogen)
+@BUILD_DOCS_TRUE@am__append_84 = $(man_pages) $(man_pages_autogen)
 
 ###############################################################################
 # vapi
 ###############################################################################
-@ENABLE_VAPIGEN_TRUE@am__append_83 = \
+@ENABLE_VAPIGEN_TRUE@am__append_85 = \
 @ENABLE_VAPIGEN_TRUE@	vapi/libnm.vapi
 
-@ENABLE_VAPIGEN_TRUE@am__append_84 = \
+@ENABLE_VAPIGEN_TRUE@am__append_86 = \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS) \
 @ENABLE_VAPIGEN_TRUE@	$(VAPIGEN_VAPIS:.vapi=.deps)
 
-@ENABLE_VAPIGEN_TRUE@am__append_85 = $(VAPIGEN_VAPIS)
+@ENABLE_VAPIGEN_TRUE@am__append_87 = $(VAPIGEN_VAPIS)
 
 ###############################################################################
-@ENABLE_TESTS_TRUE@am__append_86 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_TRUE@am__append_87 = $(check_ltlibraries)
-@ENABLE_TESTS_FALSE@am__append_88 = $(check_programs) $(check_programs_norun)
-@ENABLE_TESTS_FALSE@am__append_89 = $(check_ltlibraries)
-@WITH_QT_TRUE@am__append_90 = \
+@ENABLE_TESTS_TRUE@am__append_88 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_TRUE@am__append_89 = $(check_ltlibraries)
+@ENABLE_TESTS_FALSE@am__append_90 = $(check_programs) $(check_programs_norun)
+@ENABLE_TESTS_FALSE@am__append_91 = $(check_ltlibraries)
+@WITH_QT_TRUE@am__append_92 = \
 @WITH_QT_TRUE@	examples/C/qt/add-connection-wired \
 @WITH_QT_TRUE@	examples/C/qt/list-connections \
 @WITH_QT_TRUE@	examples/C/qt/change-ipv4-addresses \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running
 
-@WITH_QT_TRUE@am__append_91 = \
+@WITH_QT_TRUE@am__append_93 = \
 @WITH_QT_TRUE@	examples/C/qt/monitor-nm-running.moc
 
-@WITH_PYTHON_BLACK_TRUE@am__append_92 = check-python-black
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \
@@ -896,7 +897,8 @@ src_core_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 src_core_libNetworkManager_la_DEPENDENCIES =  \
 	src/core/libNetworkManagerBase.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
-	src/libnm-core-impl/libnm-core-impl.la $(libnm_crypto_lib) \
+	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la $(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-base/libnm-base.la \
@@ -1124,6 +1126,7 @@ src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS = $(am_src_co
 @CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_rpath =
 src_libnm_base_libnm_base_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_src_libnm_base_libnm_base_la_OBJECTS =  \
+	src/libnm-base/libnm_base_la-nm-base.lo \
 	src/libnm-base/libnm_base_la-nm-ethtool-base.lo \
 	src/libnm-base/libnm_base_la-nm-net-aux.lo \
 	src/libnm-base/libnm_base_la-nm-priv-helper-utils.lo
@@ -1144,7 +1147,8 @@ src_libnm_client_aux_extern_libnm_client_aux_extern_la_LINK =  \
 	$(LDFLAGS) -o $@
 src_libnm_client_impl_libnm_client_impl_la_DEPENDENCIES =  \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
-	src/libnm-core-impl/libnm-core-impl.la $(libnm_crypto_lib) \
+	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la $(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la introspection/libnmdbus.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
@@ -1313,7 +1317,6 @@ am__objects_8 =  \
 	src/libnm-core-impl/libnm_core_impl_la-nm-setting-wpan.lo
 am__objects_9 = $(am__objects_8) \
 	src/libnm-core-impl/libnm_core_impl_la-nm-connection.lo \
-	src/libnm-core-impl/libnm_core_impl_la-nm-crypto.lo \
 	src/libnm-core-impl/libnm_core_impl_la-nm-dbus-utils.lo \
 	src/libnm-core-impl/libnm_core_impl_la-nm-errors.lo \
 	src/libnm-core-impl/libnm_core_impl_la-nm-keyfile-utils.lo \
@@ -1339,38 +1342,63 @@ src_libnm_core_impl_libnm_core_impl_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_libnm_core_impl_libnm_core_impl_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
-@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_core_impl_libnm_crypto_gnutls_la_DEPENDENCIES =  \
+@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_crypto_libnm_crypto_gnutls_la_DEPENDENCIES =  \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1) \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(am__DEPENDENCIES_1)
-am__src_libnm_core_impl_libnm_crypto_gnutls_la_SOURCES_DIST =  \
-	src/libnm-core-impl/nm-crypto-gnutls.c
-@HAVE_CRYPTO_GNUTLS_TRUE@am_src_libnm_core_impl_libnm_crypto_gnutls_la_OBJECTS = src/libnm-core-impl/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo
-src_libnm_core_impl_libnm_crypto_gnutls_la_OBJECTS =  \
-	$(am_src_libnm_core_impl_libnm_crypto_gnutls_la_OBJECTS)
-src_libnm_core_impl_libnm_crypto_gnutls_la_LINK = $(LIBTOOL) \
-	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_libnm_core_impl_libnm_crypto_gnutls_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-@ENABLE_TESTS_FALSE@@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am_src_libnm_core_impl_libnm_crypto_gnutls_la_rpath =
-@ENABLE_TESTS_TRUE@@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am_src_libnm_core_impl_libnm_crypto_gnutls_la_rpath =
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_TRUE@am_src_libnm_core_impl_libnm_crypto_gnutls_la_rpath =
-@HAVE_CRYPTO_NSS_TRUE@src_libnm_core_impl_libnm_crypto_nss_la_DEPENDENCIES =  \
+am__src_libnm_crypto_libnm_crypto_gnutls_la_SOURCES_DIST =  \
+	src/libnm-crypto/nm-crypto-gnutls.c
+@HAVE_CRYPTO_GNUTLS_TRUE@am_src_libnm_crypto_libnm_crypto_gnutls_la_OBJECTS = src/libnm-crypto/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo
+src_libnm_crypto_libnm_crypto_gnutls_la_OBJECTS =  \
+	$(am_src_libnm_crypto_libnm_crypto_gnutls_la_OBJECTS)
+src_libnm_crypto_libnm_crypto_gnutls_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_libnm_crypto_libnm_crypto_gnutls_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+@ENABLE_TESTS_FALSE@@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am_src_libnm_crypto_libnm_crypto_gnutls_la_rpath =
+@ENABLE_TESTS_TRUE@@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_FALSE@am_src_libnm_crypto_libnm_crypto_gnutls_la_rpath =
+@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_TRUE@am_src_libnm_crypto_libnm_crypto_gnutls_la_rpath =
+@HAVE_CRYPTO_NSS_TRUE@src_libnm_crypto_libnm_crypto_nss_la_DEPENDENCIES =  \
 @HAVE_CRYPTO_NSS_TRUE@	$(am__DEPENDENCIES_1) \
 @HAVE_CRYPTO_NSS_TRUE@	$(am__DEPENDENCIES_1)
-am__src_libnm_core_impl_libnm_crypto_nss_la_SOURCES_DIST =  \
-	src/libnm-core-impl/nm-crypto-nss.c
-@HAVE_CRYPTO_NSS_TRUE@am_src_libnm_core_impl_libnm_crypto_nss_la_OBJECTS = src/libnm-core-impl/libnm_crypto_nss_la-nm-crypto-nss.lo
-src_libnm_core_impl_libnm_crypto_nss_la_OBJECTS =  \
-	$(am_src_libnm_core_impl_libnm_crypto_nss_la_OBJECTS)
-src_libnm_core_impl_libnm_crypto_nss_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+am__src_libnm_crypto_libnm_crypto_nss_la_SOURCES_DIST =  \
+	src/libnm-crypto/nm-crypto-nss.c
+@HAVE_CRYPTO_NSS_TRUE@am_src_libnm_crypto_libnm_crypto_nss_la_OBJECTS = src/libnm-crypto/libnm_crypto_nss_la-nm-crypto-nss.lo
+src_libnm_crypto_libnm_crypto_nss_la_OBJECTS =  \
+	$(am_src_libnm_crypto_libnm_crypto_nss_la_OBJECTS)
+src_libnm_crypto_libnm_crypto_nss_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(src_libnm_core_impl_libnm_crypto_nss_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
-@ENABLE_TESTS_FALSE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_src_libnm_core_impl_libnm_crypto_nss_la_rpath =
-@ENABLE_TESTS_TRUE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_src_libnm_core_impl_libnm_crypto_nss_la_rpath =
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_TRUE@am_src_libnm_core_impl_libnm_crypto_nss_la_rpath =
+	$(src_libnm_crypto_libnm_crypto_nss_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+@ENABLE_TESTS_FALSE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_src_libnm_crypto_libnm_crypto_nss_la_rpath =
+@ENABLE_TESTS_TRUE@@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_FALSE@am_src_libnm_crypto_libnm_crypto_nss_la_rpath =
+@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_TRUE@am_src_libnm_crypto_libnm_crypto_nss_la_rpath =
+src_libnm_crypto_libnm_crypto_null_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1)
+am_src_libnm_crypto_libnm_crypto_null_la_OBJECTS =  \
+	src/libnm-crypto/libnm_crypto_null_la-nm-crypto-null.lo
+src_libnm_crypto_libnm_crypto_null_la_OBJECTS =  \
+	$(am_src_libnm_crypto_libnm_crypto_null_la_OBJECTS)
+src_libnm_crypto_libnm_crypto_null_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(src_libnm_crypto_libnm_crypto_null_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
+@ENABLE_TESTS_FALSE@@WITH_GNUTLS_FALSE@@WITH_NSS_TRUE@am_src_libnm_crypto_libnm_crypto_null_la_rpath =
+@ENABLE_TESTS_FALSE@@WITH_GNUTLS_TRUE@am_src_libnm_crypto_libnm_crypto_null_la_rpath =
+@ENABLE_TESTS_TRUE@@WITH_GNUTLS_FALSE@@WITH_NSS_TRUE@am_src_libnm_crypto_libnm_crypto_null_la_rpath =
+@ENABLE_TESTS_TRUE@@WITH_GNUTLS_TRUE@am_src_libnm_crypto_libnm_crypto_null_la_rpath =
+@WITH_GNUTLS_FALSE@@WITH_NSS_FALSE@am_src_libnm_crypto_libnm_crypto_null_la_rpath =
+src_libnm_crypto_libnm_crypto_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_src_libnm_crypto_libnm_crypto_la_OBJECTS =  \
+	src/libnm-crypto/libnm_crypto_la-nm-crypto.lo
+src_libnm_crypto_libnm_crypto_la_OBJECTS =  \
+	$(am_src_libnm_crypto_libnm_crypto_la_OBJECTS)
+src_libnm_crypto_libnm_crypto_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(src_libnm_crypto_libnm_crypto_la_LDFLAGS) $(LDFLAGS) -o $@
 src_libnm_glib_aux_libnm_glib_aux_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_src_libnm_glib_aux_libnm_glib_aux_la_OBJECTS =  \
@@ -1417,6 +1445,7 @@ src_libnm_platform_libnm_platform_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am__src_libnm_platform_libnm_platform_la_SOURCES_DIST =  \
 	src/linux-headers/ethtool.h src/linux-headers/nl802154.h \
+	src/linux-headers/nl80211-vnd-intel.h \
 	src/libnm-platform/nm-linux-platform.c \
 	src/libnm-platform/nm-linux-platform.h \
 	src/libnm-platform/nm-netlink.c \
@@ -1483,6 +1512,7 @@ am_src_libnm_systemd_core_libnm_systemd_core_la_OBJECTS = src/libnm-systemd-core
 	src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp-packet.lo \
 	src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-network.lo \
 	src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo \
+	src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-protocol.lo \
 	src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo \
 	src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-lldp-network.lo \
 	src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-network-common.lo \
@@ -2137,7 +2167,8 @@ src_libnm_core_impl_tests_test_compare_OBJECTS =  \
 	src/libnm-core-impl/tests/test_compare-test-compare.$(OBJEXT)
 am__DEPENDENCIES_6 =  \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
-	src/libnm-core-impl/libnm-core-impl.la $(libnm_crypto_lib) \
+	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la $(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
@@ -2373,7 +2404,8 @@ src_nm_initrd_generator_nm_initrd_generator_SOURCES =  \
 src_nm_initrd_generator_nm_initrd_generator_OBJECTS = src/nm-initrd-generator/nm_initrd_generator-nm-initrd-generator.$(OBJEXT)
 src_nm_initrd_generator_nm_initrd_generator_DEPENDENCIES =  \
 	src/nm-initrd-generator/libnmi-core.la \
-	src/libnm-core-impl/libnm-core-impl.la $(libnm_crypto_lib) \
+	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la $(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-base/libnm-base.la \
@@ -2394,7 +2426,8 @@ src_nm_initrd_generator_tests_test_cmdline_reader_SOURCES =  \
 	src/nm-initrd-generator/tests/test-cmdline-reader.c
 src_nm_initrd_generator_tests_test_cmdline_reader_OBJECTS = src/nm-initrd-generator/tests/test_cmdline_reader-test-cmdline-reader.$(OBJEXT)
 am__DEPENDENCIES_7 = src/nm-initrd-generator/libnmi-core.la \
-	src/libnm-core-impl/libnm-core-impl.la $(libnm_crypto_lib) \
+	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la $(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-base/libnm-base.la \
@@ -2895,6 +2928,7 @@ am__depfiles_remade = examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connect
 	src/core/tests/config/$(DEPDIR)/test_config-test-config.Po \
 	src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo \
 	src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo \
+	src/libnm-base/$(DEPDIR)/libnm_base_la-nm-base.Plo \
 	src/libnm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Plo \
 	src/libnm-base/$(DEPDIR)/libnm_base_la-nm-net-aux.Plo \
 	src/libnm-base/$(DEPDIR)/libnm_base_la-nm-priv-helper-utils.Plo \
@@ -2962,7 +2996,6 @@ am__depfiles_remade = examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connect
 	src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-auth-subject.Plo \
 	src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-libnm-core-utils.Plo \
 	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-connection.Plo \
-	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-crypto.Plo \
 	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-dbus-utils.Plo \
 	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-errors.Plo \
 	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-keyfile-utils.Plo \
@@ -3028,8 +3061,6 @@ am__depfiles_remade = examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connect
 	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-utils.Plo \
 	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-editor-plugin.Plo \
 	src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-plugin-info.Plo \
-	src/libnm-core-impl/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo \
-	src/libnm-core-impl/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo \
 	src/libnm-core-impl/tests/$(DEPDIR)/test_compare-test-compare.Po \
 	src/libnm-core-impl/tests/$(DEPDIR)/test_crypto-test-crypto.Po \
 	src/libnm-core-impl/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po \
@@ -3039,6 +3070,10 @@ am__depfiles_remade = examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connect
 	src/libnm-core-impl/tests/$(DEPDIR)/test_setting-test-setting.Po \
 	src/libnm-core-impl/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po \
 	src/libnm-core-public/$(DEPDIR)/libnm_core_impl_libnm_core_impl_la-nm-core-enum-types.Plo \
+	src/libnm-crypto/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo \
+	src/libnm-crypto/$(DEPDIR)/libnm_crypto_la-nm-crypto.Plo \
+	src/libnm-crypto/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo \
+	src/libnm-crypto/$(DEPDIR)/libnm_crypto_null_la-nm-crypto-null.Plo \
 	src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo \
 	src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo \
 	src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo \
@@ -3083,6 +3118,7 @@ am__depfiles_remade = examples/C/glib/$(DEPDIR)/add_connection_gdbus-add-connect
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo \
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo \
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo \
+	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-protocol.Plo \
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo \
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo \
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-common.Plo \
@@ -3329,8 +3365,10 @@ SOURCES = $(src_libnmt_newt_libnmt_newt_a_SOURCES) \
 	$(src_libnm_core_aux_intern_libnm_core_aux_intern_la_SOURCES) \
 	$(src_libnm_core_impl_libnm_core_impl_la_SOURCES) \
 	$(nodist_src_libnm_core_impl_libnm_core_impl_la_SOURCES) \
-	$(src_libnm_core_impl_libnm_crypto_gnutls_la_SOURCES) \
-	$(src_libnm_core_impl_libnm_crypto_nss_la_SOURCES) \
+	$(src_libnm_crypto_libnm_crypto_gnutls_la_SOURCES) \
+	$(src_libnm_crypto_libnm_crypto_nss_la_SOURCES) \
+	$(src_libnm_crypto_libnm_crypto_null_la_SOURCES) \
+	$(src_libnm_crypto_libnm_crypto_la_SOURCES) \
 	$(src_libnm_glib_aux_libnm_glib_aux_la_SOURCES) \
 	$(src_libnm_log_core_libnm_log_core_la_SOURCES) \
 	$(src_libnm_log_null_libnm_log_null_la_SOURCES) \
@@ -3454,8 +3492,10 @@ DIST_SOURCES = $(am__src_libnmt_newt_libnmt_newt_a_SOURCES_DIST) \
 	$(src_libnm_core_aux_extern_libnm_core_aux_extern_la_SOURCES) \
 	$(src_libnm_core_aux_intern_libnm_core_aux_intern_la_SOURCES) \
 	$(src_libnm_core_impl_libnm_core_impl_la_SOURCES) \
-	$(am__src_libnm_core_impl_libnm_crypto_gnutls_la_SOURCES_DIST) \
-	$(am__src_libnm_core_impl_libnm_crypto_nss_la_SOURCES_DIST) \
+	$(am__src_libnm_crypto_libnm_crypto_gnutls_la_SOURCES_DIST) \
+	$(am__src_libnm_crypto_libnm_crypto_nss_la_SOURCES_DIST) \
+	$(src_libnm_crypto_libnm_crypto_null_la_SOURCES) \
+	$(src_libnm_crypto_libnm_crypto_la_SOURCES) \
 	$(src_libnm_glib_aux_libnm_glib_aux_la_SOURCES) \
 	$(src_libnm_log_core_libnm_log_core_la_SOURCES) \
 	$(src_libnm_log_null_libnm_log_null_la_SOURCES) \
@@ -3794,7 +3834,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.examples $(srcdir)/Makefile.in \
 	$(top_srcdir)/data/org.freedesktop.NetworkManager.policy.in.in \
 	$(top_srcdir)/src/libnm-client-impl/libnm.pc.in \
 	$(top_srcdir)/src/libnm-core-public/nm-version-macros.h.in \
-	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+	ABOUT-NLS AUTHORS COPYING ChangeLog NEWS TODO \
 	build-aux/compile build-aux/config.guess \
 	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
 	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
@@ -3851,7 +3891,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BLACK = @BLACK@
 BLUEZ5_CFLAGS = @BLUEZ5_CFLAGS@
 BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
@@ -4181,6 +4220,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 ###############################################################################
 
 ###############################################################################
+
+###############################################################################
 noinst_LTLIBRARIES = src/c-siphash/libc-siphash.la \
 	src/c-rbtree/libc-rbtree.la src/n-acd/libn-acd.la \
 	src/n-dhcp4/libn-dhcp4.la src/libnm-std-aux/libnm-std-aux.la \
@@ -4195,19 +4236,20 @@ noinst_LTLIBRARIES = src/c-siphash/libc-siphash.la \
 	src/libnm-client-aux-extern/libnm-client-aux-extern.la \
 	src/libnm-client-test/libnm-client-test.la \
 	introspection/libnmdbus.la \
-	src/libnm-core-impl/libnm-core-impl.la $(libnm_crypto_lib) \
+	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la $(libnm_crypto_lib) \
 	src/libnm-client-impl/libnm-client-impl.la \
 	src/core/libNetworkManagerBase.la \
 	src/core/libNetworkManager.la \
 	src/libnm-systemd-core/libnm-systemd-core.la $(NULL) \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
-	src/nm-initrd-generator/libnmi-core.la $(am__append_22) \
-	$(am__append_30) $(am__append_37) $(am__append_42) \
-	src/nm-dispatcher/libnm-dispatcher-core.la $(am__append_87)
-check_LTLIBRARIES = $(am__append_89)
-noinst_LIBRARIES = $(am__append_56) $(am__append_60)
-noinst_DATA = $(am__append_11)
-dist_libexec_SCRIPTS = $(am__append_26)
+	src/nm-initrd-generator/libnmi-core.la $(am__append_24) \
+	$(am__append_32) $(am__append_39) $(am__append_44) \
+	src/nm-dispatcher/libnm-dispatcher-core.la $(am__append_89)
+check_LTLIBRARIES = $(am__append_91)
+noinst_LIBRARIES = $(am__append_58) $(am__append_62)
+noinst_DATA = $(am__append_13)
+dist_libexec_SCRIPTS = $(am__append_28)
 
 ###############################################################################
 lib_LTLIBRARIES = src/libnm-client-impl/libnm.la
@@ -4216,32 +4258,32 @@ plugin_LTLIBRARIES = $(core_plugins)
 ###############################################################################
 # src/core/devices/adsl
 ###############################################################################
-core_plugins = $(am__append_19) $(am__append_21) $(am__append_29) \
+core_plugins = $(am__append_21) $(am__append_23) $(am__append_31) \
 	src/core/devices/adsl/libnm-device-plugin-adsl.la \
-	$(am__append_33) $(am__append_44) $(am__append_47) \
-	$(am__append_49)
+	$(am__append_35) $(am__append_46) $(am__append_49) \
+	$(am__append_51)
 service_DATA = 
-man_MANS = $(am__append_81)
+man_MANS = $(am__append_83)
 examples_DATA = data/server.conf
 CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \
-	src/core/NetworkManager.ver $(am__append_23) \
+	src/core/NetworkManager.ver $(am__append_25) \
 	$(dispatcher_nmdbus_dispatcher_sources) \
 	src/nm-dispatcher/org.freedesktop.nm_dispatcher.service \
 	src/nm-priv-helper/org.freedesktop.nm_priv_helper.service \
-	$(am__append_66) src/tests/client/test-client.log \
+	$(am__append_68) src/tests/client/test-client.log \
 	data/NetworkManager-dispatcher.service \
 	data/NetworkManager-wait-online.service \
 	data/NetworkManager.service data/nm-priv-helper.service \
-	data/server.conf $(NULL) $(am__append_69) man/common.ent \
-	$(am__append_82) $(am__append_85) $(GLIB_GENERATED) \
+	data/server.conf $(NULL) $(am__append_71) man/common.ent \
+	$(am__append_84) $(am__append_87) $(GLIB_GENERATED) \
 	$(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \
-	cscope.po.out $(NULL) $(am__append_91)
+	cscope.po.out $(NULL) $(am__append_93)
 
 ###############################################################################
 DISTCLEANFILES = config-extra.h intltool-extract intltool-merge \
 	intltool-update $(polkit_policy_DATA) \
-	src/libnm-client-impl/libnm.pc $(am__append_14) \
-	$(am__append_15) $(am__append_51)
+	src/libnm-client-impl/libnm.pc $(am__append_16) \
+	$(am__append_17) $(am__append_53)
 
 ###############################################################################
 
@@ -4288,9 +4330,10 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \
 	src/libnm-core-intern/meson.build \
 	src/libnm-core-public/README.md \
 	src/libnm-core-public/meson.build $(NULL) \
-	src/libnm-core-impl/nm-crypto-gnutls.c \
-	src/libnm-core-impl/nm-crypto-nss.c \
 	src/libnm-core-impl/meson.build $(NULL) \
+	src/libnm-crypto/README.md src/libnm-crypto/meson.build \
+	src/libnm-crypto/nm-crypto-gnutls.c \
+	src/libnm-crypto/nm-crypto-nss.c $(NULL) \
 	src/libnm-core-impl/tests/certs/ca-no-ending-newline.pem \
 	src/libnm-core-impl/tests/certs/pkcs8-decrypted.der \
 	src/libnm-core-impl/tests/certs/pkcs8-enc-key.pem \
@@ -4317,7 +4360,7 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \
 	src/libnm-client-public/nm-enum-types.c.template \
 	src/libnm-client-public/nm-enum-types.h.template \
 	src/libnm-client-impl/libnm.pc.in \
-	src/libnm-client-impl/libnm.ver $(am__append_12) \
+	src/libnm-client-impl/libnm.ver $(am__append_14) \
 	tools/generate-docs-nm-property-infos.py \
 	tools/generate-docs-nm-settings-docs-merge.py \
 	tools/generate-docs-nm-settings-docs-gir.py \
@@ -4880,7 +4923,7 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \
 	src/libnmc-setting/meson.build \
 	src/libnmc-setting/tests/meson.build \
 	src/libnmt-newt/meson.build src/nmtui/meson.build \
-	$(am__append_65) src/tests/client/test-client.sh \
+	$(am__append_67) src/tests/client/test-client.sh \
 	src/tests/client/test-client.py \
 	src/tests/client/test-client.check-on-disk/test_001.expected \
 	src/tests/client/test-client.check-on-disk/test_002.expected \
@@ -4893,14 +4936,15 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \
 	data/NetworkManager-wait-online.service.in \
 	data/NetworkManager.service.in data/nm-priv-helper.service.in \
 	data/meson.build data/nm-shared.xml data/server.conf.in \
-	$(NULL) $(am__append_71) $(am__append_74) $(am__append_77) \
+	$(NULL) $(am__append_73) $(am__append_76) $(am__append_79) \
 	man/common.ent.in $(man_nm_settings_xml) $(addsuffix \
 	.xsl,$(basename $(man_nm_settings_xml))) $(man_pages) \
 	$(addsuffix .xml,$(basename $(man_pages))) \
 	$(man_pages_autogen) $(NULL) man/meson.build \
-	vapi/NM-1.0.metadata vapi/libnm.deps vapi/meson.build \
-	CONTRIBUTING.md COPYING.LGPL COPYING.GFDL intltool-extract.in \
-	intltool-merge.in intltool-update.in linker-script-binary.ver \
+	vapi/NM-1.0.metadata vapi/libnm.deps vapi/meson.build AUTHORS \
+	COPYING ChangeLog NEWS README.md CONTRIBUTING.md COPYING.LGPL \
+	COPYING.GFDL intltool-extract.in intltool-merge.in \
+	intltool-update.in linker-script-binary.ver \
 	linker-script-devices.ver linker-script-settings.ver \
 	src/core/ppp/nm-ppp-plugin.ver Makefile.glib autogen.sh \
 	lsan.suppressions valgrind.suppressions meson.build \
@@ -4976,16 +5020,16 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \
 EXTRA_LTLIBRARIES = 
 dist_hook = dist-hook-settings-ifcfg-rh-alias-files
 dist_dependencies = src/libnm-core-public/nm-vpn-dbus-types.xml \
-	src/libnm-core-public/nm-dbus-types.xml $(am__append_72) \
-	$(am__append_75) $(am__append_78) $(man_pages) \
+	src/libnm-core-public/nm-dbus-types.xml $(am__append_74) \
+	$(am__append_77) $(am__append_80) $(man_pages) \
 	$(man_pages_autogen)
 dist_configure_check = $(am__append_2)
-install_data_hook = install-data-hook-dirs $(am__append_27) \
-	install-data-hook-dispatcher $(am__append_54) $(am__append_63) \
-	$(am__append_79)
-install_exec_hook = $(am__append_58)
-uninstall_hook = $(am__append_55) $(am__append_59) $(am__append_64) \
-	$(am__append_80)
+install_data_hook = install-data-hook-dirs $(am__append_29) \
+	install-data-hook-dispatcher $(am__append_56) $(am__append_65) \
+	$(am__append_81)
+install_exec_hook = $(am__append_60)
+uninstall_hook = $(am__append_57) $(am__append_61) $(am__append_66) \
+	$(am__append_82)
 BUILT_SOURCES = src/libnm-core-public/nm-vpn-dbus-types.xml \
 	src/libnm-core-public/nm-dbus-types.xml $(gir_DATA) \
 	$(typelib_DATA)
@@ -4995,12 +5039,13 @@ GLIB_GENERATED = $(src_libnm_core_public_mkenums_h) \
 	src/libnm-core-impl/tests/nm-core-tests-enum-types.c \
 	$(src_libnm_client_public_mkenums_h) \
 	$(src_libnm_client_public_mkenums_c)
-man_pages = man/NetworkManager.8 man/NetworkManager-dispatcher.8 \
-	man/NetworkManager.conf.5 man/nm-online.1 \
-	man/nm-initrd-generator.8 man/nmcli-examples.7 man/nmcli.1 \
-	man/nmtui.1 $(NULL) $(am__append_73) $(am__append_76)
+man_pages = man/NetworkManager-dispatcher.8 \
+	man/NetworkManager-wait-online.service.8 man/NetworkManager.8 \
+	man/NetworkManager.conf.5 man/nm-initrd-generator.8 \
+	man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1 \
+	$(NULL) $(am__append_75) $(am__append_78)
 man_pages_autogen = man/nm-settings-dbus.5 man/nm-settings-keyfile.5 \
-	man/nm-settings-nmcli.5 $(NULL) $(am__append_70)
+	man/nm-settings-nmcli.5 $(NULL) $(am__append_72)
 
 ###############################################################################
 
@@ -5041,15 +5086,15 @@ check_programs = src/libnm-platform/tests/test-nm-platform \
 	src/libnm-core-impl/tests/test-secrets \
 	src/libnm-core-impl/tests/test-setting \
 	src/libnm-core-impl/tests/test-settings-defaults \
-	src/libnm-client-impl/tests/test-libnm $(am__append_16) \
+	src/libnm-client-impl/tests/test-libnm $(am__append_18) \
 	src/nm-initrd-generator/tests/test-dt-reader \
 	src/nm-initrd-generator/tests/test-ibft-reader \
 	src/nm-initrd-generator/tests/test-cmdline-reader \
 	src/core/dhcp/tests/test-dhcp-dhclient \
 	src/core/dhcp/tests/test-dhcp-utils \
 	src/core/settings/plugins/keyfile/tests/test-keyfile-settings \
-	$(am__append_25) $(am__append_32) $(am__append_36) \
-	$(am__append_46) src/core/dnsmasq/tests/test-dnsmasq-utils \
+	$(am__append_27) $(am__append_34) $(am__append_38) \
+	$(am__append_48) src/core/dnsmasq/tests/test-dnsmasq-utils \
 	src/core/platform/tests/test-address-fake \
 	src/core/platform/tests/test-address-linux \
 	src/core/platform/tests/test-cleanup-fake \
@@ -5069,8 +5114,8 @@ check_programs = src/libnm-platform/tests/test-nm-platform \
 	src/core/tests/test-l3cfg src/core/tests/test-systemd \
 	src/core/tests/test-utils src/core/tests/test-wired-defname \
 	$(NULL) src/nm-dispatcher/tests/test-dispatcher-envp \
-	src/libnmc-setting/tests/test-libnmc-setting $(am__append_67)
-check_programs_norun = $(am__append_17) $(am__append_41) \
+	src/libnmc-setting/tests/test-libnmc-setting $(am__append_69)
+check_programs_norun = $(am__append_19) $(am__append_43) \
 	src/core/platform/tests/monitor \
 	src/core/ndisc/tests/test-ndisc-linux \
 	examples/C/glib/add-connection-gdbus \
@@ -5081,34 +5126,35 @@ check_programs_norun = $(am__append_17) $(am__append_41) \
 	examples/C/glib/list-connections-libnm \
 	examples/C/glib/monitor-nm-running-gdbus \
 	examples/C/glib/monitor-nm-state-gdbus \
-	examples/C/glib/vpn-import-libnm $(NULL) $(am__append_90)
+	examples/C/glib/vpn-import-libnm $(NULL) $(am__append_92)
 
 ###############################################################################
 
 # just test, that we can build "nm-vpn-plugin-utils.c"
 
 ###############################################################################
-check_ltlibraries = $(am__append_7) $(am__append_8) \
+check_ltlibraries = $(am__append_7) $(am__append_8) $(am__append_9) \
+	$(am__append_10) \
 	src/contrib/tests/libnm-vpn-plugin-utils-test.la \
 	src/core/libNetworkManagerTest.la \
 	src/libnmc-base/libnmc-base.la \
 	src/libnmc-setting/libnmc-setting.la
-check_local = check-docs check-local-exports-libnm $(am__append_13) \
-	check-config-options $(am__append_24) $(am__append_31) \
-	check-local-devices-adsl $(am__append_35) $(am__append_45) \
-	$(am__append_48) $(am__append_50) $(am__append_52) \
-	check-local-tests-client check-local-gitlab-ci \
-	$(am__append_92) check-tree check-po-msgfmt
-VAPIGEN_VAPIS = $(am__append_83)
-dbusservice_DATA = $(am__append_28) \
+check_local = check-docs check-local-exports-libnm $(am__append_15) \
+	check-config-options $(am__append_26) $(am__append_33) \
+	check-local-devices-adsl $(am__append_37) $(am__append_47) \
+	$(am__append_50) $(am__append_52) $(am__append_54) \
+	check-local-tests-client check-local-gitlab-ci check-tree \
+	check-po-msgfmt
+VAPIGEN_VAPIS = $(am__append_85)
+dbusservice_DATA = $(am__append_30) \
 	src/nm-dispatcher/nm-dispatcher.conf \
 	src/nm-priv-helper/nm-priv-helper.conf \
 	src/core/org.freedesktop.NetworkManager.conf
 dbusactivation_DATA =  \
 	src/nm-dispatcher/org.freedesktop.nm_dispatcher.service \
 	src/nm-priv-helper/org.freedesktop.nm_priv_helper.service
-systemdsystemunit_DATA = $(am__append_62) $(am__append_68)
-INTROSPECTION_GIRS = $(am__append_10)
+systemdsystemunit_DATA = $(am__append_64) $(am__append_70)
+INTROSPECTION_GIRS = $(am__append_12)
 INTROSPECTION_SCANNER_ARGS = 
 INTROSPECTION_COMPILER_ARGS = 
 # Pass SANITIZER_ENV where a command that uses built libraries is
@@ -5122,9 +5168,9 @@ nodist_libnminclude_HEADERS = $(src_libnm_core_public_mkenums_h) \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = src/libnm-client-impl/libnm.pc
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
-pppd_plugin_LTLIBRARIES = $(am__append_20)
+pppd_plugin_LTLIBRARIES = $(am__append_22)
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(am__append_84)
+vapi_DATA = $(am__append_86)
 examplesdir = $(docdir)/examples
 rundir = $(runstatedir)/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
@@ -5420,6 +5466,7 @@ src_libnm_base_libnm_base_la_CPPFLAGS = \
 	$(NULL)
 
 src_libnm_base_libnm_base_la_SOURCES = \
+	src/libnm-base/nm-base.c \
 	src/libnm-base/nm-base.h \
 	src/libnm-base/nm-config-base.h \
 	src/libnm-base/nm-ethtool-base.c \
@@ -5491,6 +5538,7 @@ src_libnm_platform_libnm_platform_la_CPPFLAGS = \
 
 src_libnm_platform_libnm_platform_la_SOURCES =  \
 	src/linux-headers/ethtool.h src/linux-headers/nl802154.h \
+	src/linux-headers/nl80211-vnd-intel.h \
 	src/libnm-platform/nm-linux-platform.c \
 	src/libnm-platform/nm-linux-platform.h \
 	src/libnm-platform/nm-netlink.c \
@@ -6018,8 +6066,6 @@ src_libnm_core_public_mkenums_h = \
 
 src_libnm_core_impl_lib_h_priv = \
 	src/libnm-core-impl/nm-connection-private.h \
-	src/libnm-core-impl/nm-crypto-impl.h \
-	src/libnm-core-impl/nm-crypto.h \
 	src/libnm-core-impl/nm-default-libnm-core.h \
 	src/libnm-core-impl/nm-property-compare.h \
 	src/libnm-core-impl/nm-setting-private.h \
@@ -6091,7 +6137,6 @@ src_libnm_core_impl_lib_c_settings_real = \
 src_libnm_core_impl_lib_c_real = \
 	$(src_libnm_core_impl_lib_c_settings_real) \
 	src/libnm-core-impl/nm-connection.c \
-	src/libnm-core-impl/nm-crypto.c \
 	src/libnm-core-impl/nm-dbus-utils.c \
 	src/libnm-core-impl/nm-errors.c \
 	src/libnm-core-impl/nm-keyfile-utils.c \
@@ -6149,34 +6194,65 @@ src_libnm_core_impl_libnm_core_impl_la_LDFLAGS = \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
+src_libnm_crypto_libnm_crypto_la_SOURCES = \
+	src/libnm-crypto/nm-crypto-impl.h \
+	src/libnm-crypto/nm-crypto.c \
+	src/libnm-crypto/nm-crypto.h \
+	$(NULL)
 
-###############################################################################
-@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_TRUE@libnm_crypto_lib = src/libnm-core-impl/libnm-crypto-gnutls.la
-@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_TRUE@libnm_crypto_lib = src/libnm-core-impl/libnm-crypto-nss.la
-@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_core_impl_libnm_crypto_gnutls_la_SOURCES = src/libnm-core-impl/nm-crypto-gnutls.c
-@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_core_impl_libnm_crypto_gnutls_la_CPPFLAGS = \
+src_libnm_crypto_libnm_crypto_la_CPPFLAGS = \
+	$(dflt_cppflags_libnm_core) \
+	$(NULL)
+
+src_libnm_crypto_libnm_crypto_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(NULL)
+
+src_libnm_crypto_libnm_crypto_la_LDFLAGS = \
+	$(CODE_COVERAGE_LDFLAGS) \
+	$(SANITIZER_LIB_LDFLAGS) \
+	$(NULL)
+
+@HAVE_CRYPTO_GNUTLS_TRUE@@WITH_GNUTLS_TRUE@libnm_crypto_lib = src/libnm-crypto/libnm-crypto-gnutls.la
+@HAVE_CRYPTO_NSS_TRUE@@WITH_NSS_TRUE@libnm_crypto_lib = src/libnm-crypto/libnm-crypto-nss.la
+@WITH_GNUTLS_FALSE@@WITH_NSS_FALSE@libnm_crypto_lib = src/libnm-crypto/libnm-crypto-null.la
+@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_crypto_libnm_crypto_gnutls_la_SOURCES = src/libnm-crypto/nm-crypto-gnutls.c
+@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_crypto_libnm_crypto_gnutls_la_CPPFLAGS = \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(GNUTLS_CFLAGS)
 
-@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_core_impl_libnm_crypto_gnutls_la_LDFLAGS = \
+@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_crypto_libnm_crypto_gnutls_la_LDFLAGS = \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(src_libnm_core_impl_libnm_core_impl_la_LDFLAGS)
 
-@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_core_impl_libnm_crypto_gnutls_la_LIBADD = \
+@HAVE_CRYPTO_GNUTLS_TRUE@src_libnm_crypto_libnm_crypto_gnutls_la_LIBADD = \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(GLIB_LIBS) \
 @HAVE_CRYPTO_GNUTLS_TRUE@	$(GNUTLS_LIBS)
 
-@HAVE_CRYPTO_NSS_TRUE@src_libnm_core_impl_libnm_crypto_nss_la_SOURCES = src/libnm-core-impl/nm-crypto-nss.c
-@HAVE_CRYPTO_NSS_TRUE@src_libnm_core_impl_libnm_crypto_nss_la_CPPFLAGS = \
+@HAVE_CRYPTO_NSS_TRUE@src_libnm_crypto_libnm_crypto_nss_la_SOURCES = src/libnm-crypto/nm-crypto-nss.c
+@HAVE_CRYPTO_NSS_TRUE@src_libnm_crypto_libnm_crypto_nss_la_CPPFLAGS = \
 @HAVE_CRYPTO_NSS_TRUE@	$(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) \
 @HAVE_CRYPTO_NSS_TRUE@	$(NSS_CFLAGS)
 
-@HAVE_CRYPTO_NSS_TRUE@src_libnm_core_impl_libnm_crypto_nss_la_LDFLAGS = \
+@HAVE_CRYPTO_NSS_TRUE@src_libnm_crypto_libnm_crypto_nss_la_LDFLAGS = \
 @HAVE_CRYPTO_NSS_TRUE@	$(src_libnm_core_impl_libnm_core_impl_la_LDFLAGS)
 
-@HAVE_CRYPTO_NSS_TRUE@src_libnm_core_impl_libnm_crypto_nss_la_LIBADD = \
+@HAVE_CRYPTO_NSS_TRUE@src_libnm_crypto_libnm_crypto_nss_la_LIBADD = \
 @HAVE_CRYPTO_NSS_TRUE@	$(GLIB_LIBS) \
 @HAVE_CRYPTO_NSS_TRUE@	$(NSS_LIBS)
 
+src_libnm_crypto_libnm_crypto_null_la_SOURCES = src/libnm-crypto/nm-crypto-null.c
+src_libnm_crypto_libnm_crypto_null_la_CPPFLAGS = \
+	$(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) \
+	$(NULL)
+
+src_libnm_crypto_libnm_crypto_null_la_LDFLAGS = \
+	$(src_libnm_core_impl_libnm_core_impl_la_LDFLAGS) \
+	$(NULL)
+
+src_libnm_crypto_libnm_crypto_null_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(NULL)
+
 nm_core_tests_enum_types_sources = src/libnm-core-impl/tests/test-general-enums.h
 nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "src/libnm-core-impl/nm-default-libnm-core.h"\n'
 src_libnm_core_impl_tests_cppflags = \
@@ -6209,6 +6285,7 @@ nodist_src_libnm_core_impl_tests_test_general_SOURCES = \
 src_libnm_core_impl_tests_ldadd = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
@@ -6391,6 +6468,7 @@ nodist_src_libnm_client_impl_libnm_client_impl_la_SOURCES = \
 src_libnm_client_impl_libnm_client_impl_la_LIBADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
@@ -6439,12 +6517,12 @@ src_libnm_client_impl_libnm_la_LDFLAGS = \
 	$(SANITIZER_LIB_LDFLAGS) \
 	-version-info "1:0:1"
 
-src_libnm_client_impl_NM_1_0_typelib = $(am__append_9)
+src_libnm_client_impl_NM_1_0_typelib = $(am__append_11)
 @HAVE_INTROSPECTION_TRUE@src_libnm_client_impl_NM_1_0_gir_INCLUDES = Gio-2.0
 @HAVE_INTROSPECTION_TRUE@src_libnm_client_impl_NM_1_0_gir_PACKAGES = gio-2.0
 @HAVE_INTROSPECTION_TRUE@src_libnm_client_impl_NM_1_0_gir_EXPORT_PACKAGES = libnm
 @HAVE_INTROSPECTION_TRUE@src_libnm_client_impl_NM_1_0_gir_CFLAGS = \
-@HAVE_INTROSPECTION_TRUE@	$(src_libnm_client_impl_libnm_la_CPPFLAGS) \
+@HAVE_INTROSPECTION_TRUE@	$(filter-out -DGLIB_VERSION_%, $(src_libnm_client_impl_libnm_la_CPPFLAGS)) \
 @HAVE_INTROSPECTION_TRUE@	-DNETWORKMANAGER_COMPILATION \
 @HAVE_INTROSPECTION_TRUE@	$(NULL)
 
@@ -6563,7 +6641,7 @@ src_core_cppflags = \
 	\
 	$(NULL)
 
-src_core_cppflags_test = $(src_core_cppflags) $(NULL) $(am__append_18)
+src_core_cppflags_test = $(src_core_cppflags) $(NULL) $(am__append_20)
 src_core_ldflags = $(CODE_COVERAGE_LDFLAGS)
 
 ###############################################################################
@@ -6785,6 +6863,8 @@ src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \
 	src/libnm-systemd-core/src/libsystemd-network/dhcp6-lease-internal.h \
 	src/libnm-systemd-core/src/libsystemd-network/dhcp6-network.c \
 	src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.c \
 	src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.h \
 	src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c \
 	src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.h \
@@ -7076,6 +7156,7 @@ src_core_libNetworkManager_la_LIBADD = \
 	src/core/libNetworkManagerBase.la \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
@@ -7190,6 +7271,7 @@ src_nm_initrd_generator_nm_initrd_generator_CPPFLAGS = \
 src_nm_initrd_generator_nm_initrd_generator_LDADD = \
 	src/nm-initrd-generator/libnmi-core.la \
 	src/libnm-core-impl/libnm-core-impl.la \
+	src/libnm-crypto/libnm-crypto.la \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
@@ -7467,7 +7549,7 @@ src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-modem.h \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-service-providers.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/wwan/nm-service-providers.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_34)
+@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_36)
 @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_core_devices_wwan_cppflags)
 @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_wwan_libnm_wwan_la_LDFLAGS = \
 @WITH_MODEM_MANAGER_1_TRUE@	-avoid-version \
@@ -7518,13 +7600,13 @@ src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = src/core/devices/bluetooth/nm-bluez-common.h \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bt-error.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bt-error.h \
-@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_38)
+@WITH_MODEM_MANAGER_1_TRUE@	$(NULL) $(am__append_40)
 @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS =  \
 @WITH_MODEM_MANAGER_1_TRUE@	$(src_core_cppflags_base) $(NULL) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_39)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_41)
 @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD =  \
 @WITH_MODEM_MANAGER_1_TRUE@	$(GLIB_LIBS) $(NULL) \
-@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_40)
+@WITH_MODEM_MANAGER_1_TRUE@	$(am__append_42)
 @WITH_MODEM_MANAGER_1_TRUE@src_core_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez-manager.c \
 @WITH_MODEM_MANAGER_1_TRUE@	src/core/devices/bluetooth/nm-bluez-manager.h \
@@ -7572,7 +7654,7 @@ src_core_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
 @WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-p2p-peer.h \
 @WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-utils.c \
 @WITH_WIFI_TRUE@	src/core/devices/wifi/nm-wifi-utils.h $(NULL) \
-@WITH_WIFI_TRUE@	$(am__append_43)
+@WITH_WIFI_TRUE@	$(am__append_45)
 @WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_core_cppflags_device_plugin)
 @WITH_WIFI_TRUE@src_core_devices_wifi_libnm_wifi_base_la_LIBADD = \
 @WITH_WIFI_TRUE@	$(GLIB_LIBS)
@@ -8511,15 +8593,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Ma
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
+	  $(AUTOMAKE) --foreign Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -9744,6 +9826,9 @@ src/libnm-base/$(am__dirstamp):
 src/libnm-base/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) src/libnm-base/$(DEPDIR)
 	@: > src/libnm-base/$(DEPDIR)/$(am__dirstamp)
+src/libnm-base/libnm_base_la-nm-base.lo:  \
+	src/libnm-base/$(am__dirstamp) \
+	src/libnm-base/$(DEPDIR)/$(am__dirstamp)
 src/libnm-base/libnm_base_la-nm-ethtool-base.lo:  \
 	src/libnm-base/$(am__dirstamp) \
 	src/libnm-base/$(DEPDIR)/$(am__dirstamp)
@@ -10152,9 +10237,6 @@ src/libnm-core-impl/libnm_core_impl_la-nm-setting-wpan.lo:  \
 src/libnm-core-impl/libnm_core_impl_la-nm-connection.lo:  \
 	src/libnm-core-impl/$(am__dirstamp) \
 	src/libnm-core-impl/$(DEPDIR)/$(am__dirstamp)
-src/libnm-core-impl/libnm_core_impl_la-nm-crypto.lo:  \
-	src/libnm-core-impl/$(am__dirstamp) \
-	src/libnm-core-impl/$(DEPDIR)/$(am__dirstamp)
 src/libnm-core-impl/libnm_core_impl_la-nm-dbus-utils.lo:  \
 	src/libnm-core-impl/$(am__dirstamp) \
 	src/libnm-core-impl/$(DEPDIR)/$(am__dirstamp)
@@ -10203,18 +10285,36 @@ src/libnm-core-public/libnm_core_impl_libnm_core_impl_la-nm-core-enum-types.lo:
 
 src/libnm-core-impl/libnm-core-impl.la: $(src_libnm_core_impl_libnm_core_impl_la_OBJECTS) $(src_libnm_core_impl_libnm_core_impl_la_DEPENDENCIES) $(EXTRA_src_libnm_core_impl_libnm_core_impl_la_DEPENDENCIES) src/libnm-core-impl/$(am__dirstamp)
 	$(AM_V_CCLD)$(src_libnm_core_impl_libnm_core_impl_la_LINK)  $(src_libnm_core_impl_libnm_core_impl_la_OBJECTS) $(src_libnm_core_impl_libnm_core_impl_la_LIBADD) $(LIBS)
-src/libnm-core-impl/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo:  \
-	src/libnm-core-impl/$(am__dirstamp) \
-	src/libnm-core-impl/$(DEPDIR)/$(am__dirstamp)
-
-src/libnm-core-impl/libnm-crypto-gnutls.la: $(src_libnm_core_impl_libnm_crypto_gnutls_la_OBJECTS) $(src_libnm_core_impl_libnm_crypto_gnutls_la_DEPENDENCIES) $(EXTRA_src_libnm_core_impl_libnm_crypto_gnutls_la_DEPENDENCIES) src/libnm-core-impl/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_libnm_core_impl_libnm_crypto_gnutls_la_LINK) $(am_src_libnm_core_impl_libnm_crypto_gnutls_la_rpath) $(src_libnm_core_impl_libnm_crypto_gnutls_la_OBJECTS) $(src_libnm_core_impl_libnm_crypto_gnutls_la_LIBADD) $(LIBS)
-src/libnm-core-impl/libnm_crypto_nss_la-nm-crypto-nss.lo:  \
-	src/libnm-core-impl/$(am__dirstamp) \
-	src/libnm-core-impl/$(DEPDIR)/$(am__dirstamp)
-
-src/libnm-core-impl/libnm-crypto-nss.la: $(src_libnm_core_impl_libnm_crypto_nss_la_OBJECTS) $(src_libnm_core_impl_libnm_crypto_nss_la_DEPENDENCIES) $(EXTRA_src_libnm_core_impl_libnm_crypto_nss_la_DEPENDENCIES) src/libnm-core-impl/$(am__dirstamp)
-	$(AM_V_CCLD)$(src_libnm_core_impl_libnm_crypto_nss_la_LINK) $(am_src_libnm_core_impl_libnm_crypto_nss_la_rpath) $(src_libnm_core_impl_libnm_crypto_nss_la_OBJECTS) $(src_libnm_core_impl_libnm_crypto_nss_la_LIBADD) $(LIBS)
+src/libnm-crypto/$(am__dirstamp):
+	@$(MKDIR_P) src/libnm-crypto
+	@: > src/libnm-crypto/$(am__dirstamp)
+src/libnm-crypto/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/libnm-crypto/$(DEPDIR)
+	@: > src/libnm-crypto/$(DEPDIR)/$(am__dirstamp)
+src/libnm-crypto/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo:  \
+	src/libnm-crypto/$(am__dirstamp) \
+	src/libnm-crypto/$(DEPDIR)/$(am__dirstamp)
+
+src/libnm-crypto/libnm-crypto-gnutls.la: $(src_libnm_crypto_libnm_crypto_gnutls_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_gnutls_la_DEPENDENCIES) $(EXTRA_src_libnm_crypto_libnm_crypto_gnutls_la_DEPENDENCIES) src/libnm-crypto/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_libnm_crypto_libnm_crypto_gnutls_la_LINK) $(am_src_libnm_crypto_libnm_crypto_gnutls_la_rpath) $(src_libnm_crypto_libnm_crypto_gnutls_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_gnutls_la_LIBADD) $(LIBS)
+src/libnm-crypto/libnm_crypto_nss_la-nm-crypto-nss.lo:  \
+	src/libnm-crypto/$(am__dirstamp) \
+	src/libnm-crypto/$(DEPDIR)/$(am__dirstamp)
+
+src/libnm-crypto/libnm-crypto-nss.la: $(src_libnm_crypto_libnm_crypto_nss_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_nss_la_DEPENDENCIES) $(EXTRA_src_libnm_crypto_libnm_crypto_nss_la_DEPENDENCIES) src/libnm-crypto/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_libnm_crypto_libnm_crypto_nss_la_LINK) $(am_src_libnm_crypto_libnm_crypto_nss_la_rpath) $(src_libnm_crypto_libnm_crypto_nss_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_nss_la_LIBADD) $(LIBS)
+src/libnm-crypto/libnm_crypto_null_la-nm-crypto-null.lo:  \
+	src/libnm-crypto/$(am__dirstamp) \
+	src/libnm-crypto/$(DEPDIR)/$(am__dirstamp)
+
+src/libnm-crypto/libnm-crypto-null.la: $(src_libnm_crypto_libnm_crypto_null_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_null_la_DEPENDENCIES) $(EXTRA_src_libnm_crypto_libnm_crypto_null_la_DEPENDENCIES) src/libnm-crypto/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_libnm_crypto_libnm_crypto_null_la_LINK) $(am_src_libnm_crypto_libnm_crypto_null_la_rpath) $(src_libnm_crypto_libnm_crypto_null_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_null_la_LIBADD) $(LIBS)
+src/libnm-crypto/libnm_crypto_la-nm-crypto.lo:  \
+	src/libnm-crypto/$(am__dirstamp) \
+	src/libnm-crypto/$(DEPDIR)/$(am__dirstamp)
+
+src/libnm-crypto/libnm-crypto.la: $(src_libnm_crypto_libnm_crypto_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_la_DEPENDENCIES) $(EXTRA_src_libnm_crypto_libnm_crypto_la_DEPENDENCIES) src/libnm-crypto/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_libnm_crypto_libnm_crypto_la_LINK)  $(src_libnm_crypto_libnm_crypto_la_OBJECTS) $(src_libnm_crypto_libnm_crypto_la_LIBADD) $(LIBS)
 src/libnm-glib-aux/$(am__dirstamp):
 	@$(MKDIR_P) src/libnm-glib-aux
 	@: > src/libnm-glib-aux/$(am__dirstamp)
@@ -10413,6 +10513,9 @@ src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-networ
 src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo:  \
 	src/libnm-systemd-core/src/libsystemd-network/$(am__dirstamp) \
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
+src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-protocol.lo:  \
+	src/libnm-systemd-core/src/libsystemd-network/$(am__dirstamp) \
+	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
 src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo:  \
 	src/libnm-systemd-core/src/libsystemd-network/$(am__dirstamp) \
 	src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/$(am__dirstamp)
@@ -11733,6 +11836,8 @@ mostlyclean-compile:
 	-rm -f src/libnm-core-impl/tests/*.$(OBJEXT)
 	-rm -f src/libnm-core-public/*.$(OBJEXT)
 	-rm -f src/libnm-core-public/*.lo
+	-rm -f src/libnm-crypto/*.$(OBJEXT)
+	-rm -f src/libnm-crypto/*.lo
 	-rm -f src/libnm-glib-aux/*.$(OBJEXT)
 	-rm -f src/libnm-glib-aux/*.lo
 	-rm -f src/libnm-glib-aux/tests/*.$(OBJEXT)
@@ -12048,6 +12153,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/core/tests/config/$(DEPDIR)/test_config-test-config.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-base/$(DEPDIR)/libnm_base_la-nm-base.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-base/$(DEPDIR)/libnm_base_la-nm-net-aux.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-base/$(DEPDIR)/libnm_base_la-nm-priv-helper-utils.Plo@am__quote@ # am--include-marker
@@ -12115,7 +12221,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-auth-subject.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-libnm-core-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-connection.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-crypto.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-dbus-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-errors.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-keyfile-utils.Plo@am__quote@ # am--include-marker
@@ -12181,8 +12286,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-utils.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-editor-plugin.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-plugin-info.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/tests/$(DEPDIR)/test_compare-test-compare.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/tests/$(DEPDIR)/test_crypto-test-crypto.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po@am__quote@ # am--include-marker
@@ -12192,6 +12295,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/tests/$(DEPDIR)/test_setting-test-setting.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-impl/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-core-public/$(DEPDIR)/libnm_core_impl_libnm_core_impl_la-nm-core-enum-types.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-crypto/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-crypto/$(DEPDIR)/libnm_crypto_la-nm-crypto.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-crypto/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-crypto/$(DEPDIR)/libnm_crypto_null_la-nm-crypto-null.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo@am__quote@ # am--include-marker
@@ -12236,6 +12343,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-protocol.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-common.Plo@am__quote@ # am--include-marker
@@ -14191,6 +14299,13 @@ src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_core_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/core/settings/plugins/ifupdown/libnms_ifupdown_core_la-nms-ifupdown-parser.lo `test -f 'src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c' || echo '$(srcdir)/'`src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
 
+src/libnm-base/libnm_base_la-nm-base.lo: src/libnm-base/nm-base.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_base_libnm_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-base/libnm_base_la-nm-base.lo -MD -MP -MF src/libnm-base/$(DEPDIR)/libnm_base_la-nm-base.Tpo -c -o src/libnm-base/libnm_base_la-nm-base.lo `test -f 'src/libnm-base/nm-base.c' || echo '$(srcdir)/'`src/libnm-base/nm-base.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-base/$(DEPDIR)/libnm_base_la-nm-base.Tpo src/libnm-base/$(DEPDIR)/libnm_base_la-nm-base.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-base/nm-base.c' object='src/libnm-base/libnm_base_la-nm-base.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_base_libnm_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-base/libnm_base_la-nm-base.lo `test -f 'src/libnm-base/nm-base.c' || echo '$(srcdir)/'`src/libnm-base/nm-base.c
+
 src/libnm-base/libnm_base_la-nm-ethtool-base.lo: src/libnm-base/nm-ethtool-base.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_base_libnm_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-base/libnm_base_la-nm-ethtool-base.lo -MD -MP -MF src/libnm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Tpo -c -o src/libnm-base/libnm_base_la-nm-ethtool-base.lo `test -f 'src/libnm-base/nm-ethtool-base.c' || echo '$(srcdir)/'`src/libnm-base/nm-ethtool-base.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Tpo src/libnm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Plo
@@ -14996,13 +15111,6 @@ src/libnm-core-impl/libnm_core_impl_la-nm-connection.lo: src/libnm-core-impl/nm-
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-core-impl/libnm_core_impl_la-nm-connection.lo `test -f 'src/libnm-core-impl/nm-connection.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-connection.c
 
-src/libnm-core-impl/libnm_core_impl_la-nm-crypto.lo: src/libnm-core-impl/nm-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-core-impl/libnm_core_impl_la-nm-crypto.lo -MD -MP -MF src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-crypto.Tpo -c -o src/libnm-core-impl/libnm_core_impl_la-nm-crypto.lo `test -f 'src/libnm-core-impl/nm-crypto.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-crypto.Tpo src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-crypto.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-core-impl/nm-crypto.c' object='src/libnm-core-impl/libnm_core_impl_la-nm-crypto.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-core-impl/libnm_core_impl_la-nm-crypto.lo `test -f 'src/libnm-core-impl/nm-crypto.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-crypto.c
-
 src/libnm-core-impl/libnm_core_impl_la-nm-dbus-utils.lo: src/libnm-core-impl/nm-dbus-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-core-impl/libnm_core_impl_la-nm-dbus-utils.lo -MD -MP -MF src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-dbus-utils.Tpo -c -o src/libnm-core-impl/libnm_core_impl_la-nm-dbus-utils.lo `test -f 'src/libnm-core-impl/nm-dbus-utils.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-dbus-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-dbus-utils.Tpo src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-dbus-utils.Plo
@@ -15094,19 +15202,33 @@ src/libnm-core-public/libnm_core_impl_libnm_core_impl_la-nm-core-enum-types.lo:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-core-public/libnm_core_impl_libnm_core_impl_la-nm-core-enum-types.lo `test -f 'src/libnm-core-public/nm-core-enum-types.c' || echo '$(srcdir)/'`src/libnm-core-public/nm-core-enum-types.c
 
-src/libnm-core-impl/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo: src/libnm-core-impl/nm-crypto-gnutls.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_crypto_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-core-impl/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo -MD -MP -MF src/libnm-core-impl/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Tpo -c -o src/libnm-core-impl/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo `test -f 'src/libnm-core-impl/nm-crypto-gnutls.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-crypto-gnutls.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-core-impl/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Tpo src/libnm-core-impl/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-core-impl/nm-crypto-gnutls.c' object='src/libnm-core-impl/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo' libtool=yes @AMDEPBACKSLASH@
+src/libnm-crypto/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo: src/libnm-crypto/nm-crypto-gnutls.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-crypto/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo -MD -MP -MF src/libnm-crypto/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Tpo -c -o src/libnm-crypto/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo `test -f 'src/libnm-crypto/nm-crypto-gnutls.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto-gnutls.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-crypto/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Tpo src/libnm-crypto/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-crypto/nm-crypto-gnutls.c' object='src/libnm-crypto/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_crypto_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-core-impl/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo `test -f 'src/libnm-core-impl/nm-crypto-gnutls.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-crypto-gnutls.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_gnutls_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-crypto/libnm_crypto_gnutls_la-nm-crypto-gnutls.lo `test -f 'src/libnm-crypto/nm-crypto-gnutls.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto-gnutls.c
 
-src/libnm-core-impl/libnm_crypto_nss_la-nm-crypto-nss.lo: src/libnm-core-impl/nm-crypto-nss.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_crypto_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-core-impl/libnm_crypto_nss_la-nm-crypto-nss.lo -MD -MP -MF src/libnm-core-impl/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Tpo -c -o src/libnm-core-impl/libnm_crypto_nss_la-nm-crypto-nss.lo `test -f 'src/libnm-core-impl/nm-crypto-nss.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-crypto-nss.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-core-impl/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Tpo src/libnm-core-impl/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-core-impl/nm-crypto-nss.c' object='src/libnm-core-impl/libnm_crypto_nss_la-nm-crypto-nss.lo' libtool=yes @AMDEPBACKSLASH@
+src/libnm-crypto/libnm_crypto_nss_la-nm-crypto-nss.lo: src/libnm-crypto/nm-crypto-nss.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-crypto/libnm_crypto_nss_la-nm-crypto-nss.lo -MD -MP -MF src/libnm-crypto/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Tpo -c -o src/libnm-crypto/libnm_crypto_nss_la-nm-crypto-nss.lo `test -f 'src/libnm-crypto/nm-crypto-nss.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto-nss.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-crypto/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Tpo src/libnm-crypto/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-crypto/nm-crypto-nss.c' object='src/libnm-crypto/libnm_crypto_nss_la-nm-crypto-nss.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_core_impl_libnm_crypto_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-core-impl/libnm_crypto_nss_la-nm-crypto-nss.lo `test -f 'src/libnm-core-impl/nm-crypto-nss.c' || echo '$(srcdir)/'`src/libnm-core-impl/nm-crypto-nss.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-crypto/libnm_crypto_nss_la-nm-crypto-nss.lo `test -f 'src/libnm-crypto/nm-crypto-nss.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto-nss.c
+
+src/libnm-crypto/libnm_crypto_null_la-nm-crypto-null.lo: src/libnm-crypto/nm-crypto-null.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_null_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-crypto/libnm_crypto_null_la-nm-crypto-null.lo -MD -MP -MF src/libnm-crypto/$(DEPDIR)/libnm_crypto_null_la-nm-crypto-null.Tpo -c -o src/libnm-crypto/libnm_crypto_null_la-nm-crypto-null.lo `test -f 'src/libnm-crypto/nm-crypto-null.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto-null.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-crypto/$(DEPDIR)/libnm_crypto_null_la-nm-crypto-null.Tpo src/libnm-crypto/$(DEPDIR)/libnm_crypto_null_la-nm-crypto-null.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-crypto/nm-crypto-null.c' object='src/libnm-crypto/libnm_crypto_null_la-nm-crypto-null.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_null_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-crypto/libnm_crypto_null_la-nm-crypto-null.lo `test -f 'src/libnm-crypto/nm-crypto-null.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto-null.c
+
+src/libnm-crypto/libnm_crypto_la-nm-crypto.lo: src/libnm-crypto/nm-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-crypto/libnm_crypto_la-nm-crypto.lo -MD -MP -MF src/libnm-crypto/$(DEPDIR)/libnm_crypto_la-nm-crypto.Tpo -c -o src/libnm-crypto/libnm_crypto_la-nm-crypto.lo `test -f 'src/libnm-crypto/nm-crypto.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-crypto/$(DEPDIR)/libnm_crypto_la-nm-crypto.Tpo src/libnm-crypto/$(DEPDIR)/libnm_crypto_la-nm-crypto.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-crypto/nm-crypto.c' object='src/libnm-crypto/libnm_crypto_la-nm-crypto.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_crypto_libnm_crypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-crypto/libnm_crypto_la-nm-crypto.lo `test -f 'src/libnm-crypto/nm-crypto.c' || echo '$(srcdir)/'`src/libnm-crypto/nm-crypto.c
 
 src/libnm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo: src/libnm-glib-aux/nm-dbus-aux.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo -MD -MP -MF src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Tpo -c -o src/libnm-glib-aux/libnm_glib_aux_la-nm-dbus-aux.lo `test -f 'src/libnm-glib-aux/nm-dbus-aux.c' || echo '$(srcdir)/'`src/libnm-glib-aux/nm-dbus-aux.c
@@ -15395,6 +15517,13 @@ src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-option.lo `test -f 'src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c' || echo '$(srcdir)/'`src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c
 
+src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-protocol.lo: src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-protocol.lo -MD -MP -MF src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-protocol.Tpo -c -o src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-protocol.lo `test -f 'src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.c' || echo '$(srcdir)/'`src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-protocol.Tpo src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-protocol.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.c' object='src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-protocol.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-dhcp6-protocol.lo `test -f 'src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.c' || echo '$(srcdir)/'`src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.c
+
 src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo: src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libnm_systemd_core_libnm_systemd_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo -MD -MP -MF src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo -c -o src/libnm-systemd-core/src/libsystemd-network/libnm_systemd_core_la-lldp-neighbor.lo `test -f 'src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c' || echo '$(srcdir)/'`src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Tpo src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
@@ -17929,6 +18058,7 @@ clean-libtool:
 	-rm -rf src/libnm-core-impl/.libs src/libnm-core-impl/_libs
 	-rm -rf src/libnm-core-impl/tests/.libs src/libnm-core-impl/tests/_libs
 	-rm -rf src/libnm-core-public/.libs src/libnm-core-public/_libs
+	-rm -rf src/libnm-crypto/.libs src/libnm-crypto/_libs
 	-rm -rf src/libnm-glib-aux/.libs src/libnm-glib-aux/_libs
 	-rm -rf src/libnm-glib-aux/tests/.libs src/libnm-glib-aux/tests/_libs
 	-rm -rf src/libnm-log-core/.libs src/libnm-log-core/_libs
@@ -19447,6 +19577,8 @@ distclean-generic:
 	-rm -f src/libnm-core-impl/tests/$(am__dirstamp)
 	-rm -f src/libnm-core-public/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/libnm-core-public/$(am__dirstamp)
+	-rm -f src/libnm-crypto/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/libnm-crypto/$(am__dirstamp)
 	-rm -f src/libnm-glib-aux/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/libnm-glib-aux/$(am__dirstamp)
 	-rm -f src/libnm-glib-aux/tests/$(DEPDIR)/$(am__dirstamp)
@@ -19789,6 +19921,7 @@ distclean: distclean-recursive
 	-rm -f src/core/tests/config/$(DEPDIR)/test_config-test-config.Po
 	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
 	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
+	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-base.Plo
 	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Plo
 	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-net-aux.Plo
 	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-priv-helper-utils.Plo
@@ -19856,7 +19989,6 @@ distclean: distclean-recursive
 	-rm -f src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-auth-subject.Plo
 	-rm -f src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-libnm-core-utils.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-connection.Plo
-	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-crypto.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-dbus-utils.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-errors.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-keyfile-utils.Plo
@@ -19922,8 +20054,6 @@ distclean: distclean-recursive
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-utils.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-editor-plugin.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-plugin-info.Plo
-	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
-	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_compare-test-compare.Po
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_crypto-test-crypto.Po
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po
@@ -19933,6 +20063,10 @@ distclean: distclean-recursive
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_setting-test-setting.Po
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
 	-rm -f src/libnm-core-public/$(DEPDIR)/libnm_core_impl_libnm_core_impl_la-nm-core-enum-types.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_la-nm-crypto.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_null_la-nm-crypto-null.Plo
 	-rm -f src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo
 	-rm -f src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo
 	-rm -f src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo
@@ -19977,6 +20111,7 @@ distclean: distclean-recursive
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-protocol.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-common.Plo
@@ -20458,6 +20593,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/core/tests/config/$(DEPDIR)/test_config-test-config.Po
 	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-connection.Plo
 	-rm -f src/core/vpn/$(DEPDIR)/libNetworkManager_la-nm-vpn-manager.Plo
+	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-base.Plo
 	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-ethtool-base.Plo
 	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-net-aux.Plo
 	-rm -f src/libnm-base/$(DEPDIR)/libnm_base_la-nm-priv-helper-utils.Plo
@@ -20525,7 +20661,6 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-auth-subject.Plo
 	-rm -f src/libnm-core-aux-intern/$(DEPDIR)/libnm_core_aux_intern_la-nm-libnm-core-utils.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-connection.Plo
-	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-crypto.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-dbus-utils.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-errors.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-keyfile-utils.Plo
@@ -20591,8 +20726,6 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-utils.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-editor-plugin.Plo
 	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_core_impl_la-nm-vpn-plugin-info.Plo
-	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
-	-rm -f src/libnm-core-impl/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_compare-test-compare.Po
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_crypto-test-crypto.Po
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_general-nm-core-tests-enum-types.Po
@@ -20602,6 +20735,10 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_setting-test-setting.Po
 	-rm -f src/libnm-core-impl/tests/$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
 	-rm -f src/libnm-core-public/$(DEPDIR)/libnm_core_impl_libnm_core_impl_la-nm-core-enum-types.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_gnutls_la-nm-crypto-gnutls.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_la-nm-crypto.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_nss_la-nm-crypto-nss.Plo
+	-rm -f src/libnm-crypto/$(DEPDIR)/libnm_crypto_null_la-nm-crypto-null.Plo
 	-rm -f src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dbus-aux.Plo
 	-rm -f src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo
 	-rm -f src/libnm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo
@@ -20646,6 +20783,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp-packet.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-network.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-option.Plo
+	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-dhcp6-protocol.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-neighbor.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-lldp-network.Plo
 	-rm -f src/libnm-systemd-core/src/libsystemd-network/$(DEPDIR)/libnm_systemd_core_la-network-common.Plo
@@ -20958,11 +21096,15 @@ config-extra.h: config-extra.h.mk config.h config.status
 	echo "#define SYSCONFDIR        \"$(sysconfdir)\""      >>$@ && \
 	true
 
-$(src_libnm_core_public_mkenums_h):                 config-extra.h
 $(src_libnm_core_public_mkenums_c):                 config-extra.h
+$(src_libnm_core_public_mkenums_h):                 config-extra.h
+src/core/dhcp/.dirstamp:                            config-extra.h
+src/libnm-base/.dirstamp:                           config-extra.h
+src/libnm-client-public/.dirstamp:                  config-extra.h
+src/libnm-client-public/.dirstamp:                  config-extra.h
 src/libnm-core-impl/.dirstamp:                      config-extra.h
 src/libnm-core-impl/.dirstamp:                      config-extra.h
-src/libnm-base/.dirstamp:                           config-extra.h
+src/libnm-crypto/.dirstamp:                         config-extra.h
 src/libnm-glib-aux/.dirstamp:                       config-extra.h
 src/libnm-glib-aux/tests/.dirstamp:                 config-extra.h
 src/libnm-log-core/.dirstamp:                       config-extra.h
@@ -20972,14 +21114,11 @@ src/libnm-platform/tests/.dirstamp:                 config-extra.h
 src/libnm-platform/wifi/.dirstamp:                  config-extra.h
 src/libnm-platform/wpan/.dirstamp:                  config-extra.h
 src/libnm-std-aux/.dirstamp:                        config-extra.h
-src/libnm-udev-aux/.dirstamp:                       config-extra.h
 src/libnm-systemd-shared/.dirstamp:                 config-extra.h
 src/libnm-systemd-shared/src/basic/.dirstamp:       config-extra.h
 src/libnm-systemd-shared/src/fundamental/.dirstamp: config-extra.h
 src/libnm-systemd-shared/src/shared/.dirstamp:      config-extra.h
-src/libnm-client-public/.dirstamp:                  config-extra.h
-src/libnm-client-public/.dirstamp:                  config-extra.h
-src/core/dhcp/.dirstamp:                            config-extra.h
+src/libnm-udev-aux/.dirstamp:                       config-extra.h
 
 dist-configure-check:
 	@echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection'. ***"
@@ -21463,9 +21602,6 @@ $(examples_C_glib_vpn_import_libnm_OBJECTS): $(src_libnm_core_public_mkenums_h)
 
 ###############################################################################
 
-@WITH_PYTHON_BLACK_TRUE@check-python-black:
-@WITH_PYTHON_BLACK_TRUE@	test "$$NMTST_SKIP_PYTHON_BLACK" == 1 || $(BLACK) --check $(top_srcdir) $(top_srcdir)/examples/python/gi/nm-wg-set
-
 ###############################################################################
 
 check-tree: