From ee9c73a923909e23a649407be77e25235d769e25 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 May 2018 22:08:45 +0200 Subject: New upstream version 1.10.8 --- Makefile.am | 742 +- Makefile.examples | 13 +- Makefile.in | 2635 ++++--- NEWS | 74 +- README | 2 +- TODO | 6 +- clients/cli/agent.c | 2 +- clients/cli/common.c | 129 +- clients/cli/connections.c | 238 +- clients/cli/devices.c | 7 +- clients/cli/general.c | 3 - clients/cli/meson.build | 48 - clients/cli/nmcli.c | 20 +- clients/cli/nmcli.h | 12 +- clients/cli/polkit-agent.c | 73 +- clients/cli/settings.c | 9 +- clients/cli/utils.c | 27 +- clients/cli/utils.h | 2 +- clients/common/meson.build | 81 - clients/common/nm-client-utils.c | 106 +- clients/common/nm-client-utils.h | 8 +- clients/common/nm-meta-setting-access.c | 3 - clients/common/nm-meta-setting-access.h | 1 - clients/common/nm-meta-setting-desc.c | 718 +- clients/common/nm-meta-setting-desc.h | 7 +- clients/common/nm-polkit-listener.c | 214 +- clients/common/nm-polkit-listener.h | 86 +- clients/common/nm-secret-agent-simple.c | 236 +- clients/common/nm-secret-agent-simple.h | 21 +- clients/common/nm-vpn-helpers.h | 2 + clients/common/settings-docs.c | 387 + clients/common/settings-docs.c.in | 387 + clients/common/settings-docs.h | 390 -- clients/common/settings-docs.h.in | 390 -- clients/common/tests/meson.build | 23 - clients/common/tests/test-general.c | 10 +- clients/meson.build | 35 - clients/nm-online.c | 4 + clients/tui/meson.build | 72 - clients/tui/newt/meson.build | 35 - clients/tui/newt/nmt-newt-section.c | 2 +- clients/tui/newt/nmt-newt-utils.c | 12 +- clients/tui/newt/nmt-newt-widget.c | 4 +- clients/tui/nm-editor-bindings.h | 2 + clients/tui/nm-editor-utils.c | 2 + clients/tui/nm-editor-utils.h | 2 + clients/tui/nmt-connect-connection-list.c | 9 +- clients/tui/nmt-device-entry.c | 2 + clients/tui/nmt-device-entry.h | 2 + clients/tui/nmt-edit-connection-list.c | 2 +- clients/tui/nmt-edit-connection-list.h | 2 + clients/tui/nmt-editor-grid.c | 2 +- clients/tui/nmt-editor-page.h | 2 + clients/tui/nmt-editor.h | 2 + clients/tui/nmt-mac-entry.c | 1 + clients/tui/nmt-page-bond.c | 30 +- clients/tui/nmt-page-team-port.c | 2 +- clients/tui/nmt-page-team.c | 2 +- clients/tui/nmt-password-dialog.c | 4 +- clients/tui/nmt-route-editor.h | 2 + clients/tui/nmt-route-entry.c | 4 +- clients/tui/nmt-route-table.c | 4 + clients/tui/nmt-slave-list.c | 2 + clients/tui/nmt-utils.c | 2 +- clients/tui/nmtui-connect.c | 43 +- clients/tui/nmtui-edit.c | 2 + clients/tui/nmtui-hostname.c | 2 +- clients/tui/nmtui.c | 2 + clients/tui/nmtui.h | 2 + config.h.in | 28 +- config.h.meson | 261 - configure | 1390 ++-- configure.ac | 272 +- data/90-nm-thunderbolt.rules | 13 - data/NetworkManager.service.in | 5 - data/meson.build | 80 - dispatcher/meson.build | 71 - dispatcher/nm-dispatcher.c | 4 +- dispatcher/tests/meson.build | 27 - dispatcher/tests/test-dispatcher-envp.c | 1 + docs/api/Makefile.am | 2 +- docs/api/Makefile.in | 12 +- ....freedesktop.NetworkManager.Device.IPTunnel.xml | 10 - .../dbus-org.freedesktop.NetworkManager.PPP.xml | 15 - ...edesktop.NetworkManager.Settings.Connection.xml | 14 +- docs/api/dbus-org.freedesktop.NetworkManager.xml | 105 +- docs/api/html/NetworkManager.conf.html | 39 +- docs/api/html/NetworkManager.devhelp2 | 41 +- docs/api/html/NetworkManager.html | 6 +- docs/api/html/dbus-vpn-plugin.html | 32 - ...freedesktop.NetworkManager.Device.IPTunnel.html | 10 - .../gdbus-org.freedesktop.NetworkManager.PPP.html | 19 - ...desktop.NetworkManager.Settings.Connection.html | 16 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 8 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 113 +- docs/api/html/index.html | 4 +- docs/api/html/ix01.html | 1350 ++-- docs/api/html/nm-dbus-types.html | 103 +- docs/api/html/nm-settings-ifcfg-rh.html | 32 +- docs/api/html/nm-settings.html | 51 +- .../html/settings-802-11-wireless-security.html | 6 - docs/api/html/settings-bridge.html | 2 +- docs/api/html/settings-connection.html | 12 +- docs/api/html/settings-dcb.html | 12 +- docs/api/html/settings-ip-tunnel.html | 6 - docs/api/html/settings-ipv4.html | 6 +- docs/api/html/settings-ipv6.html | 4 +- docs/api/html/vpn-plugins.html | 6 +- docs/api/meson.build | 31 - docs/api/network-manager-docs.xml | 2 +- docs/api/settings-spec.xml | 33 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.am | 22 +- docs/libnm-glib/Makefile.in | 28 +- docs/libnm-glib/html/NMClient.html | 2 + docs/libnm-glib/html/NMDHCP4Config.html | 2 + docs/libnm-glib/html/NMDHCP6Config.html | 2 + docs/libnm-glib/html/NMSecretAgent.html | 131 + docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/meson.build | 39 - docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.am | 15 +- docs/libnm-util/Makefile.in | 21 +- docs/libnm-util/html/index.html | 2 +- docs/libnm-util/meson.build | 32 - docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.am | 24 +- docs/libnm/Makefile.in | 30 +- docs/libnm/html/NMActiveConnection.html | 2 +- docs/libnm/html/NMClient.html | 527 +- docs/libnm/html/NMConnection.html | 4 +- docs/libnm/html/NMDevice.html | 2 +- docs/libnm/html/NMDeviceBond.html | 2 +- docs/libnm/html/NMDeviceBridge.html | 2 +- docs/libnm/html/NMDeviceIPTunnel.html | 58 - docs/libnm/html/NMDeviceTeam.html | 2 +- docs/libnm/html/NMDeviceWifi.html | 2 +- docs/libnm/html/NMDeviceWimax.html | 2 +- docs/libnm/html/NMDhcpConfig.html | 2 + docs/libnm/html/NMIPConfig.html | 1 - docs/libnm/html/NMObject.html | 1 - docs/libnm/html/NMRemoteConnection.html | 61 +- docs/libnm/html/NMSecretAgentOld.html | 131 + docs/libnm/html/NMSettingBond.html | 4 + docs/libnm/html/NMSettingBridge.html | 4 - docs/libnm/html/NMSettingConnection.html | 134 +- docs/libnm/html/NMSettingDcb.html | 12 +- docs/libnm/html/NMSettingIP4Config.html | 8 - docs/libnm/html/NMSettingIPConfig.html | 22 +- docs/libnm/html/NMSettingIPTunnel.html | 101 +- docs/libnm/html/NMSettingTeam.html | 112 +- docs/libnm/html/NMSettingTeamPort.html | 36 +- docs/libnm/html/NMSettingVlan.html | 4 +- docs/libnm/html/NMSettingVpn.html | 98 +- docs/libnm/html/NMSettingWired.html | 5 + docs/libnm/html/NMSettingWirelessSecurity.html | 110 - docs/libnm/html/NMVpnEditorPlugin.html | 26 +- docs/libnm/html/annotation-glossary.html | 5 - docs/libnm/html/api-index-full.html | 196 +- docs/libnm/html/index.html | 2 +- docs/libnm/html/libnm-nm-dbus-interface.html | 94 +- docs/libnm/html/libnm-nm-utils.html | 41 +- docs/libnm/html/libnm-nm-version.html | 32 +- docs/libnm/html/libnm.devhelp2 | 182 +- docs/libnm/html/object-tree.html | 6 - docs/libnm/html/usage.html | 2 +- docs/libnm/libnm-sections.txt | 70 +- docs/libnm/libnm.types | 6 - docs/libnm/meson.build | 52 - docs/libnm/version.xml | 2 +- docs/meson.build | 12 - examples/C/glib/add-connection-gdbus.c | 5 + examples/C/glib/add-connection-libnm.c | 5 + examples/C/glib/get-active-connections-gdbus.c | 5 + examples/C/glib/get-ap-info-libnm.c | 9 +- examples/C/glib/list-connections-gdbus.c | 5 + examples/C/glib/list-connections-libnm.c | 5 + examples/C/glib/meson.build | 19 - examples/C/glib/monitor-nm-running-gdbus.c | 5 + examples/C/glib/monitor-nm-state-gdbus.c | 5 + examples/C/qt/meson.build | 47 - examples/js/get_ips.js | 184 - examples/python/dbus/add-connection-compat.py | 4 +- examples/python/dbus/add-connection.py | 4 +- examples/python/dbus/add-wifi-eap-connection.py | 4 +- examples/python/dbus/add-wifi-psk-connection.py | 2 +- examples/python/dbus/create-bond.py | 16 +- .../python/dbus/get-active-connection-uuids.py | 4 +- examples/python/dbus/is-wwan-default.py | 12 +- examples/python/dbus/list-connections.py | 18 +- examples/python/dbus/list-devices.py | 12 +- examples/python/dbus/nm-state.py | 6 +- examples/python/dbus/show-bssids.py | 8 +- examples/python/dbus/update-ip4-method.py | 4 +- examples/python/dbus/update-secrets.py | 14 +- examples/python/dbus/vpn.py | 16 +- examples/python/dbus/wifi-active-ap.py | 6 +- examples/python/dbus/wifi-hotspot.py | 10 +- examples/python/gi/add_connection.py | 4 +- examples/python/gi/deactivate-all.py | 2 +- examples/python/gi/device-state-ip4config.py | 14 +- examples/python/gi/get-active-connections.py | 4 +- examples/python/gi/get_ips.py | 12 +- examples/python/gi/list-connections.py | 6 +- examples/python/gi/show-wifi-networks.py | 24 +- examples/python/gi/update-ip4-method.py | 6 +- examples/python/nmex.py | 72 - examples/shell/nm-logging.sh | 2 +- introspection/meson.build | 90 - ....freedesktop.NetworkManager.Device.IPTunnel.xml | 7 - .../org.freedesktop.NetworkManager.PPP.xml | 5 - ...edesktop.NetworkManager.Settings.Connection.xml | 13 +- introspection/org.freedesktop.NetworkManager.xml | 30 +- libnm-core/crypto.h | 4 - libnm-core/meson.build | 191 - libnm-core/nm-connection-private.h | 4 - libnm-core/nm-connection.c | 12 +- libnm-core/nm-connection.h | 2 +- libnm-core/nm-core-enum-types.c.template | 86 - libnm-core/nm-core-enum-types.h.template | 21 - libnm-core/nm-core-internal.h | 18 - libnm-core/nm-core-types-internal.h | 13 - libnm-core/nm-dbus-interface.h | 48 +- libnm-core/nm-dbus-types.xml | 49 +- libnm-core/nm-dbus-utils.c | 10 +- libnm-core/nm-json.c | 11 +- libnm-core/nm-json.h | 3 +- libnm-core/nm-keyfile-internal.h | 4 - libnm-core/nm-keyfile-reader.c | 1969 ++++++ libnm-core/nm-keyfile-utils.c | 2 +- libnm-core/nm-keyfile-utils.h | 4 +- libnm-core/nm-keyfile-writer.c | 882 +++ libnm-core/nm-keyfile.c | 2925 -------- libnm-core/nm-property-compare.h | 4 - libnm-core/nm-setting-8021x.c | 85 +- libnm-core/nm-setting-bond.c | 31 +- libnm-core/nm-setting-bridge.c | 2 - libnm-core/nm-setting-connection.c | 90 +- libnm-core/nm-setting-connection.h | 21 - libnm-core/nm-setting-dcb.c | 24 +- libnm-core/nm-setting-ip-config.c | 89 +- libnm-core/nm-setting-ip-config.h | 2 - libnm-core/nm-setting-ip-tunnel.c | 60 - libnm-core/nm-setting-ip-tunnel.h | 30 - libnm-core/nm-setting-ip4-config.c | 30 +- libnm-core/nm-setting-ip6-config.c | 14 +- libnm-core/nm-setting-macvlan.c | 8 +- libnm-core/nm-setting-ovs-patch.c | 8 +- libnm-core/nm-setting-private.h | 6 +- libnm-core/nm-setting-tc-config.c | 112 +- libnm-core/nm-setting-tc-config.h | 90 +- libnm-core/nm-setting-team-port.c | 37 +- libnm-core/nm-setting-team-port.h | 22 +- libnm-core/nm-setting-team.c | 115 +- libnm-core/nm-setting-team.h | 80 +- libnm-core/nm-setting-tun.c | 4 +- libnm-core/nm-setting-user.c | 25 +- libnm-core/nm-setting-vlan.h | 4 +- libnm-core/nm-setting-vpn.c | 130 +- libnm-core/nm-setting-vpn.h | 8 - libnm-core/nm-setting-wired.c | 6 +- libnm-core/nm-setting-wireless-security.c | 57 - libnm-core/nm-setting-wireless-security.h | 26 - libnm-core/nm-setting.c | 34 +- libnm-core/nm-simple-connection.c | 7 +- libnm-core/nm-utils-private.h | 4 +- libnm-core/nm-utils.c | 188 +- libnm-core/nm-utils.h | 12 +- libnm-core/nm-version.h | 22 +- libnm-core/nm-vpn-editor-plugin.h | 10 +- libnm-core/nm-vpn-plugin-info.h | 4 +- libnm-core/tests/meson.build | 51 - .../tests/nm-core-tests-enum-types.c.template | 35 - .../tests/nm-core-tests-enum-types.h.template | 21 - libnm-core/tests/test-general.c | 363 +- libnm-core/tests/test-keyfile.c | 30 +- libnm-core/tests/test-secrets.c | 3 +- libnm-core/tests/test-setting.c | 15 +- libnm-glib/libnm-glib-test.c | 6 +- libnm-glib/libnm_glib.c | 102 +- libnm-glib/meson.build | 293 - libnm-glib/nm-access-point.c | 2 +- libnm-glib/nm-client.c | 5 +- libnm-glib/nm-device.c | 2 +- libnm-glib/nm-dhcp4-config.c | 4 +- libnm-glib/nm-dhcp6-config.c | 4 +- libnm-glib/nm-glib-enum-types.c.template | 62 - libnm-glib/nm-glib-enum-types.h.template | 21 - libnm-glib/nm-secret-agent.c | 12 +- libnm-glib/nm-vpn-enum-types.c.template | 37 - libnm-glib/nm-vpn-enum-types.h.template | 21 - libnm-glib/nm-vpn-plugin-ui-interface.c | 20 +- libnm-glib/nm-vpn-plugin-ui-interface.h | 2 +- libnm-glib/tests/meson.build | 30 - libnm-util/meson.build | 194 - libnm-util/nm-param-spec-specialized.c | 2 + libnm-util/nm-setting-private.h | 2 +- libnm-util/nm-setting-wired.c | 2 +- libnm-util/nm-setting.c | 1 + libnm-util/nm-utils-enum-types.c.template | 65 - libnm-util/nm-utils-enum-types.h.template | 21 - libnm-util/nm-utils.c | 68 +- libnm-util/nm-version.h | 8 +- libnm-util/tests/meson.build | 47 - libnm-util/tests/test-general.c | 103 +- libnm-util/tests/test-setting-dcb.c | 10 +- libnm/NetworkManager.h | 2 - libnm/fake-typelib/NMClient.gir | 9 - libnm/fake-typelib/NetworkManager.gir | 10 - libnm/fake-typelib/meson.build | 30 - libnm/fake-typelib/typelibs.gresource.xml | 7 - libnm/generate-plugin-docs.pl | 20 +- libnm/generate-setting-docs.py | 5 - libnm/libnm.ver | 30 - libnm/meson.build | 259 - libnm/nm-access-point.c | 2 +- libnm/nm-active-connection.c | 4 +- libnm/nm-autoptr.h | 85 - libnm/nm-checkpoint.c | 219 - libnm/nm-checkpoint.h | 53 - libnm/nm-client.c | 421 +- libnm/nm-client.h | 52 - libnm/nm-dbus-helpers.h | 4 - libnm/nm-device-bond.c | 4 +- libnm/nm-device-bridge.c | 4 +- libnm/nm-device-ip-tunnel.c | 36 - libnm/nm-device-ip-tunnel.h | 4 - libnm/nm-device-team.c | 4 +- libnm/nm-device-wifi.c | 4 +- libnm/nm-device-wimax.c | 4 +- libnm/nm-device.c | 290 +- libnm/nm-dhcp-config.c | 6 +- libnm/nm-dhcp4-config.h | 11 +- libnm/nm-dhcp6-config.h | 11 +- libnm/nm-dns-manager.h | 11 +- libnm/nm-enum-types.c.template | 76 - libnm/nm-enum-types.h.template | 22 - libnm/nm-ip-config.c | 2 +- libnm/nm-ip4-config.h | 11 +- libnm/nm-ip6-config.h | 11 +- libnm/nm-libnm-utils.c | 591 +- libnm/nm-libnm-utils.h | 9 +- libnm/nm-manager.c | 429 +- libnm/nm-manager.h | 52 +- libnm/nm-object-private.h | 4 - libnm/nm-object.c | 9 +- libnm/nm-property-docs.xml | 33 +- libnm/nm-remote-connection-private.h | 4 - libnm/nm-remote-connection.c | 39 +- libnm/nm-remote-connection.h | 8 +- libnm/nm-remote-settings.h | 12 +- libnm/nm-secret-agent-old.c | 14 +- libnm/nm-settings-docs.xml | 33 +- libnm/nm-settings-ifcfg-rh-docs.xml | 9 +- libnm/nm-types.h | 1 - libnm/nm-vpn-editor.h | 2 +- libnm/nm-vpn-plugin-old.c | 123 +- libnm/nm-vpn-service-plugin.c | 191 +- libnm/nm-vpn-service-plugin.h | 3 - libnm/tests/meson.build | 42 - libnm/tests/test-general.c | 2142 +----- libnm/tests/test-secret-agent.c | 3 +- m4/compiler_options.m4 | 46 +- m4/introspection.m4 | 4 +- man/NetworkManager.8 | 15 +- man/NetworkManager.conf.5 | 45 +- man/NetworkManager.conf.xml | 46 +- man/NetworkManager.xml | 6 +- man/meson.build | 98 - man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-ifcfg-rh.5 | 44 +- man/nm-settings-ifcfg-rh.xml | 18 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 66 +- man/nm-settings.xml | 35 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- meson.build | 973 --- meson_options.txt | 77 - meson_post_install.py | 46 - po/ChangeLog | 2149 +++++- po/POTFILES.in | 5 +- po/POTFILES.skip | 3 - po/ar.po | 3996 ++++++----- po/as.po | 4034 ++++++----- po/be@latin.po | 4018 ++++++----- po/bg.po | 7333 +++++++++---------- po/bn_IN.po | 4039 ++++++----- po/bs.po | 3998 ++++++----- po/ca.po | 4036 ++++++----- po/cs.po | 7365 +++++++++---------- po/da.po | 7245 ++++++++++--------- po/de.po | 1631 +++-- po/dz.po | 6366 +++++++++-------- po/el.po | 4043 ++++++----- po/en_CA.po | 6918 +++++++++--------- po/en_GB.po | 7379 ++++++++++---------- po/eo.po | 6851 +++++++++--------- po/es.po | 1631 +++-- po/et.po | 4014 ++++++----- po/eu.po | 4002 ++++++----- po/fi.po | 7053 ++++++++++--------- po/fr.po | 1631 +++-- po/gd.po | 4026 ++++++----- po/gl.po | 4034 ++++++----- po/gu.po | 4035 ++++++----- po/he.po | 4017 ++++++----- po/hi.po | 4034 ++++++----- po/hr.po | 7353 +++++++++---------- po/hu.po | 7108 ++++++++++--------- po/id.po | 3319 +++++---- po/it.po | 1631 +++-- po/ja.po | 1632 +++-- po/ka.po | 6839 +++++++++--------- po/kn.po | 4036 ++++++----- po/ko.po | 1631 +++-- po/ku.po | 6390 +++++++++-------- po/lt.po | 5227 +++++++------- po/lv.po | 6721 +++++++++--------- po/meson.build | 1 - po/mk.po | 4018 ++++++----- po/ml.po | 4528 ++++++------ po/mr.po | 4032 ++++++----- po/nb.po | 4017 ++++++----- po/ne.po | 6238 +++++++++-------- po/nl.po | 6097 ++++++++-------- po/oc.po | 4006 ++++++----- po/or.po | 4033 ++++++----- po/pa.po | 4527 ++++++------ po/pl.po | 8 +- po/pt.po | 3992 ++++++----- po/pt_BR.po | 1631 +++-- po/ru.po | 389 +- po/rw.po | 6307 +++++++++-------- po/sk.po | 4016 ++++++----- po/sl.po | 4968 +++++++------ po/sq.po | 4003 ++++++----- po/sr.po | 5001 +++++++------ po/sr@latin.po | 4985 +++++++------ po/sv.po | 1839 +++-- po/ta.po | 4032 ++++++----- po/te.po | 4033 ++++++----- po/th.po | 6839 +++++++++--------- po/tr.po | 4035 ++++++----- po/uk.po | 4078 +++++------ po/vi.po | 4013 ++++++----- po/wa.po | 3997 ++++++----- po/zh_CN.po | 1631 +++-- po/zh_HK.po | 6409 +++++++++-------- po/zh_TW.po | 1631 +++-- shared/c-list/src/c-list.h | 422 -- shared/c-siphash/src/c-siphash.c | 246 - shared/c-siphash/src/c-siphash.h | 60 - shared/meson.build | 70 - shared/n-acd/src/n-acd.c | 1245 ---- shared/n-acd/src/n-acd.h | 94 - shared/nm-default.h | 163 +- shared/nm-test-libnm-utils.h | 28 +- shared/nm-test-utils-impl.c | 28 +- shared/nm-utils/c-list-util.c | 88 +- shared/nm-utils/c-list-util.h | 2 +- shared/nm-utils/c-list.h | 397 ++ shared/nm-utils/nm-c-list.h | 81 - shared/nm-utils/nm-compat.c | 95 - shared/nm-utils/nm-compat.h | 53 - shared/nm-utils/nm-dedup-multi.c | 6 +- shared/nm-utils/nm-dedup-multi.h | 2 +- shared/nm-utils/nm-enum-utils.c | 47 +- shared/nm-utils/nm-enum-utils.h | 5 +- shared/nm-utils/nm-glib.h | 382 +- shared/nm-utils/nm-hash-utils.c | 134 +- shared/nm-utils/nm-hash-utils.h | 13 - shared/nm-utils/nm-jansson.h | 46 - shared/nm-utils/nm-macros-internal.h | 245 +- shared/nm-utils/nm-obj.h | 2 +- shared/nm-utils/nm-shared-utils.c | 244 - shared/nm-utils/nm-shared-utils.h | 166 +- shared/nm-utils/nm-test-utils.h | 70 +- shared/nm-utils/siphash24.c | 17 +- shared/nm-utils/unaligned.h | 61 +- shared/nm-version-macros.h | 28 +- shared/nm-version-macros.h.in | 24 +- src/NetworkManagerUtils.c | 185 +- src/NetworkManagerUtils.h | 21 +- src/devices/adsl/meson.build | 34 - src/devices/adsl/nm-device-adsl.c | 46 +- src/devices/bluetooth/meson.build | 45 - src/devices/bluetooth/nm-bluez-device.c | 4 +- src/devices/bluetooth/nm-bluez4-adapter.c | 1 + src/devices/bluetooth/nm-bluez5-manager.c | 2 +- src/devices/bluetooth/nm-device-bt.c | 77 +- src/devices/meson.build | 22 - src/devices/nm-acd-manager.c | 489 -- src/devices/nm-acd-manager.h | 43 - src/devices/nm-arping-manager.c | 474 ++ src/devices/nm-arping-manager.h | 43 + src/devices/nm-device-bond.c | 26 +- src/devices/nm-device-bridge.c | 26 +- src/devices/nm-device-dummy.c | 24 +- src/devices/nm-device-ethernet.c | 90 +- src/devices/nm-device-ethernet.h | 18 +- src/devices/nm-device-factory.c | 69 +- src/devices/nm-device-generic.c | 23 +- src/devices/nm-device-infiniband.c | 27 +- src/devices/nm-device-ip-tunnel.c | 78 +- src/devices/nm-device-ip-tunnel.h | 4 +- src/devices/nm-device-macsec.c | 59 +- src/devices/nm-device-macsec.h | 3 + src/devices/nm-device-macvlan.c | 42 +- src/devices/nm-device-macvlan.h | 3 + src/devices/nm-device-ppp.c | 93 +- src/devices/nm-device-private.h | 6 +- src/devices/nm-device-tun.c | 355 +- src/devices/nm-device-veth.c | 41 +- src/devices/nm-device-vlan.c | 29 +- src/devices/nm-device-vlan.h | 4 + src/devices/nm-device-vxlan.c | 110 +- src/devices/nm-device-vxlan.h | 3 + src/devices/nm-device.c | 3726 ++++------ src/devices/nm-device.h | 42 +- src/devices/nm-lldp-listener.c | 45 +- src/devices/ovs/meson.build | 38 - src/devices/ovs/nm-device-ovs-bridge.c | 21 +- src/devices/ovs/nm-device-ovs-interface.c | 19 +- src/devices/ovs/nm-device-ovs-port.c | 21 +- src/devices/ovs/nm-ovsdb.c | 31 +- src/devices/team/meson.build | 35 - src/devices/team/nm-device-team.c | 29 +- src/devices/tests/meson.build | 18 - src/devices/tests/test-acd.c | 185 - src/devices/tests/test-arping.c | 164 + src/devices/tests/test-lldp.c | 52 +- src/devices/wifi/meson.build | 51 - src/devices/wifi/nm-device-iwd.c | 1921 ----- src/devices/wifi/nm-device-iwd.h | 62 - src/devices/wifi/nm-device-olpc-mesh.c | 38 +- src/devices/wifi/nm-device-wifi.c | 381 +- src/devices/wifi/nm-device-wifi.h | 12 +- src/devices/wifi/nm-iwd-manager.c | 694 -- src/devices/wifi/nm-iwd-manager.h | 65 - src/devices/wifi/nm-wifi-ap.c | 205 +- src/devices/wifi/nm-wifi-ap.h | 21 +- src/devices/wifi/nm-wifi-common.c | 205 - src/devices/wifi/nm-wifi-common.h | 37 - src/devices/wifi/nm-wifi-factory.c | 29 +- src/devices/wifi/nm-wifi-utils.c | 32 - src/devices/wifi/nm-wifi-utils.h | 2 - src/devices/wifi/tests/meson.build | 13 - src/devices/wwan/libnm-wwan.ver | 2 +- src/devices/wwan/meson.build | 75 - src/devices/wwan/nm-device-modem.c | 96 +- src/devices/wwan/nm-modem-broadband.c | 65 +- src/devices/wwan/nm-modem-ofono.c | 26 +- src/devices/wwan/nm-modem.c | 294 +- src/devices/wwan/nm-modem.h | 19 +- src/devices/wwan/nm-wwan-factory.c | 8 +- src/dhcp/meson.build | 22 - src/dhcp/nm-dhcp-client.c | 119 +- src/dhcp/nm-dhcp-client.h | 49 +- src/dhcp/nm-dhcp-dhclient-utils.c | 330 +- src/dhcp/nm-dhcp-dhclient-utils.h | 15 +- src/dhcp/nm-dhcp-dhclient.c | 59 +- src/dhcp/nm-dhcp-dhcpcanon.c | 14 +- src/dhcp/nm-dhcp-dhcpcd.c | 17 +- src/dhcp/nm-dhcp-helper.c | 2 + src/dhcp/nm-dhcp-listener.c | 84 +- src/dhcp/nm-dhcp-manager.c | 118 +- src/dhcp/nm-dhcp-manager.h | 15 +- src/dhcp/nm-dhcp-systemd.c | 115 +- src/dhcp/nm-dhcp-utils.c | 8 +- src/dhcp/nm-dhcp-utils.h | 2 +- src/dhcp/tests/leases/basic.leases | 31 + src/dhcp/tests/leases/malformed1.leases | 15 + src/dhcp/tests/leases/malformed2.leases | 15 + src/dhcp/tests/leases/malformed3.leases | 15 + src/dhcp/tests/meson.build | 19 - src/dhcp/tests/test-dhcp-dhclient.c | 318 +- src/dhcp/tests/test-dhcp-utils.c | 21 +- src/dns/nm-dns-dnsmasq.c | 344 +- src/dns/nm-dns-manager.c | 819 +-- src/dns/nm-dns-manager.h | 33 +- src/dns/nm-dns-plugin.c | 4 +- src/dns/nm-dns-plugin.h | 4 +- src/dns/nm-dns-systemd-resolved.c | 289 +- src/dns/nm-dns-unbound.c | 2 +- src/dnsmasq/nm-dnsmasq-manager.c | 2 +- src/dnsmasq/tests/meson.build | 14 - src/main.c | 47 +- src/meson.build | 319 - src/ndisc/nm-lndp-ndisc.c | 52 +- src/ndisc/nm-ndisc.c | 55 +- src/ndisc/nm-ndisc.h | 33 +- src/ndisc/tests/meson.build | 23 - src/nm-act-request.c | 8 +- src/nm-active-connection.c | 384 +- src/nm-active-connection.h | 9 +- src/nm-audit-manager.c | 2 +- src/nm-audit-manager.h | 1 - src/nm-auth-manager.c | 623 +- src/nm-auth-manager.h | 62 +- src/nm-auth-subject.c | 39 +- src/nm-auth-subject.h | 4 + src/nm-auth-utils.c | 489 +- src/nm-auth-utils.h | 25 +- src/nm-bus-manager.c | 1024 +++ src/nm-bus-manager.h | 93 + src/nm-checkpoint-manager.c | 326 +- src/nm-checkpoint-manager.h | 24 +- src/nm-checkpoint.c | 288 +- src/nm-checkpoint.h | 29 +- src/nm-config-data.c | 307 +- src/nm-config-data.h | 24 +- src/nm-config.c | 20 +- src/nm-config.h | 3 +- src/nm-connectivity.c | 589 +- src/nm-connectivity.h | 29 +- src/nm-core-utils.c | 278 +- src/nm-core-utils.h | 36 +- src/nm-dbus-manager.c | 1626 ----- src/nm-dbus-manager.h | 107 - src/nm-dbus-object.c | 320 - src/nm-dbus-object.h | 202 - src/nm-dbus-utils.c | 312 - src/nm-dbus-utils.h | 212 - src/nm-dhcp4-config.c | 34 +- src/nm-dhcp6-config.c | 34 +- src/nm-dispatcher.c | 13 +- src/nm-exported-object.c | 1055 +++ src/nm-exported-object.h | 85 + src/nm-firewall-manager.c | 2 +- src/nm-iface-helper.c | 115 +- src/nm-ip4-config.c | 212 +- src/nm-ip4-config.h | 200 +- src/nm-ip6-config.c | 216 +- src/nm-ip6-config.h | 10 +- src/nm-logging.c | 7 +- src/nm-logging.h | 12 +- src/nm-manager.c | 2458 +++---- src/nm-manager.h | 36 +- src/nm-netns.c | 4 + src/nm-pacrunner-manager.c | 15 +- src/nm-policy.c | 175 +- src/nm-session-monitor.c | 2 +- src/nm-test-utils-core.h | 32 +- src/nm-types.h | 16 +- src/org.freedesktop.NetworkManager.conf | 2 +- src/platform/nm-fake-platform.c | 1 + src/platform/nm-linux-platform.c | 779 ++- src/platform/nm-netlink.c | 1491 ---- src/platform/nm-netlink.h | 511 -- src/platform/nm-platform-utils.c | 3 - src/platform/nm-platform.c | 644 +- src/platform/nm-platform.h | 117 +- src/platform/nmp-netns.c | 4 +- src/platform/nmp-object.c | 94 +- src/platform/nmp-object.h | 31 +- src/platform/tests/meson.build | 37 - src/platform/tests/monitor.c | 3 +- src/platform/tests/test-address.c | 5 +- src/platform/tests/test-cleanup.c | 3 +- src/platform/tests/test-common.c | 116 +- src/platform/tests/test-common.h | 30 +- src/platform/tests/test-link.c | 135 +- src/platform/tests/test-nmp-object.c | 27 +- src/platform/tests/test-route.c | 3 +- src/platform/wifi/wifi-utils-nl80211.c | 372 +- src/platform/wifi/wifi-utils-private.h | 14 +- src/platform/wifi/wifi-utils-wext.c | 42 +- src/platform/wifi/wifi-utils.c | 61 +- src/platform/wifi/wifi-utils.h | 2 +- src/ppp/meson.build | 41 - src/ppp/nm-ppp-manager-call.c | 2 + src/ppp/nm-ppp-manager.c | 302 +- src/ppp/nm-ppp-manager.h | 1 - src/ppp/nm-pppd-plugin.c | 32 +- src/settings/nm-agent-manager.c | 160 +- src/settings/nm-agent-manager.h | 2 +- src/settings/nm-secret-agent.c | 140 +- src/settings/nm-settings-connection.c | 664 +- src/settings/nm-settings-connection.h | 61 +- src/settings/nm-settings.c | 769 +- src/settings/nm-settings.h | 10 + src/settings/plugins/ibft/meson.build | 48 - src/settings/plugins/ibft/tests/meson.build | 22 - src/settings/plugins/ibft/tests/test-ibft.c | 2 +- src/settings/plugins/ifcfg-rh/meson.build | 77 - src/settings/plugins/ifcfg-rh/nm-inotify-helper.c | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 134 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 162 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 66 +- src/settings/plugins/ifcfg-rh/shvar.c | 4 +- src/settings/plugins/ifcfg-rh/tests/meson.build | 22 - .../ifcfg-Test_Write_WiFi_Hidden.cexpected | 1 + .../ifcfg-Test_Write_Wired_Static_Routes.cexpected | 2 - .../ifcfg-rh/tests/network-scripts/ifcfg-test-tc | 16 - .../network-scripts/ifcfg-test-tc-write.cexpected | 16 - .../network-scripts/ifcfg-test-wired-ipv4-manual-1 | 2 - .../network-scripts/ifcfg-test-wired-ipv4-manual-2 | 2 - .../network-scripts/ifcfg-test-wired-ipv4-manual-3 | 2 - .../network-scripts/ifcfg-test-wired-ipv4-manual-4 | 2 - .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 195 +- .../plugins/ifnet/nms-ifnet-connection-parser.c | 2912 ++++++++ .../plugins/ifnet/nms-ifnet-connection-parser.h | 55 + src/settings/plugins/ifnet/nms-ifnet-connection.c | 233 + src/settings/plugins/ifnet/nms-ifnet-connection.h | 46 + src/settings/plugins/ifnet/nms-ifnet-net-parser.c | 734 ++ src/settings/plugins/ifnet/nms-ifnet-net-parser.h | 42 + src/settings/plugins/ifnet/nms-ifnet-net-utils.c | 830 +++ src/settings/plugins/ifnet/nms-ifnet-net-utils.h | 71 + src/settings/plugins/ifnet/nms-ifnet-plugin.c | 524 ++ src/settings/plugins/ifnet/nms-ifnet-plugin.h | 38 + src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c | 584 ++ src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h | 41 + src/settings/plugins/ifnet/tests/net | 158 + src/settings/plugins/ifnet/tests/net.all | 864 +++ .../plugins/ifnet/tests/nm-system-settings.conf | 5 + src/settings/plugins/ifnet/tests/test-ifnet.c | 396 ++ src/settings/plugins/ifnet/tests/test_ca_cert.pem | 27 + .../plugins/ifnet/tests/wpa_supplicant.conf | 70 + src/settings/plugins/ifupdown/meson.build | 53 - .../ifupdown/nms-ifupdown-interface-parser.c | 6 +- src/settings/plugins/ifupdown/tests/meson.build | 17 - .../plugins/ifupdown/tests/test-ifupdown.c | 2 +- src/settings/plugins/keyfile/nms-keyfile-plugin.c | 2 +- .../keyfile/tests/keyfiles/Test_Wired_Connection | 10 +- src/settings/plugins/keyfile/tests/meson.build | 21 - src/settings/plugins/keyfile/tests/test-keyfile.c | 88 +- src/settings/plugins/meson.build | 15 - src/supplicant/nm-supplicant-config.c | 71 +- src/supplicant/nm-supplicant-config.h | 3 +- src/supplicant/nm-supplicant-interface.c | 42 +- src/supplicant/nm-supplicant-interface.h | 8 +- src/supplicant/nm-supplicant-manager.c | 15 +- src/supplicant/nm-supplicant-settings-verify.c | 9 +- src/supplicant/nm-supplicant-types.h | 6 +- src/supplicant/tests/meson.build | 14 - src/supplicant/tests/test-supplicant-config.c | 196 +- src/systemd/meson.build | 70 - src/systemd/sd-adapt/device-nodes.h | 3 - src/systemd/sd-adapt/errno-list.h | 3 - src/systemd/sd-adapt/locale-util.h | 3 - src/systemd/sd-adapt/memfd-util.h | 3 - src/systemd/sd-adapt/nm-sd-adapt.h | 23 +- src/systemd/sd-adapt/procfs-util.h | 3 - src/systemd/sd-adapt/terminal-util.h | 3 - src/systemd/src/basic/alloc-util.c | 3 +- src/systemd/src/basic/alloc-util.h | 16 +- src/systemd/src/basic/async.h | 3 +- src/systemd/src/basic/escape.c | 1 - src/systemd/src/basic/escape.h | 1 - src/systemd/src/basic/ether-addr-util.c | 6 +- src/systemd/src/basic/ether-addr-util.h | 1 - src/systemd/src/basic/extract-word.c | 4 +- src/systemd/src/basic/extract-word.h | 1 - src/systemd/src/basic/fd-util.c | 403 +- src/systemd/src/basic/fd-util.h | 39 +- src/systemd/src/basic/fileio.c | 156 +- src/systemd/src/basic/fileio.h | 15 +- src/systemd/src/basic/fs-util.c | 471 +- src/systemd/src/basic/fs-util.h | 28 +- src/systemd/src/basic/hash-funcs.c | 57 - src/systemd/src/basic/hash-funcs.h | 24 +- src/systemd/src/basic/hashmap.c | 163 - src/systemd/src/basic/hashmap.h | 41 - src/systemd/src/basic/hexdecoct.c | 214 +- src/systemd/src/basic/hexdecoct.h | 1 - src/systemd/src/basic/hostname-util.c | 103 +- src/systemd/src/basic/hostname-util.h | 7 +- src/systemd/src/basic/in-addr-util.c | 3 - src/systemd/src/basic/in-addr-util.h | 1 - src/systemd/src/basic/io-util.c | 13 +- src/systemd/src/basic/io-util.h | 1 - src/systemd/src/basic/list.h | 4 - src/systemd/src/basic/log.h | 83 +- src/systemd/src/basic/macro.h | 57 +- src/systemd/src/basic/mempool.c | 1 - src/systemd/src/basic/mempool.h | 1 - src/systemd/src/basic/parse-util.c | 113 +- src/systemd/src/basic/parse-util.h | 21 +- src/systemd/src/basic/path-util.c | 85 +- src/systemd/src/basic/path-util.h | 15 +- src/systemd/src/basic/prioq.c | 3 +- src/systemd/src/basic/prioq.h | 1 - src/systemd/src/basic/process-util.c | 504 +- src/systemd/src/basic/process-util.h | 77 +- src/systemd/src/basic/random-util.c | 6 +- src/systemd/src/basic/random-util.h | 1 - src/systemd/src/basic/refcnt.h | 1 - src/systemd/src/basic/set.h | 13 - src/systemd/src/basic/signal-util.h | 18 +- src/systemd/src/basic/socket-util.c | 163 +- src/systemd/src/basic/socket-util.h | 19 +- src/systemd/src/basic/sparse-endian.h | 4 +- src/systemd/src/basic/stdio-util.h | 7 +- src/systemd/src/basic/string-table.c | 1 - src/systemd/src/basic/string-table.h | 10 +- src/systemd/src/basic/string-util.c | 152 +- src/systemd/src/basic/string-util.h | 25 +- src/systemd/src/basic/strv.c | 62 +- src/systemd/src/basic/strv.h | 18 +- src/systemd/src/basic/time-util.c | 31 +- src/systemd/src/basic/time-util.h | 7 +- src/systemd/src/basic/umask-util.h | 1 - src/systemd/src/basic/utf8.c | 20 - src/systemd/src/basic/utf8.h | 3 - src/systemd/src/basic/util.c | 382 +- src/systemd/src/basic/util.h | 25 +- src/systemd/src/libsystemd-network/arp-util.c | 11 +- src/systemd/src/libsystemd-network/arp-util.h | 1 - .../src/libsystemd-network/dhcp-identifier.c | 1 - .../src/libsystemd-network/dhcp-identifier.h | 1 - src/systemd/src/libsystemd-network/dhcp-internal.h | 1 - .../src/libsystemd-network/dhcp-lease-internal.h | 3 - src/systemd/src/libsystemd-network/dhcp-network.c | 16 +- src/systemd/src/libsystemd-network/dhcp-option.c | 11 +- src/systemd/src/libsystemd-network/dhcp-packet.c | 1 - src/systemd/src/libsystemd-network/dhcp-protocol.h | 1 - .../src/libsystemd-network/dhcp6-internal.h | 67 +- .../src/libsystemd-network/dhcp6-lease-internal.h | 3 - src/systemd/src/libsystemd-network/dhcp6-network.c | 5 +- src/systemd/src/libsystemd-network/dhcp6-option.c | 347 +- .../src/libsystemd-network/dhcp6-protocol.h | 8 - src/systemd/src/libsystemd-network/lldp-internal.h | 1 - src/systemd/src/libsystemd-network/lldp-neighbor.c | 1 - src/systemd/src/libsystemd-network/lldp-neighbor.h | 1 - src/systemd/src/libsystemd-network/lldp-network.c | 6 +- src/systemd/src/libsystemd-network/lldp-network.h | 1 - .../src/libsystemd-network/network-internal.c | 30 +- .../src/libsystemd-network/network-internal.h | 4 +- .../src/libsystemd-network/sd-dhcp-client.c | 60 +- src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 32 +- .../src/libsystemd-network/sd-dhcp6-client.c | 292 +- .../src/libsystemd-network/sd-dhcp6-lease.c | 48 +- src/systemd/src/libsystemd-network/sd-ipv4acd.c | 4 +- src/systemd/src/libsystemd-network/sd-ipv4ll.c | 2 - src/systemd/src/libsystemd-network/sd-lldp.c | 1 - src/systemd/src/libsystemd/sd-event/sd-event.c | 56 +- src/systemd/src/libsystemd/sd-id128/id128-util.c | 13 +- src/systemd/src/libsystemd/sd-id128/id128-util.h | 1 - src/systemd/src/libsystemd/sd-id128/sd-id128.c | 1 - src/systemd/src/shared/dns-domain.c | 32 +- src/systemd/src/shared/dns-domain.h | 2 - src/systemd/src/systemd/_sd-common.h | 1 - src/systemd/src/systemd/sd-dhcp-client.h | 6 - src/systemd/src/systemd/sd-dhcp-lease.h | 1 - src/systemd/src/systemd/sd-dhcp6-client.h | 11 - src/systemd/src/systemd/sd-dhcp6-lease.h | 6 - src/systemd/src/systemd/sd-event.h | 6 - src/systemd/src/systemd/sd-id128.h | 1 - src/systemd/src/systemd/sd-ipv4acd.h | 1 - src/systemd/src/systemd/sd-ipv4ll.h | 1 - src/systemd/src/systemd/sd-lldp.h | 1 - src/systemd/src/systemd/sd-ndisc.h | 1 - src/tests/config/meson.build | 26 - src/tests/config/nm-test-device.c | 2 +- src/tests/config/test-config.c | 39 +- src/tests/meson.build | 47 - src/tests/test-general-with-expect.c | 126 +- src/tests/test-general.c | 25 +- src/tests/test-ip6-config.c | 18 +- src/tests/test-resolvconf-capture.c | 298 + src/vpn/nm-vpn-connection.c | 95 +- src/vpn/nm-vpn-connection.h | 1 + tools/create-exports-NetworkManager.sh | 2 +- tools/debug-helper.py | 10 +- tools/run-nm-test.sh | 15 +- vapi/meson.build | 29 - 870 files changed, 188786 insertions(+), 186684 deletions(-) delete mode 100644 clients/cli/meson.build delete mode 100644 clients/common/meson.build create mode 100644 clients/common/settings-docs.c create mode 100644 clients/common/settings-docs.c.in delete mode 100644 clients/common/settings-docs.h delete mode 100644 clients/common/settings-docs.h.in delete mode 100644 clients/common/tests/meson.build delete mode 100644 clients/meson.build delete mode 100644 clients/tui/meson.build delete mode 100644 clients/tui/newt/meson.build delete mode 100644 config.h.meson delete mode 100644 data/90-nm-thunderbolt.rules delete mode 100644 data/meson.build delete mode 100644 dispatcher/meson.build delete mode 100644 dispatcher/tests/meson.build delete mode 100644 docs/api/html/dbus-vpn-plugin.html delete mode 100644 docs/api/meson.build delete mode 100644 docs/libnm-glib/meson.build delete mode 100644 docs/libnm-util/meson.build delete mode 100644 docs/libnm/meson.build delete mode 100644 docs/meson.build delete mode 100644 examples/C/glib/meson.build delete mode 100644 examples/C/qt/meson.build delete mode 100755 examples/js/get_ips.js delete mode 100644 examples/python/nmex.py delete mode 100644 introspection/meson.build delete mode 100644 libnm-core/meson.build delete mode 100644 libnm-core/nm-core-enum-types.c.template delete mode 100644 libnm-core/nm-core-enum-types.h.template create mode 100644 libnm-core/nm-keyfile-reader.c create mode 100644 libnm-core/nm-keyfile-writer.c delete mode 100644 libnm-core/nm-keyfile.c delete mode 100644 libnm-core/tests/meson.build delete mode 100644 libnm-core/tests/nm-core-tests-enum-types.c.template delete mode 100644 libnm-core/tests/nm-core-tests-enum-types.h.template delete mode 100644 libnm-glib/meson.build delete mode 100644 libnm-glib/nm-glib-enum-types.c.template delete mode 100644 libnm-glib/nm-glib-enum-types.h.template delete mode 100644 libnm-glib/nm-vpn-enum-types.c.template delete mode 100644 libnm-glib/nm-vpn-enum-types.h.template delete mode 100644 libnm-glib/tests/meson.build delete mode 100644 libnm-util/meson.build delete mode 100644 libnm-util/nm-utils-enum-types.c.template delete mode 100644 libnm-util/nm-utils-enum-types.h.template delete mode 100644 libnm-util/tests/meson.build delete mode 100644 libnm/fake-typelib/NMClient.gir delete mode 100644 libnm/fake-typelib/NetworkManager.gir delete mode 100644 libnm/fake-typelib/meson.build delete mode 100644 libnm/fake-typelib/typelibs.gresource.xml delete mode 100644 libnm/meson.build delete mode 100644 libnm/nm-autoptr.h delete mode 100644 libnm/nm-checkpoint.c delete mode 100644 libnm/nm-checkpoint.h delete mode 100644 libnm/nm-enum-types.c.template delete mode 100644 libnm/nm-enum-types.h.template delete mode 100644 libnm/tests/meson.build delete mode 100644 man/meson.build delete mode 100644 meson.build delete mode 100644 meson_options.txt delete mode 100644 meson_post_install.py delete mode 100644 po/meson.build delete mode 100644 shared/c-list/src/c-list.h delete mode 100644 shared/c-siphash/src/c-siphash.c delete mode 100644 shared/c-siphash/src/c-siphash.h delete mode 100644 shared/meson.build delete mode 100644 shared/n-acd/src/n-acd.c delete mode 100644 shared/n-acd/src/n-acd.h create mode 100644 shared/nm-utils/c-list.h delete mode 100644 shared/nm-utils/nm-c-list.h delete mode 100644 shared/nm-utils/nm-compat.c delete mode 100644 shared/nm-utils/nm-compat.h delete mode 100644 shared/nm-utils/nm-jansson.h delete mode 100644 src/devices/adsl/meson.build delete mode 100644 src/devices/bluetooth/meson.build delete mode 100644 src/devices/meson.build delete mode 100644 src/devices/nm-acd-manager.c delete mode 100644 src/devices/nm-acd-manager.h create mode 100644 src/devices/nm-arping-manager.c create mode 100644 src/devices/nm-arping-manager.h delete mode 100644 src/devices/ovs/meson.build delete mode 100644 src/devices/team/meson.build delete mode 100644 src/devices/tests/meson.build delete mode 100644 src/devices/tests/test-acd.c create mode 100644 src/devices/tests/test-arping.c delete mode 100644 src/devices/wifi/meson.build delete mode 100644 src/devices/wifi/nm-device-iwd.c delete mode 100644 src/devices/wifi/nm-device-iwd.h delete mode 100644 src/devices/wifi/nm-iwd-manager.c delete mode 100644 src/devices/wifi/nm-iwd-manager.h delete mode 100644 src/devices/wifi/nm-wifi-common.c delete mode 100644 src/devices/wifi/nm-wifi-common.h delete mode 100644 src/devices/wifi/tests/meson.build delete mode 100644 src/devices/wwan/meson.build delete mode 100644 src/dhcp/meson.build create mode 100644 src/dhcp/tests/leases/basic.leases create mode 100644 src/dhcp/tests/leases/malformed1.leases create mode 100644 src/dhcp/tests/leases/malformed2.leases create mode 100644 src/dhcp/tests/leases/malformed3.leases delete mode 100644 src/dhcp/tests/meson.build delete mode 100644 src/dnsmasq/tests/meson.build delete mode 100644 src/meson.build delete mode 100644 src/ndisc/tests/meson.build create mode 100644 src/nm-bus-manager.c create mode 100644 src/nm-bus-manager.h delete mode 100644 src/nm-dbus-manager.c delete mode 100644 src/nm-dbus-manager.h delete mode 100644 src/nm-dbus-object.c delete mode 100644 src/nm-dbus-object.h delete mode 100644 src/nm-dbus-utils.c delete mode 100644 src/nm-dbus-utils.h create mode 100644 src/nm-exported-object.c create mode 100644 src/nm-exported-object.h delete mode 100644 src/platform/nm-netlink.c delete mode 100644 src/platform/nm-netlink.h delete mode 100644 src/platform/tests/meson.build delete mode 100644 src/ppp/meson.build delete mode 100644 src/settings/plugins/ibft/meson.build delete mode 100644 src/settings/plugins/ibft/tests/meson.build delete mode 100644 src/settings/plugins/ifcfg-rh/meson.build delete mode 100644 src/settings/plugins/ifcfg-rh/tests/meson.build delete mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc delete mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected create mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection-parser.c create mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection-parser.h create mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection.c create mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection.h create mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-parser.c create mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-parser.h create mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-utils.c create mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-utils.h create mode 100644 src/settings/plugins/ifnet/nms-ifnet-plugin.c create mode 100644 src/settings/plugins/ifnet/nms-ifnet-plugin.h create mode 100644 src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c create mode 100644 src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h create mode 100644 src/settings/plugins/ifnet/tests/net create mode 100644 src/settings/plugins/ifnet/tests/net.all create mode 100644 src/settings/plugins/ifnet/tests/nm-system-settings.conf create mode 100644 src/settings/plugins/ifnet/tests/test-ifnet.c create mode 100644 src/settings/plugins/ifnet/tests/test_ca_cert.pem create mode 100644 src/settings/plugins/ifnet/tests/wpa_supplicant.conf delete mode 100644 src/settings/plugins/ifupdown/meson.build delete mode 100644 src/settings/plugins/ifupdown/tests/meson.build delete mode 100644 src/settings/plugins/keyfile/tests/meson.build delete mode 100644 src/settings/plugins/meson.build delete mode 100644 src/supplicant/tests/meson.build delete mode 100644 src/systemd/meson.build delete mode 100644 src/systemd/sd-adapt/device-nodes.h delete mode 100644 src/systemd/sd-adapt/errno-list.h delete mode 100644 src/systemd/sd-adapt/locale-util.h delete mode 100644 src/systemd/sd-adapt/memfd-util.h delete mode 100644 src/systemd/sd-adapt/procfs-util.h delete mode 100644 src/systemd/sd-adapt/terminal-util.h delete mode 100644 src/tests/config/meson.build delete mode 100644 src/tests/meson.build create mode 100644 src/tests/test-resolvconf-capture.c delete mode 100644 vapi/meson.build diff --git a/Makefile.am b/Makefile.am index b5756166..639921d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = # Pass SANITIZER_ENV where a command that uses built libraries is # executed, to suppress possible errors -INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) LDFLAGS="$(SANITIZER_LIB_LDFLAGS)" +INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) libnmincludedir = $(includedir)/libnm libnminclude_HEADERS = @@ -104,13 +104,12 @@ endif set_sanitizer_env = \ [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ - if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \ - [ -n "$(1)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ - [ -n "$(2)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(2) | grep libasan\.so\.. -o | head -n 1)"; \ + if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \ + export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ fi check_so_symbols = \ - $(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \ + $(call set_sanitizer_env,$(1)); \ LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null ############################################################################### @@ -124,6 +123,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ + --enable-ifnet \ --disable-dependency-tracking dist-configure-check: @@ -164,7 +164,14 @@ DISTCLEANFILES += $(polkit_policy_DATA) noinst_LTLIBRARIES += \ introspection/libnmdbus.la -introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS) +# gdbus-codegen 2.38 will emit code that requires glib 2.38, which +# will then cause availability warnings if we define +# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32. +# +# This is fixed in GLib 2.40 (it emits code that takes +# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go +# away when we depend on that. +introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) introspection_sources = \ introspection/org.freedesktop.NetworkManager.AccessPoint.c \ @@ -366,10 +373,11 @@ CLEANFILES += $(DBUS_INTERFACE_DOCS) $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources) $(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources) $(libnm_libnm_la_OBJECTS): $(introspection_sources) +$(src_libNetworkManager_la_OBJECTS): $(introspection_sources) +$(src_libNetworkManagerBase_la_OBJECTS): $(introspection_sources) EXTRA_DIST += \ - $(dbusinterfaces_DATA) \ - introspection/meson.build + $(dbusinterfaces_DATA) ############################################################################### @@ -447,7 +455,24 @@ libnm_core_lib_h_priv = \ libnm-core/nm-property-compare.h \ libnm-core/nm-setting-private.h \ libnm-core/nm-utils-private.h -libnm_core_lib_c_settings_real = \ +libnm_core_lib_c_real = \ + shared/nm-utils/c-list-util.c \ + shared/nm-utils/nm-dedup-multi.c \ + shared/nm-utils/nm-enum-utils.c \ + shared/nm-utils/nm-hash-utils.c \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-random-utils.c \ + shared/nm-utils/nm-udev-utils.c \ + shared/nm-utils/siphash24.c \ + shared/nm-meta-setting.c \ + libnm-core/crypto.c \ + libnm-core/nm-connection.c \ + libnm-core/nm-dbus-utils.c \ + libnm-core/nm-errors.c \ + libnm-core/nm-keyfile-reader.c \ + libnm-core/nm-keyfile-utils.c \ + libnm-core/nm-keyfile-writer.c \ + libnm-core/nm-property-compare.c \ libnm-core/nm-setting-8021x.c \ libnm-core/nm-setting-adsl.c \ libnm-core/nm-setting-bluetooth.c \ @@ -487,31 +512,14 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-wimax.c \ libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c -libnm_core_lib_c_real = \ - $(libnm_core_lib_c_settings_real) \ - shared/nm-utils/c-list-util.c \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-udev-utils.c \ - shared/nm-meta-setting.c \ - libnm-core/crypto.c \ - libnm-core/nm-connection.c \ - libnm-core/nm-dbus-utils.c \ - libnm-core/nm-errors.c \ - libnm-core/nm-keyfile.c \ - libnm-core/nm-keyfile-utils.c \ - libnm-core/nm-property-compare.c \ + libnm-core/nm-setting-wireless.c \ libnm-core/nm-setting.c \ libnm-core/nm-simple-connection.c \ libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ libnm-core/nm-vpn-plugin-info.c -if WITH_JSON_VALIDATION +if WITH_JANSSON libnm_core_lib_h_priv += \ libnm-core/nm-json.h libnm_core_lib_c_real += \ @@ -536,8 +544,11 @@ dflt_cppflags_libnm_core = \ -I$(builddir)/libnm-core \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ - $(LIBUDEV_CFLAGS) \ - $(SANITIZER_LIB_CFLAGS) + $(LIBUDEV_CFLAGS) + +if WITH_JANSSON +dflt_cppflags_libnm_core += $(JANSSON_CFLAGS) +endif if WITH_GNUTLS dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS) @@ -574,17 +585,12 @@ $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(li libnm_core_libnm_core_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ -DNMPLUGINDIR=\"$(pkglibdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ - $(NULL) - -if WITH_JSON_VALIDATION -libnm_core_libnm_core_la_CPPFLAGS += $(JANSSON_CFLAGS) -endif + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_h_pub_real) \ @@ -601,8 +607,7 @@ libnm_core_libnm_core_la_LIBADD = \ $(LIBUDEV_LIBS) libnm_core_libnm_core_la_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_LIB_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) if WITH_GNUTLS libnm_core_lib_c_real += libnm-core/crypto_gnutls.c @@ -616,10 +621,7 @@ endif EXTRA_DIST += \ libnm-core/crypto_gnutls.c \ - libnm-core/crypto_nss.c \ - libnm-core/nm-core-enum-types.c.template \ - libnm-core/nm-core-enum-types.h.template \ - libnm-core/meson.build + libnm-core/crypto_nss.c libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl @$(MKDIR_P) libnm-core/ @@ -662,8 +664,6 @@ libnm_core_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) @@ -686,9 +686,6 @@ libnm_core_tests_ldadd = \ libnm-core/libnm-core.la \ $(GLIB_LIBS) -libnm_core_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) - libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd) @@ -697,14 +694,6 @@ libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_compare_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_crypto_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_general_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_keyfile_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_secrets_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_setting_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags) - $(libnm_core_tests_test_compare_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_core_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_core_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -716,11 +705,11 @@ $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenu # test-cert.p12 created with: # # openssl pkcs12 -export \ -# -in test_key_and_cert.pem \ -# -inkey test_key_and_cert.pem \ -# -certfile test_ca_cert.pem \ -# -name "test-pkcs12" \ -# -out test-cert.p12 +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 EXTRA_DIST += \ libnm-core/tests/certs/ca-no-ending-newline.pem \ @@ -739,10 +728,7 @@ EXTRA_DIST += \ libnm-core/tests/certs/test-key-and-cert.pem \ libnm-core/tests/certs/test-key-only-decrypted.der \ libnm-core/tests/certs/test-key-only-decrypted.pem \ - libnm-core/tests/certs/test-key-only.pem \ - libnm-core/tests/nm-core-tests-enum-types.c.template \ - libnm-core/tests/nm-core-tests-enum-types.h.template \ - libnm-core/tests/meson.build + libnm-core/tests/certs/test-key-only.pem ############################################################################### @@ -751,8 +737,6 @@ libnm_lib_h_pub_real = \ libnm/NetworkManager.h \ libnm/nm-access-point.h \ libnm/nm-active-connection.h \ - libnm/nm-autoptr.h \ - libnm/nm-checkpoint.h \ libnm/nm-client.h \ libnm/nm-device-adsl.h \ libnm/nm-device-bond.h \ @@ -782,13 +766,14 @@ libnm_lib_h_pub_real = \ libnm/nm-ip-config.h \ libnm/nm-object.h \ libnm/nm-remote-connection.h \ - libnm/nm-secret-agent-old.h \ libnm/nm-types.h \ libnm/nm-vpn-connection.h \ libnm/nm-vpn-editor.h \ - libnm/nm-vpn-plugin-old.h \ - libnm/nm-vpn-service-plugin.h \ libnm/nm-wimax-nsp.h +libnm_lib_h_pub_nointrospect = \ + libnm/nm-secret-agent-old.h \ + libnm/nm-vpn-plugin-old.h \ + libnm/nm-vpn-service-plugin.h libnm_lib_h_pub_mkenums = \ libnm/nm-enum-types.h libnm_lib_h_priv = \ @@ -807,7 +792,6 @@ libnm_lib_h_priv = \ libnm_lib_c_real = \ libnm/nm-access-point.c \ libnm/nm-active-connection.c \ - libnm/nm-checkpoint.c \ libnm/nm-client.c \ libnm/nm-dbus-helpers.c \ libnm/nm-device-adsl.c \ @@ -859,11 +843,12 @@ libnm_lib_cppflags = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNMRUNDIR=\"$(nmrundir)\" libnminclude_HEADERS += \ - $(libnm_lib_h_pub_real) + $(libnm_lib_h_pub_real) \ + $(libnm_lib_h_pub_nointrospect) nodist_libnminclude_HEADERS += \ $(libnm_lib_h_pub_mkenums) @@ -873,7 +858,6 @@ nodist_libnminclude_HEADERS += \ noinst_LTLIBRARIES += libnm/libnm-utils.la libnm_libnm_utils_la_CPPFLAGS = \ - $(INTROSPECTION_CFLAGS) \ $(libnm_lib_cppflags) libnm_libnm_utils_la_SOURCES = \ @@ -895,7 +879,8 @@ GLIB_GENERATED += \ $(libnm_lib_c_mkenums) nm_enum_types_sources = \ $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_h_pub_real) + $(libnm_lib_h_pub_real) \ + $(libnm_lib_h_pub_nointrospect) nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' @@ -906,11 +891,11 @@ $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_m libnm_libnm_la_CPPFLAGS = \ $(libnm_lib_cppflags) \ - $(LIBUDEV_CFLAGS) \ - $(SANITIZER_LIB_CFLAGS) + $(LIBUDEV_CFLAGS) libnm_libnm_la_SOURCES = \ $(libnm_lib_h_pub_real) \ + $(libnm_lib_h_pub_nointrospect) \ $(libnm_lib_h_priv) \ $(libnm_lib_c_real) @@ -931,7 +916,6 @@ libnm_libnm_la_LIBADD = \ libnm_libnm_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_LIB_LDFLAGS) \ -version-info "1:0:1" check-local-exports-libnm: libnm/libnm.la @@ -963,6 +947,7 @@ libnm_NM_1_0_gir_FILES = \ $(libnm_core_lib_c_real) \ $(libnm_lib_h_pub_mkenums) \ $(libnm_lib_h_pub_real) \ + $(libnm_lib_h_pub_nointrospect) \ $(libnm_lib_c_mkenums) \ $(libnm_lib_c_real) libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm @@ -971,35 +956,8 @@ libnm/libnm.typelib: libnm/libnm.gir $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ INTROSPECTION_GIRS += libnm/NM-1.0.gir - -if WITH_FAKE_TYPELIBS - -libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp - $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ - -libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp - $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ - -libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/libnm/fake-typelib --generate-source --manual-register - -nodist_libnm_libnm_utils_la_SOURCES = \ - libnm/fake-typelib/typelibs.c - -CLEANFILES += \ - libnm/fake-typelib/typelibs.c \ - libnm/fake-typelib/NMClient.typelib \ - libnm/fake-typelib/NetworkManager.typelib endif -endif - -EXTRA_DIST += \ - libnm/fake-typelib/NetworkManager.gir \ - libnm/fake-typelib/NMClient.gir \ - libnm/fake-typelib/typelibs.gresource.xml \ - libnm/fake-typelib/meson.build - if HAVE_INTROSPECTION libnm_noinst_data = \ @@ -1011,10 +969,10 @@ libnm_noinst_data = \ noinst_DATA += $(libnm_noinst_data) -libnm_docs_sources = $(libnm_core_lib_c_settings_real) +libnm_docs_sources = $(libnm_core_lib_c_real) libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) - $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $@ $(filter-out $<,$^) + $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus "$(srcdir)" $@ # When the python scripts loads libnm and the address sanitizers is # enabled, we must LD_PRELOAD libasan otherwise it will complain that @@ -1041,9 +999,9 @@ libnm/nm-settings-docs.xml: libnm/generate-setting-docs.py libnm/nm-settings-doc --output $@ libnm/nm-settings-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) - $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile $@ $(filter-out $<,$^) + $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile "$(srcdir)" $@ libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) - $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $@ $(filter-out $<,$^) + $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(srcdir)" $@ EXTRA_DIST += $(libnm_noinst_data) @@ -1051,10 +1009,7 @@ endif EXTRA_DIST += \ libnm/generate-setting-docs.py \ - libnm/generate-plugin-docs.pl \ - libnm/nm-enum-types.c.template \ - libnm/nm-enum-types.h.template \ - libnm/meson.build + libnm/generate-plugin-docs.pl ############################################################################### @@ -1070,24 +1025,19 @@ libnm_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" libnm_tests_ldadd = \ libnm/libnm.la \ $(GLIB_LIBS) -libnm_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) - libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_general_SOURCES = \ - shared/nm-utils/nm-compat.c \ libnm/tests/test-general.c libnm_tests_test_nm_client_SOURCES = \ @@ -1112,11 +1062,6 @@ libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd) -libnm_tests_test_general_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags) - $(libnm_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1139,17 +1084,11 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - $(GLIB_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + $(GLIB_CFLAGS) libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ $(GLIB_LIBS) -EXTRA_DIST += \ - libnm/tests/meson.build - ############################################################################### # src/ ############################################################################### @@ -1160,7 +1099,8 @@ src_cppflags = \ -I$(builddir)/src \ \ -DPREFIX=\"$(prefix)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ @@ -1183,6 +1123,7 @@ src_cppflags = \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ \ $(LIBUDEV_CFLAGS) \ + $(LIBNL_CFLAGS) \ $(LIBNDP_CFLAGS) \ $(LIBPSL_CFLAGS) \ $(LIBCURL_CFLAGS) \ @@ -1190,7 +1131,6 @@ src_cppflags = \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ \ $(NULL) @@ -1209,28 +1149,6 @@ noinst_LTLIBRARIES += \ ############################################################################### -shared_libcsiphash_la_CPPFLAGS = $(src_cppflags) -shared_libcsiphash_la_SOURCES = \ - shared/c-siphash/src/c-siphash.c \ - shared/c-siphash/src/c-siphash.h - -shared_libnacd_la_CFLAGS = -std=gnu99 -shared_libnacd_la_CPPFLAGS = \ - $(src_cppflags) \ - -I $(srcdir)/shared/c-list/src \ - -I $(srcdir)/shared/c-siphash/src -shared_libnacd_la_SOURCES = \ - shared/n-acd/src/n-acd.c \ - shared/n-acd/src/n-acd.h - -noinst_LTLIBRARIES += \ - shared/libcsiphash.la \ - shared/libnacd.la - -EXTRA_DIST += shared/c-list/src/c-list.h - -############################################################################### - src_libsystemd_nm_la_cppflags = \ -I$(srcdir)/shared \ -I$(builddir)/shared \ @@ -1244,7 +1162,6 @@ src_libsystemd_nm_la_cppflags = \ -I$(srcdir)/src/systemd/src/shared \ -I$(srcdir)/src/systemd/src/libsystemd-network \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ - $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) @@ -1264,29 +1181,23 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/sd-adapt/condition.h \ src/systemd/sd-adapt/conf-parser.h \ src/systemd/sd-adapt/def.h \ - src/systemd/sd-adapt/device-nodes.h \ src/systemd/sd-adapt/dirent-util.h \ src/systemd/sd-adapt/env-util.h \ - src/systemd/sd-adapt/errno-list.h \ src/systemd/sd-adapt/format-util.h \ - src/systemd/sd-adapt/glob-util.h \ src/systemd/sd-adapt/gunicode.h \ src/systemd/sd-adapt/ioprio.h \ src/systemd/sd-adapt/khash.h \ src/systemd/sd-adapt/libudev.h \ - src/systemd/sd-adapt/locale-util.h \ - src/systemd/sd-adapt/memfd-util.h \ src/systemd/sd-adapt/missing.h \ src/systemd/sd-adapt/mkdir.h \ - src/systemd/sd-adapt/procfs-util.h \ src/systemd/sd-adapt/raw-clone.h \ src/systemd/sd-adapt/sd-daemon.h \ src/systemd/sd-adapt/stat-util.h \ - src/systemd/sd-adapt/terminal-util.h \ src/systemd/sd-adapt/udev-util.h \ src/systemd/sd-adapt/udev.h \ src/systemd/sd-adapt/user-util.h \ src/systemd/sd-adapt/virt.h \ + src/systemd/sd-adapt/glob-util.h \ src/systemd/src/basic/alloc-util.c \ src/systemd/src/basic/alloc-util.h \ src/systemd/src/basic/async.h \ @@ -1400,9 +1311,6 @@ src_libsystemd_nm_la_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) src_libsystemd_nm_la_LIBADD = $(src_libsystemd_nm_la_libadd) $(src_libsystemd_nm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -EXTRA_DIST += \ - src/systemd/meson.build - ############################################################################### src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags) @@ -1417,9 +1325,6 @@ src_libNetworkManagerBase_la_SOURCES = \ src/NetworkManagerUtils.c \ src/NetworkManagerUtils.h \ \ - src/platform/nm-netlink.c \ - src/platform/nm-netlink.h \ - \ src/platform/nmp-netns.c \ src/platform/nmp-netns.h \ src/platform/nmp-object.c \ @@ -1443,10 +1348,8 @@ src_libNetworkManagerBase_la_SOURCES = \ src/ndisc/nm-ndisc.h \ src/ndisc/nm-ndisc-private.h \ \ - src/nm-dbus-utils.c \ - src/nm-dbus-utils.h \ - src/nm-dbus-object.c \ - src/nm-dbus-object.h \ + src/nm-exported-object.c \ + src/nm-exported-object.h \ src/nm-ip4-config.c \ src/nm-ip4-config.h \ src/nm-ip6-config.c \ @@ -1474,6 +1377,7 @@ endif src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ + introspection/libnmdbus.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -1487,17 +1391,17 @@ src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) src_libNetworkManager_la_SOURCES = \ \ - src/nm-checkpoint.c \ - src/nm-checkpoint.h \ src/nm-checkpoint-manager.c \ src/nm-checkpoint-manager.h \ + src/nm-checkpoint.c \ + src/nm-checkpoint.h \ \ src/devices/nm-device.c \ src/devices/nm-device.h \ src/devices/nm-lldp-listener.c \ src/devices/nm-lldp-listener.h \ - src/devices/nm-acd-manager.c \ - src/devices/nm-acd-manager.h \ + src/devices/nm-arping-manager.c \ + src/devices/nm-arping-manager.h \ src/devices/nm-device-ethernet-utils.c \ src/devices/nm-device-ethernet-utils.h \ src/devices/nm-device-factory.c \ @@ -1543,16 +1447,16 @@ src_libNetworkManager_la_SOURCES = \ src/dhcp/nm-dhcp-dhclient-utils.c \ src/dhcp/nm-dhcp-dhclient-utils.h \ \ - src/dns/nm-dns-manager.c \ - src/dns/nm-dns-manager.h \ - src/dns/nm-dns-plugin.c \ - src/dns/nm-dns-plugin.h \ src/dns/nm-dns-dnsmasq.c \ src/dns/nm-dns-dnsmasq.h \ src/dns/nm-dns-systemd-resolved.c \ src/dns/nm-dns-systemd-resolved.h \ src/dns/nm-dns-unbound.c \ src/dns/nm-dns-unbound.h \ + src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h \ + src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h \ \ src/dnsmasq/nm-dnsmasq-manager.c \ src/dnsmasq/nm-dnsmasq-manager.h \ @@ -1610,13 +1514,12 @@ src_libNetworkManager_la_SOURCES = \ src/nm-active-connection.h \ src/nm-audit-manager.c \ src/nm-audit-manager.h \ - src/nm-dbus-manager.c \ - src/nm-dbus-manager.h \ + src/nm-bus-manager.c \ + src/nm-bus-manager.h \ src/nm-config.c \ src/nm-config.h \ src/nm-config-data.c \ src/nm-config-data.h \ - src/nm-connectivity.c \ src/nm-connectivity.h \ src/nm-dcb.c \ src/nm-dcb.h \ @@ -1654,13 +1557,17 @@ src_libNetworkManager_la_SOURCES = \ \ $(NULL) +if WITH_CONCHECK +src_libNetworkManager_la_SOURCES += \ + src/nm-connectivity.c +endif + src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ - shared/libcsiphash.la \ - shared/libnacd.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) \ @@ -1676,9 +1583,7 @@ $(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) check_ltlibraries += src/libNetworkManagerTest.la src_tests_cppflags = \ - $(src_cppflags) \ - $(SANITIZER_EXEC_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION_TEST + $(src_cppflags) if REQUIRE_ROOT_TESTS src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1 @@ -1701,7 +1606,8 @@ src_libNetworkManagerTest_la_LIBADD = \ src/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1725,8 +1631,7 @@ src_NetworkManager_LDADD = \ src_NetworkManager_LDFLAGS = \ -rdynamic \ - -Wl,--version-script="src/NetworkManager.ver" \ - $(SANITIZER_EXEC_LDFLAGS) + -Wl,--version-script="src/NetworkManager.ver" $(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1742,12 +1647,12 @@ src_nm_iface_helper_LDADD = \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) src_nm_iface_helper_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ - $(SANITIZER_EXEC_LDFLAGS) + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" $(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1755,8 +1660,7 @@ $(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ src/org.freedesktop.NetworkManager.conf \ - src/nm-test-utils-core.h \ - src/meson.build + src/nm-test-utils-core.h ############################################################################### # src/dhcp @@ -1768,8 +1672,9 @@ src_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ -DNMRUNDIR=\"$(nmrundir)\" src_dhcp_nm_dhcp_helper_SOURCES = \ @@ -1782,9 +1687,6 @@ src_dhcp_nm_dhcp_helper_LDFLAGS = \ src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS) -EXTRA_DIST += \ - src/dhcp/meson.build - ############################################################################### # src/dhcp/tests ############################################################################### @@ -1806,16 +1708,16 @@ src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags) src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd) src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) -src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags) -src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags) - $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ src/dhcp/tests/test-dhclient-duid.leases \ src/dhcp/tests/test-dhclient-commented-duid.leases \ - src/dhcp/tests/meson.build + src/dhcp/tests/leases/basic.leases \ + src/dhcp/tests/leases/malformed1.leases \ + src/dhcp/tests/leases/malformed2.leases \ + src/dhcp/tests/leases/malformed3.leases ############################################################################### # src/ppp @@ -1831,8 +1733,10 @@ src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ + -I$(srcdir)/src \ + -I$(builddir)/libnm-core \ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) src_ppp_nm_pppd_plugin_la_SOURCES = \ @@ -1867,7 +1771,8 @@ src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ @@ -1875,15 +1780,13 @@ src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" src_ppp_libnm_ppp_plugin_la_LIBADD = \ + introspection/libnmdbus.la \ $(GLIB_LIBS) $(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif -EXTRA_DIST += \ - src/ppp/meson.build - ############################################################################### # src/settings/plugins/keyfile/tests ############################################################################### @@ -1897,8 +1800,7 @@ src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ src/libNetworkManagerTest.la @@ -1943,9 +1845,7 @@ EXTRA_DIST += \ src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \ \ src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ - src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ - \ - src/settings/plugins/keyfile/tests/meson.build + src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem ############################################################################### # src/settings/plugins/ibft @@ -1963,8 +1863,9 @@ src_settings_plugins_ibft_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" @@ -2003,15 +1904,14 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\" src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_settings_plugins_ibft_tests_test_ibft_LDADD = \ src/settings/plugins/ibft/libnms-ibft-core.la \ @@ -2037,10 +1937,6 @@ check_local += check-local-symbols-settings-ibft endif -EXTRA_DIST += \ - src/settings/plugins/ibft/meson.build \ - src/settings/plugins/ibft/tests/meson.build - ############################################################################### # src/settings/plugins/ifcfg-rh ############################################################################### @@ -2060,10 +1956,10 @@ src_settings_plugins_ifcfg_rh_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ $(NSS_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" @@ -2119,11 +2015,11 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ -module -avoid-version \ - -Wl,--version-script="$(srcdir)/linker-script-settings.ver" \ - $(SANITIZER_EXEC_LDFLAGS) + -Wl,--version-script="$(srcdir)/linker-script-settings.ver" src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ - src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la + src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ + src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -2149,8 +2045,7 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ @@ -2223,8 +2118,6 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \ @@ -2382,9 +2275,7 @@ endif EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ - src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \ - src/settings/plugins/ifcfg-rh/meson.build \ - src/settings/plugins/ifcfg-rh/tests/meson.build + src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml ############################################################################### # src/settings/plugins/ifupdown @@ -2402,7 +2293,8 @@ src_settings_plugins_ifupdown_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" @@ -2452,15 +2344,14 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ -DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\" src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ $(GLIB_LDFLAGS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ @@ -2493,16 +2384,97 @@ EXTRA_DIST += \ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \ src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \ - src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \ - src/settings/plugins/ifupdown/meson.build \ - src/settings/plugins/ifupdown/tests/meson.build + src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d ############################################################################### -# src/devices +# src/settings/plugins/ifnet +############################################################################### + +if CONFIG_PLUGIN_IFNET + +core_plugins += src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la + +noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la + +src_settings_plugins_ifnet_cppflags = \ + -I$(srcdir)/src \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DSBINDIR=\"$(sbindir)\" + +src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \ + src/settings/plugins/ifnet/nms-ifnet-net-parser.c\ + src/settings/plugins/ifnet/nms-ifnet-net-parser.h\ + src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \ + src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \ + src/settings/plugins/ifnet/nms-ifnet-net-utils.h\ + src/settings/plugins/ifnet/nms-ifnet-net-utils.c\ + src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h\ + src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c + +src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES = \ + src/settings/plugins/ifnet/nms-ifnet-connection.c \ + src/settings/plugins/ifnet/nms-ifnet-connection.h \ + src/settings/plugins/ifnet/nms-ifnet-plugin.c \ + src/settings/plugins/ifnet/nms-ifnet-plugin.h + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(srcdir)/linker-script-settings.ver" + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD = \ + src/settings/plugins/ifnet/libnms-ifnet-core.la + +check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la + $(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so) + +check_local += check-local-symbols-settings-ifnet + ############################################################################### +check_programs += src/settings/plugins/ifnet/tests/test-ifnet + +src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + -I$(srcdir)/src \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + -DTEST_IFNET_DIR=\"$(abs_srcdir)/src/settings/plugins/ifnet/tests\" \ + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifnet/tests/\" \ + -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/src/settings/plugins/ifnet/tests/wpa_supplicant.conf"' \ + -DSYSCONFDIR=\"nonexistent\" + +src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \ + $(GLIB_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) + +src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \ + src/settings/plugins/ifnet/libnms-ifnet-core.la \ + src/libNetworkManagerTest.la + +endif + EXTRA_DIST += \ - src/devices/meson.build + src/settings/plugins/ifnet/tests/net \ + src/settings/plugins/ifnet/tests/net.all \ + src/settings/plugins/ifnet/tests/nm-system-settings.conf \ + src/settings/plugins/ifnet/tests/wpa_supplicant.conf \ + src/settings/plugins/ifnet/tests/test_ca_cert.pem ############################################################################### # src/devices/adsl @@ -2522,7 +2494,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) @@ -2531,6 +2504,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ + introspection/libnmdbus.la \ $(LIBUDEV_LIBS) check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la @@ -2539,9 +2513,6 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la check_local += check-local-devices-adsl -EXTRA_DIST += \ - src/devices/adsl/meson.build - ############################################################################### # src/devices/wwan ############################################################################### @@ -2555,7 +2526,8 @@ src_devices_wwan_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ $(LIBSYSTEMD_CFLAGS) \ $(MM_GLIB_CFLAGS) @@ -2606,6 +2578,7 @@ src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \ + introspection/libnmdbus.la \ src/devices/wwan/libnm-wwan.la \ $(GLIB_LIBS) @@ -2620,8 +2593,7 @@ check_local += check-local-devices-wwan endif EXTRA_DIST += \ - src/devices/wwan/libnm-wwan.ver \ - src/devices/wwan/meson.build + src/devices/wwan/libnm-wwan.ver ############################################################################### # src/devices/bluetooth @@ -2655,7 +2627,8 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ @@ -2663,6 +2636,7 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ + introspection/libnmdbus.la \ src/devices/wwan/libnm-wwan.la \ $(GLIB_LIBS) @@ -2684,9 +2658,6 @@ check_local += check-local-devices-bluetooth endif -EXTRA_DIST += \ - src/devices/bluetooth/meson.build - ############################################################################### # src/devices/wifi ############################################################################### @@ -2703,19 +2674,9 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ src/devices/wifi/nm-wifi-ap.h \ src/devices/wifi/nm-wifi-utils.c \ src/devices/wifi/nm-wifi-utils.h \ - src/devices/wifi/nm-wifi-common.c \ - src/devices/wifi/nm-wifi-common.h \ src/devices/wifi/nm-device-olpc-mesh.c \ src/devices/wifi/nm-device-olpc-mesh.h -if WITH_IWD -src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES += \ - src/devices/wifi/nm-device-iwd.c \ - src/devices/wifi/nm-device-iwd.h \ - src/devices/wifi/nm-iwd-manager.c \ - src/devices/wifi/nm-iwd-manager.h -endif - src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ -I$(srcdir)/src \ -I$(builddir)/src \ @@ -2723,7 +2684,8 @@ src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ @@ -2731,6 +2693,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ + introspection/libnmdbus.la \ $(GLIB_LIBS) check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la @@ -2755,21 +2718,16 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ -I$(builddir)/src \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la -src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) $(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif -EXTRA_DIST += \ - src/devices/wifi/meson.build \ - src/devices/wifi/tests/meson.build - ############################################################################### # src/devices/team ############################################################################### @@ -2790,7 +2748,8 @@ src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(LIBTEAMDCTL_CFLAGS) \ $(JANSSON_CFLAGS) \ $(GLIB_CFLAGS) @@ -2800,6 +2759,7 @@ src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_team_libnm_device_plugin_team_la_LIBADD = \ + introspection/libnmdbus.la \ $(LIBTEAMDCTL_LIBS) \ $(JANSSON_LIBS) \ $(GLIB_LIBS) @@ -2812,9 +2772,6 @@ check_local += check-local-devices-team endif -EXTRA_DIST += \ - src/devices/team/meson.build - ############################################################################### # src/devices/ovs ############################################################################### @@ -2850,7 +2807,8 @@ src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DRUNSTATEDIR=\"$(runstatedir)\" \ \ $(JANSSON_CFLAGS) \ @@ -2861,6 +2819,7 @@ src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \ + introspection/libnmdbus.la \ $(JANSSON_LIBS) \ $(GLIB_LIBS) @@ -2871,8 +2830,7 @@ check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la endif EXTRA_DIST += \ - data/NetworkManager-ovs.conf \ - src/devices/ovs/meson.build + data/NetworkManager-ovs.conf ############################################################################### # src/dnsmasq/tests @@ -2887,26 +2845,20 @@ src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \ src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ src/libNetworkManagerTest.la -src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) - $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -EXTRA_DIST += \ - src/dnsmasq/tests/meson.build - ############################################################################### # src/platform/tests ############################################################################### src_platform_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_platform_tests_libadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) check_programs_norun += \ src/platform/tests/monitor @@ -2987,44 +2939,36 @@ $(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums $(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -EXTRA_DIST += \ - src/platform/tests/meson.build - ############################################################################### # src/devices/tests ############################################################################### src_devices_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) check_programs += \ src/devices/tests/test-lldp \ - src/devices/tests/test-acd + src/devices/tests/test-arping src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags) src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_lldp_LDADD = \ src/libNetworkManagerTest.la -src_devices_tests_test_acd_CPPFLAGS = $(src_tests_cppflags) -src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags) -src_devices_tests_test_acd_LDADD = \ +src_devices_tests_test_arping_CPPFLAGS = $(src_tests_cppflags) +src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_arping_LDADD = \ src/libNetworkManagerTest.la $(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -EXTRA_DIST += \ - src/devices/tests/meson.build +$(src_devices_tests_test_arping_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### # src/ndisc/tests ############################################################################### src_ndisc_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_ndisc_tests_ldadd = \ src/libNetworkManagerTest.la \ @@ -3034,19 +2978,16 @@ check_programs += src/ndisc/tests/test-ndisc-fake check_programs_norun += src/ndisc/tests/test-ndisc-linux src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags) +src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_flags) src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd) src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags) +src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags) src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) $(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -EXTRA_DIST += \ - src/ndisc/tests/meson.build - ############################################################################### # src/supplicant/tests ############################################################################### @@ -3060,15 +3001,11 @@ src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ src_supplicant_tests_test_supplicant_config_LDADD = \ src/libNetworkManagerTest.la -src_supplicant_tests_test_supplicant_config_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) - $(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ src/supplicant/tests/certs/test-ca-cert.pem \ - src/supplicant/tests/certs/test-cert.p12 \ - src/supplicant/tests/meson.build + src/supplicant/tests/certs/test-cert.p12 ############################################################################### # src/tests/config @@ -3089,9 +3026,6 @@ src_tests_config_test_config_CPPFLAGS = \ src_tests_config_test_config_LDADD = \ src/libNetworkManagerTest.la -src_tests_config_test_config_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) - $(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ @@ -3102,16 +3036,14 @@ EXTRA_DIST += \ src/tests/config/conf.d/00-overrides.conf \ src/tests/config/conf.d/10-more.conf \ src/tests/config/conf.d/20-config-enable-1.conf \ - src/tests/config/conf.d/90-last.conf \ - src/tests/config/meson.build + src/tests/config/conf.d/90-last.conf ############################################################################### # src/tests ############################################################################### src_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_tests_ldadd = \ src/libNetworkManagerTest.la @@ -3123,6 +3055,7 @@ check_programs += \ src/tests/test-ip6-config \ src/tests/test-dcb \ src/tests/test-systemd \ + src/tests/test-resolvconf-capture \ src/tests/test-wired-defname \ src/tests/test-utils @@ -3138,6 +3071,10 @@ src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags) src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags) src_tests_test_dcb_LDADD = $(src_tests_ldadd) +src_tests_test_resolvconf_capture_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_resolvconf_capture_LDFLAGS = $(src_tests_ldflags) +src_tests_test_resolvconf_capture_LDADD = $(src_tests_ldadd) + src_tests_test_general_CPPFLAGS = $(src_tests_cppflags) src_tests_test_general_LDFLAGS = $(src_tests_ldflags) src_tests_test_general_LDADD = $(src_tests_ldadd) @@ -3157,14 +3094,13 @@ src_tests_test_utils_LDADD = $(src_tests_ldadd) $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_resolvconf_capture_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -src_tests_test_systemd_CPPFLAGS = \ - $(src_libsystemd_nm_la_cppflags) \ - -DNETWORKMANAGER_COMPILATION_TEST +src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) src_tests_test_systemd_SOURCES = \ shared/nm-utils/siphash24.c \ src/tests/test-systemd.c @@ -3175,8 +3111,7 @@ src_tests_test_systemd_LDADD = \ $(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/tests/test-secret-agent.py \ - src/tests/meson.build + src/tests/test-secret-agent.py ############################################################################### # dispatcher @@ -3192,13 +3127,9 @@ dispatcher_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ $(GLIB_CFLAGS) \ - -DG_LOG_DOMAIN=\""nm-dispatcher"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" @@ -3277,8 +3208,7 @@ dbusservice_DATA += dispatcher/nm-dispatcher.conf EXTRA_DIST += \ dispatcher/nm-dispatcher.conf \ dispatcher/org.freedesktop.nm_dispatcher.service.in \ - dispatcher/nm-dispatcher.xml \ - dispatcher/meson.build + dispatcher/nm-dispatcher.xml ############################################################################### # dispatcher/tests @@ -3291,18 +3221,10 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ -DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - $(GLIB_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) - -dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) + $(GLIB_CFLAGS) dispatcher_tests_test_dispatcher_envp_LDADD = \ libnm/libnm.la \ @@ -3318,8 +3240,7 @@ EXTRA_DIST += \ dispatcher/tests/dispatcher-external \ dispatcher/tests/dispatcher-up \ dispatcher/tests/dispatcher-vpn-down \ - dispatcher/tests/dispatcher-vpn-up \ - dispatcher/tests/meson.build + dispatcher/tests/dispatcher-vpn-up ############################################################################### # clients @@ -3336,7 +3257,6 @@ clients_nm_online_CPPFLAGS = \ -I$(builddir)/libnm \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nm-online"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DNMLOCALEDIR=\"$(datadir)/locale\" clients_nm_online_LDFLAGS = \ @@ -3348,9 +3268,6 @@ clients_nm_online_LDADD = \ $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -EXTRA_DIST += \ - clients/meson.build - ############################################################################### # clients/common ############################################################################### @@ -3365,8 +3282,7 @@ clients_cppflags = \ -I$(srcdir)/clients/common \ -I$(builddir)/clients/common \ $(GLIB_CFLAGS) \ - -DNMLOCALEDIR=\"$(datadir)/locale\" \ - $(NULL) + -DNMLOCALEDIR=\"$(datadir)/locale\" check_ltlibraries += clients/common/libnmc-base.la @@ -3379,6 +3295,7 @@ clients_common_libnmc_base_la_SOURCES = \ shared/nm-utils/nm-random-utils.h \ shared/nm-utils/nm-shared-utils.c \ shared/nm-utils/nm-shared-utils.h \ + shared/nm-utils/siphash24.c \ shared/nm-utils/siphash24.h \ \ clients/common/nm-secret-agent-simple.c \ @@ -3390,8 +3307,7 @@ clients_common_libnmc_base_la_SOURCES = \ clients_common_libnmc_base_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + -DG_LOG_DOMAIN=\""libnmc"\" clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ @@ -3400,27 +3316,28 @@ clients_common_libnmc_base_la_LIBADD = \ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp -clients_common_settings_doc_h = clients/common/settings-docs.h +clients_common_settings_doc_c = clients/common/settings-docs.c if HAVE_INTROSPECTION -$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) -DISTCLEANFILES += $(clients_common_settings_doc_h) -check-local-settings-docs: $(clients_common_settings_doc_h) +DISTCLEANFILES += $(clients_common_settings_doc_c) +check-local-settings-docs: $(clients_common_settings_doc_c) @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ - if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ - echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ + if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \ + echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ false; \ fi;\ fi check_local += check-local-settings-docs else -$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp - $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" +$(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp + $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" check-local-settings-docs: endif EXTRA_DIST += \ - $(clients_common_settings_doc_h) \ - $(clients_common_settings_doc_h).in + $(clients_common_settings_doc_c) \ + $(clients_common_settings_doc_c).in + if HAVE_INTROSPECTION check_ltlibraries += clients/common/libnmc.la @@ -3440,8 +3357,7 @@ clients_common_libnmc_la_SOURCES = \ clients_common_libnmc_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + -DG_LOG_DOMAIN=\""libnmc"\" clients_common_libnmc_la_LIBADD = \ libnm/libnm.la \ @@ -3449,7 +3365,7 @@ clients_common_libnmc_la_LIBADD = \ $(GLIB_LIBS) $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) +$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c) $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp if HAVE_INTROSPECTION @@ -3463,12 +3379,7 @@ endif clients_common_tests_test_general_CPPFLAGS = \ -I$(srcdir)/clients/common/tests \ $(clients_cppflags) \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - $(SANITIZER_EXEC_CFLAGS) - -clients_common_tests_test_general_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) + -DG_LOG_DOMAIN=\""libnmc"\" clients_common_tests_test_general_LDADD = \ libnm/libnm.la \ @@ -3510,9 +3421,7 @@ clients_cli_nmcli_SOURCES = \ clients_cli_nmcli_CPPFLAGS = \ -I$(srcdir)/clients/cli \ $(clients_cppflags) \ - $(SANITIZER_EXEC_CFLAGS) \ -DG_LOG_DOMAIN=\""nmcli"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" clients_cli_nmcli_LDADD = \ @@ -3531,8 +3440,7 @@ clients_cli_nmcli_LDADD += $(POLKIT_LIBS) endif clients_cli_nmcli_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ - $(SANITIZER_EXEC_LDFLAGS) + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" $(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -3551,10 +3459,7 @@ endif EXTRA_DIST += \ clients/cli/nmcli-completion \ - clients/cli/meson.build \ - clients/common/settings-docs.xsl \ - clients/common/meson.build \ - clients/common/tests/meson.build + clients/common/settings-docs.xsl ############################################################################### # clients/tui @@ -3614,13 +3519,9 @@ clients_tui_newt_libnmt_newt_a_CPPFLAGS = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ -DG_LOG_DOMAIN=\""nmtui"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(GLIB_CFLAGS) \ $(NEWT_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ $(NULL) bin_PROGRAMS += clients/tui/nmtui @@ -3715,12 +3616,10 @@ clients_tui_nmtui_CPPFLAGS = \ $(clients_cppflags) \ $(NEWT_CFLAGS) \ -DG_LOG_DOMAIN=\""nmtui"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DLOCALEDIR=\""$(localedir)"\" clients_tui_nmtui_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ - $(SANITIZER_EXEC_LDFLAGS) + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" clients_tui_nmtui_LDADD = \ libnm/libnm.la \ @@ -3750,10 +3649,6 @@ uninstall_hook += uninstall-hook-nmtui endif -EXTRA_DIST += \ - clients/tui/meson.build \ - clients/tui/newt/meson.build - ############################################################################### # data ############################################################################### @@ -3807,8 +3702,7 @@ if WITH_UDEV_DIR udevrulesdir = $(UDEV_DIR)/rules.d udevrules_DATA = \ data/84-nm-drivers.rules \ - data/85-nm-unmanaged.rules \ - data/90-nm-thunderbolt.rules + data/85-nm-unmanaged.rules endif data/server.conf: $(srcdir)/data/server.conf.in @@ -3823,9 +3717,7 @@ EXTRA_DIST += \ data/org.freedesktop.NetworkManager.service.in \ data/84-nm-drivers.rules \ data/85-nm-unmanaged.rules \ - data/90-nm-thunderbolt.rules \ - data/server.conf.in \ - data/meson.build + data/server.conf.in CLEANFILES += \ data/NetworkManager.service \ @@ -3850,8 +3742,8 @@ libnm_util_cppflags = \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -DG_LOG_DOMAIN=\""libnm-util"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(UUID_CFLAGS) @@ -4015,10 +3907,7 @@ DISTCLEANFILES += libnm-util/libnm-util.pc EXTRA_DIST += \ libnm-util/COPYING \ libnm-util/libnm-util.pc.in \ - libnm-util/libnm-util.ver \ - libnm-util/nm-utils-enum-types.c.template \ - libnm-util/nm-utils-enum-types.h.template \ - libnm-util/meson.build + libnm-util/libnm-util.ver if HAVE_INTROSPECTION libnm-util/NetworkManager-1.0.gir: libnm-util/libnm-util.la @@ -4064,19 +3953,13 @@ libnm_util_tests_cppflags = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ -DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ - $(SANITIZER_EXEC_CFLAGS) + -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" libnm_util_tests_ldadd = \ libnm-util/libnm-util.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) -libnm_util_tests_ldflags = \ - $(SANITIZER_EXEC_LDFLAGS) - check_programs += \ libnm-util/tests/test-settings-defaults \ libnm-util/tests/test-crypto \ @@ -4090,36 +3973,29 @@ check_programs_norun += \ libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd) -libnm_util_tests_test_settings_defaults_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_crypto_LDADD = \ libnm-util/libtest-crypto.la \ $(libnm_util_tests_ldadd) -libnm_util_tests_test_crypto_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd) -libnm_util_tests_test_secrets_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd) -libnm_util_tests_test_general_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd) -libnm_util_tests_test_setting_8021x_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd) -libnm_util_tests_test_setting_dcb_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_libnm_linking_LDADD = \ libnm/libnm.la \ $(libnm_util_tests_ldadd) -libnm_util_tests_test_libnm_linking_LDFLAGS = $(libnm_util_tests_ldflags) $(libnm_util_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_util_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -4129,9 +4005,6 @@ $(libnm_util_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_util_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_util_tests_test_libnm_linking_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -EXTRA_DIST += \ - libnm-util/tests/meson.build - ############################################################################### # libnm-glib ############################################################################### @@ -4144,7 +4017,7 @@ libnm_glib_cppflags = \ -I$(srcdir)/libnm-glib \ -I$(builddir)/libnm-glib \ -DG_LOG_DOMAIN=\""libnm-glib"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) @@ -4366,12 +4239,7 @@ EXTRA_DIST += \ libnm-glib/libnm-glib.pc.in \ libnm-glib/libnm-glib-vpn.pc.in \ libnm-glib/libnm-glib.ver \ - libnm-glib/libnm-glib-vpn.ver \ - libnm-glib/nm-vpn-enum-types.c.template \ - libnm-glib/nm-vpn-enum-types.h.template \ - libnm-glib/nm-glib-enum-types.c.template \ - libnm-glib/nm-glib-enum-types.h.template \ - libnm-glib/meson.build + libnm-glib/libnm-glib-vpn.ver if HAVE_INTROSPECTION libnm-glib/NMClient-1.0.gir: libnm-glib/libnm-glib.la $(builddir)/libnm-util/NetworkManager-1.0.gir @@ -4420,8 +4288,7 @@ libnm_glib_tests_cppflags = \ -I$(srcdir)/libnm-util \ -I$(builddir)/libnm-util \ -I$(srcdir)/libnm-glib \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) @@ -4463,9 +4330,6 @@ $(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_ endif -EXTRA_DIST += \ - libnm-glib/tests/meson.build - ############################################################################### # man ############################################################################### @@ -4575,9 +4439,6 @@ endif dist_dependencies += $(man_pages) dist_dependencies += $(man_pages_autogen) -EXTRA_DIST += \ - man/meson.build - ############################################################################### # vapi ############################################################################### @@ -4624,8 +4485,7 @@ EXTRA_DIST += \ vapi/NMClient-1.0.metadata \ vapi/libnm.deps \ vapi/libnm-util.deps \ - vapi/libnm-glib.deps \ - vapi/meson.build + vapi/libnm-glib.deps ############################################################################### @@ -4667,13 +4527,6 @@ EXTRA_DIST += \ Makefile.glib \ autogen.sh \ valgrind.suppressions \ - meson.build \ - meson_options.txt \ - meson_post_install.py \ - config.h.meson \ - docs/meson.build \ - \ - po/meson.build \ \ shared/nm-common-macros.h \ shared/nm-dbus-compat.h \ @@ -4681,14 +4534,11 @@ EXTRA_DIST += \ shared/nm-dispatcher-api.h \ shared/nm-test-libnm-utils.h \ shared/nm-test-utils-impl.c \ + shared/nm-utils/c-list.h \ shared/nm-utils/c-list-util.c \ shared/nm-utils/c-list-util.h \ shared/nm-utils/gsystem-local-alloc.h \ - shared/nm-utils/nm-c-list.h \ - shared/nm-utils/nm-compat.c \ - shared/nm-utils/nm-compat.h \ shared/nm-utils/nm-glib.h \ - shared/nm-utils/nm-jansson.h \ shared/nm-utils/nm-obj.h \ shared/nm-utils/nm-macros-internal.h \ shared/nm-utils/nm-shared-utils.c \ @@ -4698,11 +4548,8 @@ EXTRA_DIST += \ shared/nm-utils/nm-vpn-plugin-macros.h \ shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.h \ - shared/nm-utils/siphash24.c \ - shared/nm-utils/siphash24.h \ shared/nm-utils/unaligned.h \ shared/nm-version-macros.h.in \ - shared/meson.build \ \ tools/check-exports.sh \ tools/create-exports-NetworkManager.sh \ @@ -4713,7 +4560,6 @@ EXTRA_DIST += \ tools/enums-to-docbook.pl \ \ src/settings/plugins/README \ - src/settings/plugins/meson.build \ \ $(NULL) diff --git a/Makefile.examples b/Makefile.examples index d5433395..0326f7a2 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -9,7 +9,8 @@ examples_C_glib_cppflags = \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags) @@ -65,9 +66,6 @@ examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdb examples_C_glib_monitor_nm_state_gdbus_LDADD = \ $(GLIB_LIBS) -EXTRA_DIST += \ - examples/C/glib/meson.build - ############################################################################### # examples/C/qt ############################################################################### @@ -125,8 +123,7 @@ EXTRA_DIST += \ examples/C/qt/add-connection-wired.cpp \ examples/C/qt/list-connections.cpp \ examples/C/qt/change-ipv4-addresses.cpp \ - examples/C/qt/monitor-nm-running.cpp \ - examples/C/qt/meson.build + examples/C/qt/monitor-nm-running.cpp ############################################################################### # examples @@ -136,8 +133,6 @@ EXTRA_DIST += \ examples/dispatcher/10-ifcfg-rh-routes.sh \ examples/dispatcher/70-wifi-wired-exclusive.sh \ \ - examples/js/get_ips.js \ - \ examples/lua/lgi/add-connection.lua \ examples/lua/lgi/list-connections.lua \ examples/lua/lgi/list-devices.lua \ @@ -150,8 +145,6 @@ EXTRA_DIST += \ examples/nm-conf.d/30-anon.conf \ examples/nm-conf.d/31-mac-addr-change.conf \ \ - examples/python/nmex.py \ - \ examples/python/dbus/nm-state.py \ examples/python/dbus/add-connection.py \ examples/python/dbus/add-connection-compat.py \ diff --git a/Makefile.in b/Makefile.in index a00210be..45c5b28d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,15 +134,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = $(am__EXEEXT_16) -check_PROGRAMS = $(am__EXEEXT_15) +noinst_PROGRAMS = $(am__EXEEXT_17) +check_PROGRAMS = $(am__EXEEXT_16) sbin_PROGRAMS = src/NetworkManager$(EXEEXT) bin_PROGRAMS = clients/nm-online$(EXEEXT) $(am__EXEEXT_1) \ $(am__EXEEXT_2) libexec_PROGRAMS = src/nm-iface-helper$(EXEEXT) \ src/dhcp/nm-dhcp-helper$(EXEEXT) \ dispatcher/nm-dispatcher$(EXEEXT) -TESTS = $(am__EXEEXT_11) +TESTS = $(am__EXEEXT_12) @HAVE_DOCS_TRUE@am__append_1 = \ @HAVE_DOCS_TRUE@ docs/libnm \ @HAVE_DOCS_TRUE@ docs/api @@ -156,31 +156,29 @@ TESTS = $(am__EXEEXT_11) ############################################################################### @WITH_LEGACY_LIBRARIES_TRUE@am__append_5 = NetworkManager.pc -@WITH_JSON_VALIDATION_TRUE@am__append_6 = \ -@WITH_JSON_VALIDATION_TRUE@ libnm-core/nm-json.h +@WITH_JANSSON_TRUE@am__append_6 = \ +@WITH_JANSSON_TRUE@ libnm-core/nm-json.h -@WITH_JSON_VALIDATION_TRUE@am__append_7 = \ -@WITH_JSON_VALIDATION_TRUE@ libnm-core/nm-json.c +@WITH_JANSSON_TRUE@am__append_7 = \ +@WITH_JANSSON_TRUE@ libnm-core/nm-json.c -@WITH_GNUTLS_TRUE@am__append_8 = $(GNUTLS_CFLAGS) -@WITH_NSS_TRUE@am__append_9 = $(NSS_CFLAGS) -@WITH_JSON_VALIDATION_TRUE@am__append_10 = $(JANSSON_CFLAGS) +@WITH_JANSSON_TRUE@am__append_8 = $(JANSSON_CFLAGS) +@WITH_GNUTLS_TRUE@am__append_9 = $(GNUTLS_CFLAGS) +@WITH_NSS_TRUE@am__append_10 = $(NSS_CFLAGS) @WITH_GNUTLS_TRUE@am__append_11 = libnm-core/crypto_gnutls.c @WITH_GNUTLS_TRUE@am__append_12 = $(GNUTLS_LIBS) @WITH_NSS_TRUE@am__append_13 = libnm-core/crypto_nss.c @WITH_NSS_TRUE@am__append_14 = $(NSS_LIBS) @HAVE_INTROSPECTION_TRUE@am__append_15 = libnm/NM-1.0.gir -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_16 = \ -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/typelibs.c \ -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/NMClient.typelib \ -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/NetworkManager.typelib - +@HAVE_INTROSPECTION_TRUE@am__append_16 = $(libnm_noinst_data) @HAVE_INTROSPECTION_TRUE@am__append_17 = $(libnm_noinst_data) -@HAVE_INTROSPECTION_TRUE@am__append_18 = $(libnm_noinst_data) -@WITH_WEXT_TRUE@am__append_19 = \ +@WITH_WEXT_TRUE@am__append_18 = \ @WITH_WEXT_TRUE@ src/platform/wifi/wifi-utils-wext.c \ @WITH_WEXT_TRUE@ src/platform/wifi/wifi-utils-wext.h +@WITH_CONCHECK_TRUE@am__append_19 = \ +@WITH_CONCHECK_TRUE@ src/nm-connectivity.c + @REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1 ############################################################################### @@ -237,132 +235,127 @@ TESTS = $(am__EXEEXT_11) ############################################################################### @CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/tests/test-ifupdown +############################################################################### +# src/settings/plugins/ifnet +############################################################################### +@CONFIG_PLUGIN_IFNET_TRUE@am__append_38 = src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la +@CONFIG_PLUGIN_IFNET_TRUE@am__append_39 = src/settings/plugins/ifnet/libnms-ifnet-core.la +@CONFIG_PLUGIN_IFNET_TRUE@am__append_40 = check-local-symbols-settings-ifnet + +############################################################################### +@CONFIG_PLUGIN_IFNET_TRUE@am__append_41 = src/settings/plugins/ifnet/tests/test-ifnet + ############################################################################### # src/devices/bluetooth ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_38 = \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-device-plugin-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/libnm-device-plugin-bluetooth.la -@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_39 = \ +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_43 = \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.c \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.h -@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = check-local-devices-wwan \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = check-local-devices-wwan \ @WITH_MODEM_MANAGER_1_TRUE@ check-local-devices-bluetooth -@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 = \ +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = $(BLUEZ5_CFLAGS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_46 = \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.c \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.h -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_LIBS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_47 = $(BLUEZ5_LIBS) ############################################################################### # src/devices/wifi ############################################################################### -@WITH_WIFI_TRUE@am__append_44 = src/devices/wifi/libnm-device-plugin-wifi.la -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_45 = \ -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-iwd.c \ -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-iwd.h \ -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-iwd-manager.c \ -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-iwd-manager.h - -@WITH_WIFI_TRUE@am__append_46 = check-local-devices-wifi -@WITH_WIFI_TRUE@am__append_47 = src/devices/wifi/tests/test-general +@WITH_WIFI_TRUE@am__append_48 = src/devices/wifi/libnm-device-plugin-wifi.la +@WITH_WIFI_TRUE@am__append_49 = check-local-devices-wifi +@WITH_WIFI_TRUE@am__append_50 = src/devices/wifi/tests/test-general ############################################################################### # src/devices/team ############################################################################### -@WITH_TEAMDCTL_TRUE@am__append_48 = src/devices/team/libnm-device-plugin-team.la -@WITH_TEAMDCTL_TRUE@am__append_49 = check-local-devices-team -@WITH_OPENVSWITCH_TRUE@am__append_50 = src/devices/ovs/libnm-device-plugin-ovs.la -@HAVE_INTROSPECTION_TRUE@am__append_51 = $(clients_common_settings_doc_h) -@HAVE_INTROSPECTION_TRUE@am__append_52 = check-local-settings-docs -@HAVE_INTROSPECTION_TRUE@am__append_53 = clients/common/libnmc.la -@HAVE_INTROSPECTION_FALSE@am__append_54 = clients/common/libnmc.la -@HAVE_INTROSPECTION_TRUE@am__append_55 = clients/common/tests/test-general -@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_56 = clients/common/tests/test-general +@WITH_TEAMDCTL_TRUE@am__append_51 = src/devices/team/libnm-device-plugin-team.la +@WITH_TEAMDCTL_TRUE@am__append_52 = check-local-devices-team +@WITH_OPENVSWITCH_TRUE@am__append_53 = src/devices/ovs/libnm-device-plugin-ovs.la +@HAVE_INTROSPECTION_TRUE@am__append_54 = $(clients_common_settings_doc_c) +@HAVE_INTROSPECTION_TRUE@am__append_55 = check-local-settings-docs +@HAVE_INTROSPECTION_TRUE@am__append_56 = clients/common/libnmc.la +@HAVE_INTROSPECTION_FALSE@am__append_57 = clients/common/libnmc.la +@HAVE_INTROSPECTION_TRUE@am__append_58 = clients/common/tests/test-general +@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_59 = clients/common/tests/test-general ############################################################################### # clients/cli ############################################################################### -@BUILD_NMCLI_TRUE@am__append_57 = clients/cli/nmcli -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_58 = $(POLKIT_CFLAGS) -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = \ +@BUILD_NMCLI_TRUE@am__append_60 = clients/cli/nmcli +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_61 = $(POLKIT_CFLAGS) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_62 = \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.c \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.h -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = $(POLKIT_LIBS) -@BUILD_NMCLI_TRUE@am__append_61 = install-data-hook-nmcli -@BUILD_NMCLI_TRUE@am__append_62 = uninstall-hook-nmcli +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_63 = $(POLKIT_LIBS) +@BUILD_NMCLI_TRUE@am__append_64 = install-data-hook-nmcli +@BUILD_NMCLI_TRUE@am__append_65 = uninstall-hook-nmcli ############################################################################### # clients/tui ############################################################################### -@BUILD_NMTUI_TRUE@am__append_63 = clients/tui/newt/libnmt-newt.a -@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/nmtui -@BUILD_NMTUI_TRUE@am__append_65 = install-exec-hook-nmtui -@BUILD_NMTUI_TRUE@am__append_66 = uninstall-hook-nmtui -@HAVE_SYSTEMD_TRUE@am__append_67 = data/org.freedesktop.NetworkManager.service +@BUILD_NMTUI_TRUE@am__append_66 = clients/tui/newt/libnmt-newt.a +@BUILD_NMTUI_TRUE@am__append_67 = clients/tui/nmtui +@BUILD_NMTUI_TRUE@am__append_68 = install-exec-hook-nmtui +@BUILD_NMTUI_TRUE@am__append_69 = uninstall-hook-nmtui +@HAVE_SYSTEMD_TRUE@am__append_70 = data/org.freedesktop.NetworkManager.service ############################################################################### # libnm-util ############################################################################### -@WITH_LEGACY_LIBRARIES_TRUE@am__append_68 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_h_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_c_mkenums) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_70 = $(GNUTLS_CFLAGS) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_73 = $(NSS_CFLAGS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_76 = \ +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_CFLAGS) +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_74 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_75 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_CFLAGS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_77 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_78 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_gnutls.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_nss.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/COPYING \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.pc.in \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.ver \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.c.template \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.h.template \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/meson.build \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/meson.build \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc.in \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc.in \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.ver \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.ver \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-enum-types.c.template \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-enum-types.h.template \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-glib-enum-types.c.template \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-glib-enum-types.h.template \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/meson.build -@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = libnm-util/libtest-crypto.la -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_78 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_80 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.ver +@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = libnm-util/libtest-crypto.la +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_83 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_84 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc -@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc -@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/NetworkManager-1.0.gir \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/NetworkManager-1.0.gir \ @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/NMClient-1.0.gir -@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-glib -@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/tests/test-settings-defaults \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-util/tests/test-settings-defaults \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-crypto \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-secrets \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-general \ @@ -370,53 +363,53 @@ TESTS = $(am__EXEEXT_11) @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-remote-settings-client -@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = libnm-util/tests/test-libnm-linking \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = libnm-util/tests/test-libnm-linking \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test -@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-glib/libdeprecated-nm-glib.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = libnm-glib/libdeprecated-nm-glib.la +@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-plugin-glue.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-secret-agent-glue.h -@HAVE_INTROSPECTION_TRUE@am__append_91 = $(man_nm_settings_xml) -@WITH_OPENVSWITCH_TRUE@am__append_92 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_93 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_94 = man/nm-openvswitch.7 -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_95 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_96 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_97 = man/nm-settings-ifcfg-rh.5 -@HAVE_DOCS_TRUE@am__append_98 = install-data-hook-man -@HAVE_DOCS_TRUE@am__append_99 = uninstall-hook-man -@HAVE_DOCS_TRUE@am__append_100 = $(man_pages) $(man_pages_autogen) -@BUILD_DOCS_TRUE@am__append_101 = $(man_pages) $(man_pages_autogen) +@HAVE_INTROSPECTION_TRUE@am__append_94 = $(man_nm_settings_xml) +@WITH_OPENVSWITCH_TRUE@am__append_95 = man/nm-openvswitch.7 +@WITH_OPENVSWITCH_FALSE@am__append_96 = man/nm-openvswitch.7 +@WITH_OPENVSWITCH_FALSE@am__append_97 = man/nm-openvswitch.7 +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_98 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_99 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_100 = man/nm-settings-ifcfg-rh.5 +@HAVE_DOCS_TRUE@am__append_101 = install-data-hook-man +@HAVE_DOCS_TRUE@am__append_102 = uninstall-hook-man +@HAVE_DOCS_TRUE@am__append_103 = $(man_pages) $(man_pages_autogen) +@BUILD_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen) ############################################################################### # vapi ############################################################################### -@ENABLE_VAPIGEN_TRUE@am__append_102 = \ +@ENABLE_VAPIGEN_TRUE@am__append_105 = \ @ENABLE_VAPIGEN_TRUE@ vapi/libnm.vapi -@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_103 = \ +@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_106 = \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-util.vapi \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-glib.vapi -@ENABLE_VAPIGEN_TRUE@am__append_104 = \ +@ENABLE_VAPIGEN_TRUE@am__append_107 = \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS) \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS:.vapi=.deps) -@ENABLE_VAPIGEN_TRUE@am__append_105 = $(VAPIGEN_VAPIS) +@ENABLE_VAPIGEN_TRUE@am__append_108 = $(VAPIGEN_VAPIS) ############################################################################### -@ENABLE_TESTS_TRUE@am__append_106 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_TRUE@am__append_107 = $(check_ltlibraries) -@ENABLE_TESTS_FALSE@am__append_108 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_FALSE@am__append_109 = $(check_ltlibraries) -@WITH_QT_TRUE@am__append_110 = \ +@ENABLE_TESTS_TRUE@am__append_109 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_TRUE@am__append_110 = $(check_ltlibraries) +@ENABLE_TESTS_FALSE@am__append_111 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_FALSE@am__append_112 = $(check_ltlibraries) +@WITH_QT_TRUE@am__append_113 = \ @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_111 = \ +@WITH_QT_TRUE@am__append_114 = \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running.moc subdir = . @@ -583,6 +576,7 @@ am_clients_common_libnmc_base_la_OBJECTS = shared/nm-utils/clients_common_libnmc shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo \ shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo \ shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo \ + shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo \ clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo \ clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo \ clients/common/clients_common_libnmc_base_la-nm-client-utils.lo @@ -709,7 +703,18 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \ libnm-core/nm-property-compare.h \ libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \ - libnm-core/nm-json.h libnm-core/nm-setting-8021x.c \ + libnm-core/nm-json.h shared/nm-utils/c-list-util.c \ + shared/nm-utils/nm-dedup-multi.c \ + shared/nm-utils/nm-enum-utils.c \ + shared/nm-utils/nm-hash-utils.c \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-random-utils.c \ + shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \ + shared/nm-meta-setting.c libnm-core/crypto.c \ + libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \ + libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \ + libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \ + libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \ libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \ libnm-core/nm-setting-bond.c \ libnm-core/nm-setting-bridge-port.c \ @@ -736,24 +741,34 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \ libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c shared/nm-utils/c-list-util.c \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-udev-utils.c shared/nm-meta-setting.c \ - libnm-core/crypto.c libnm-core/nm-connection.c \ - libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \ - libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \ - libnm-core/nm-property-compare.c libnm-core/nm-setting.c \ + libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \ libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ libnm-core/nm-vpn-plugin-info.c libnm-core/nm-json.c \ libnm-core/crypto_gnutls.c libnm-core/crypto_nss.c am__objects_2 = am__objects_3 = $(am__objects_2) -am__objects_4 = \ +@WITH_JANSSON_TRUE@am__objects_4 = libnm-core/libnm_core_libnm_core_la-nm-json.lo +@WITH_GNUTLS_TRUE@am__objects_5 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo +@WITH_NSS_TRUE@am__objects_6 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo +am__objects_7 = \ + shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo \ + shared/libnm_core_libnm_core_la-nm-meta-setting.lo \ + libnm-core/libnm_core_libnm_core_la-crypto.lo \ + libnm-core/libnm_core_libnm_core_la-nm-connection.lo \ + libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \ + libnm-core/libnm_core_libnm_core_la-nm-errors.lo \ + libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo \ + libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo \ + libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo \ + libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-adsl.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-bluetooth.lo \ @@ -793,38 +808,19 @@ am__objects_4 = \ libnm-core/libnm_core_libnm_core_la-nm-setting-wimax.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-wired.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless-security.lo \ - libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo -@WITH_JSON_VALIDATION_TRUE@am__objects_5 = libnm-core/libnm_core_libnm_core_la-nm-json.lo -@WITH_GNUTLS_TRUE@am__objects_6 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo -@WITH_NSS_TRUE@am__objects_7 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo -am__objects_8 = $(am__objects_4) \ - shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \ - shared/libnm_core_libnm_core_la-nm-meta-setting.lo \ - libnm-core/libnm_core_libnm_core_la-crypto.lo \ - libnm-core/libnm_core_libnm_core_la-nm-connection.lo \ - libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \ - libnm-core/libnm_core_libnm_core_la-nm-errors.lo \ - libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo \ - libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo \ - libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo \ + libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting.lo \ libnm-core/libnm_core_libnm_core_la-nm-simple-connection.lo \ libnm-core/libnm_core_libnm_core_la-nm-utils.lo \ libnm-core/libnm_core_libnm_core_la-nm-vpn-editor-plugin.lo \ libnm-core/libnm_core_libnm_core_la-nm-vpn-plugin-info.lo \ - $(am__objects_5) $(am__objects_6) $(am__objects_7) + $(am__objects_4) $(am__objects_5) $(am__objects_6) am_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \ - $(am__objects_3) $(am__objects_8) -am__objects_9 = \ + $(am__objects_3) $(am__objects_7) +am__objects_8 = \ libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo nodist_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \ - $(am__objects_9) + $(am__objects_8) libnm_core_libnm_core_la_OBJECTS = \ $(am_libnm_core_libnm_core_la_OBJECTS) \ $(nodist_libnm_core_libnm_core_la_OBJECTS) @@ -849,14 +845,14 @@ am__libnm_glib_libnm_glib_vpn_la_SOURCES_DIST = \ libnm-glib/nm-vpn-plugin.c \ libnm-glib/nm-vpn-plugin-ui-interface.c \ libnm-glib/nm-vpn-plugin-utils.c -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin-utils.lo @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_vpn_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_10) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_9) +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo @WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_11) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_10) libnm_glib_libnm_glib_vpn_la_OBJECTS = \ $(am_libnm_glib_libnm_glib_vpn_la_OBJECTS) \ $(nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS) @@ -908,7 +904,7 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST = \ libnm-glib/nm-object-cache.h \ libnm-glib/nm-remote-connection-private.h \ libnm-glib/nm-dbus-helpers-private.h -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-dbus-helpers.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-client.lo \ @@ -940,11 +936,11 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-device-wimax.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-wimax-nsp.lo @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_12) $(am__objects_2) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_11) $(am__objects_2) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_13 = libnm-glib/libnm_glib_libnm_glib_la-nm-glib-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = libnm-glib/libnm_glib_libnm_glib_la-nm-glib-enum-types.lo @WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_13) $(am__objects_2) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_12) $(am__objects_2) libnm_glib_libnm_glib_la_OBJECTS = \ $(am_libnm_glib_libnm_glib_la_OBJECTS) \ $(nodist_libnm_glib_libnm_glib_la_OBJECTS) @@ -1009,9 +1005,9 @@ am__libnm_util_libnm_util_la_SOURCES_DIST = \ libnm-util/nm-gvaluearray-compat.h \ libnm-util/nm-param-spec-specialized.h \ libnm-util/nm-setting-private.h libnm-util/nm-utils-private.h -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_15 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \ +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_13 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_14 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_15 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-crypto.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-connection.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-param-spec-specialized.lo \ @@ -1044,14 +1040,14 @@ am__libnm_util_libnm_util_la_SOURCES_DIST = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-setting-vpn.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-utils.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-value-transforms.lo \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_14) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_15) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_13) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_14) @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libnm_util_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_16) $(am__objects_2) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_15) $(am__objects_2) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_17 = libnm-util/libnm_util_libnm_util_la-nm-utils-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = libnm-util/libnm_util_libnm_util_la-nm-utils-enum-types.lo @WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_util_libnm_util_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) $(am__objects_17) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) $(am__objects_16) libnm_util_libnm_util_la_OBJECTS = \ $(am_libnm_util_libnm_util_la_OBJECTS) \ $(nodist_libnm_util_libnm_util_la_OBJECTS) @@ -1067,11 +1063,11 @@ libnm_util_libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) am__libnm_util_libtest_crypto_la_SOURCES_DIST = libnm-util/crypto.c \ libnm-util/crypto_gnutls.c libnm-util/crypto_nss.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_18 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_19 = libnm-util/libnm_util_libtest_crypto_la-crypto_nss.lo +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_17 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_18 = libnm-util/libnm_util_libtest_crypto_la-crypto_nss.lo @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_OBJECTS = libnm-util/libnm_util_libtest_crypto_la-crypto.lo \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_18) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_19) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_17) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_18) libnm_util_libtest_crypto_la_OBJECTS = \ $(am_libnm_util_libtest_crypto_la_OBJECTS) @ENABLE_TESTS_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath = @@ -1080,15 +1076,12 @@ libnm_libnm_utils_la_DEPENDENCIES = libnm-core/libnm-core.la \ introspection/libnmdbus.la $(am__DEPENDENCIES_1) am_libnm_libnm_utils_la_OBJECTS = \ libnm/libnm_libnm_utils_la-nm-libnm-utils.lo -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_OBJECTS = libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo -libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) \ - $(nodist_libnm_libnm_utils_la_OBJECTS) +libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) libnm_libnm_la_DEPENDENCIES = libnm/libnm-utils.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am__objects_20 = libnm/libnm_libnm_la-nm-access-point.lo \ +am__objects_19 = libnm/libnm_libnm_la-nm-access-point.lo \ libnm/libnm_libnm_la-nm-active-connection.lo \ - libnm/libnm_libnm_la-nm-checkpoint.lo \ libnm/libnm_libnm_la-nm-client.lo \ libnm/libnm_libnm_la-nm-dbus-helpers.lo \ libnm/libnm_libnm_la-nm-device-adsl.lo \ @@ -1133,9 +1126,9 @@ am__objects_20 = libnm/libnm_libnm_la-nm-access-point.lo \ libnm/libnm_libnm_la-nm-vpn-service-plugin.lo \ libnm/libnm_libnm_la-nm-wimax-nsp.lo am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2) \ - $(am__objects_20) -am__objects_21 = libnm/libnm_libnm_la-nm-enum-types.lo -nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_21) + $(am__objects_2) $(am__objects_19) +am__objects_20 = libnm/libnm_libnm_la-nm-enum-types.lo +nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_20) libnm_libnm_la_OBJECTS = $(am_libnm_libnm_la_OBJECTS) \ $(nodist_libnm_libnm_la_OBJECTS) libnm_libnm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1154,20 +1147,8 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LINK = $(LIBTOOL) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @ENABLE_TESTS_FALSE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath = @ENABLE_TESTS_TRUE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath = -shared_libcsiphash_la_LIBADD = -am_shared_libcsiphash_la_OBJECTS = \ - shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo -shared_libcsiphash_la_OBJECTS = $(am_shared_libcsiphash_la_OBJECTS) -shared_libnacd_la_LIBADD = -am_shared_libnacd_la_OBJECTS = \ - shared/n-acd/src/shared_libnacd_la-n-acd.lo -shared_libnacd_la_OBJECTS = $(am_shared_libnacd_la_OBJECTS) -shared_libnacd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(shared_libnacd_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) + introspection/libnmdbus.la $(am__DEPENDENCIES_1) am_src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo \ src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-device-adsl.lo src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = \ @@ -1179,6 +1160,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \ $(LDFLAGS) -o $@ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES = \ +@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_6) @@ -1199,7 +1181,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST = \ src/devices/bluetooth/nm-device-bt.h \ src/devices/bluetooth/nm-bluez5-dun.c \ src/devices/bluetooth/nm-bluez5-dun.h -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_22 = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_21 = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez-device.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez4-adapter.lo \ @@ -1207,7 +1189,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-manager.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bt-error.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-device-bt.lo \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_22) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_21) src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = $(am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK = \ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1217,6 +1199,7 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK = \ @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath = \ @WITH_MODEM_MANAGER_1_TRUE@ -rpath $(pkglibdir) @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES = \ +@WITH_OPENVSWITCH_TRUE@ introspection/libnmdbus.la \ @WITH_OPENVSWITCH_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_OPENVSWITCH_TRUE@ $(am__DEPENDENCIES_1) am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST = \ @@ -1243,6 +1226,7 @@ src_devices_ovs_libnm_device_plugin_ovs_la_LINK = $(LIBTOOL) \ @WITH_OPENVSWITCH_TRUE@am_src_devices_ovs_libnm_device_plugin_ovs_la_rpath = \ @WITH_OPENVSWITCH_TRUE@ -rpath $(pkglibdir) @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_DEPENDENCIES = \ +@WITH_TEAMDCTL_TRUE@ introspection/libnmdbus.la \ @WITH_TEAMDCTL_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_TEAMDCTL_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_TEAMDCTL_TRUE@ $(am__DEPENDENCIES_1) @@ -1262,6 +1246,7 @@ src_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \ @WITH_TEAMDCTL_TRUE@am_src_devices_team_libnm_device_plugin_team_la_rpath = \ @WITH_TEAMDCTL_TRUE@ -rpath $(pkglibdir) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES = \ +@WITH_WIFI_TRUE@ introspection/libnmdbus.la \ @WITH_WIFI_TRUE@ $(am__DEPENDENCIES_1) am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST = \ src/devices/wifi/nm-wifi-factory.c \ @@ -1270,23 +1255,13 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST = \ src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \ src/devices/wifi/nm-wifi-utils.c \ src/devices/wifi/nm-wifi-utils.h \ - src/devices/wifi/nm-wifi-common.c \ - src/devices/wifi/nm-wifi-common.h \ src/devices/wifi/nm-device-olpc-mesh.c \ - src/devices/wifi/nm-device-olpc-mesh.h \ - src/devices/wifi/nm-device-iwd.c \ - src/devices/wifi/nm-device-iwd.h \ - src/devices/wifi/nm-iwd-manager.c \ - src/devices/wifi/nm-iwd-manager.h -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_23 = src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo \ -@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo + src/devices/wifi/nm-device-olpc-mesh.h @WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-factory.lo \ @WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-wifi.lo \ @WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.lo \ @WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo \ -@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo \ -@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo \ -@WITH_WIFI_TRUE@ $(am__objects_23) +@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = \ $(am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \ @@ -1297,6 +1272,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \ @WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath = \ @WITH_WIFI_TRUE@ -rpath $(pkglibdir) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES = \ +@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST = \ @@ -1326,11 +1302,11 @@ am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST = \ src/devices/wwan/nm-modem.c src/devices/wwan/nm-modem.h \ src/devices/wwan/nm-modem-ofono.c \ src/devices/wwan/nm-modem-ofono.h -@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_24 = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_22 = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_OBJECTS = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-broadband.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-manager.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem.lo \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_24) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_22) src_devices_wwan_libnm_wwan_la_OBJECTS = \ $(am_src_devices_wwan_libnm_wwan_la_OBJECTS) src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1340,18 +1316,113 @@ src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_rpath = \ @WITH_MODEM_MANAGER_1_TRUE@ -rpath $(pkglibdir) src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \ - src/libsystemd-nm.la shared/libcsiphash.la shared/libnacd.la \ + src/libsystemd-nm.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am__src_libNetworkManager_la_SOURCES_DIST = \ + src/nm-checkpoint-manager.c src/nm-checkpoint-manager.h \ + src/nm-checkpoint.c src/nm-checkpoint.h \ + src/devices/nm-device.c src/devices/nm-device.h \ + src/devices/nm-lldp-listener.c src/devices/nm-lldp-listener.h \ + src/devices/nm-arping-manager.c \ + src/devices/nm-arping-manager.h \ + src/devices/nm-device-ethernet-utils.c \ + src/devices/nm-device-ethernet-utils.h \ + src/devices/nm-device-factory.c \ + src/devices/nm-device-factory.h \ + src/devices/nm-device-generic.c \ + src/devices/nm-device-generic.h \ + src/devices/nm-device-logging.h \ + src/devices/nm-device-private.h src/devices/nm-device-bond.c \ + src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \ + src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \ + src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \ + src/devices/nm-device-ethernet.h \ + src/devices/nm-device-infiniband.c \ + src/devices/nm-device-infiniband.h \ + src/devices/nm-device-ip-tunnel.c \ + src/devices/nm-device-ip-tunnel.h \ + src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \ + src/devices/nm-device-macvlan.c \ + src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \ + src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \ + src/devices/nm-device-tun.h src/devices/nm-device-veth.c \ + src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \ + src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \ + src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \ + src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \ + src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \ + src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \ + src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \ + src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \ + src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \ + src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \ + src/dnsmasq/nm-dnsmasq-manager.h \ + src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \ + src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \ + src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \ + src/nm-hostname-manager.c src/nm-hostname-manager.h \ + src/settings/nm-agent-manager.c \ + src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \ + src/settings/nm-secret-agent.h \ + src/settings/nm-settings-connection.c \ + src/settings/nm-settings-connection.h \ + src/settings/nm-settings-plugin.c \ + src/settings/nm-settings-plugin.h src/settings/nm-settings.c \ + src/settings/nm-settings.h \ + src/settings/plugins/keyfile/nms-keyfile-connection.c \ + src/settings/plugins/keyfile/nms-keyfile-connection.h \ + src/settings/plugins/keyfile/nms-keyfile-plugin.c \ + src/settings/plugins/keyfile/nms-keyfile-plugin.h \ + src/settings/plugins/keyfile/nms-keyfile-reader.c \ + src/settings/plugins/keyfile/nms-keyfile-reader.h \ + src/settings/plugins/keyfile/nms-keyfile-utils.c \ + src/settings/plugins/keyfile/nms-keyfile-utils.h \ + src/settings/plugins/keyfile/nms-keyfile-writer.c \ + src/settings/plugins/keyfile/nms-keyfile-writer.h \ + src/supplicant/nm-supplicant-config.c \ + src/supplicant/nm-supplicant-config.h \ + src/supplicant/nm-supplicant-interface.c \ + src/supplicant/nm-supplicant-interface.h \ + src/supplicant/nm-supplicant-manager.c \ + src/supplicant/nm-supplicant-manager.h \ + src/supplicant/nm-supplicant-settings-verify.c \ + src/supplicant/nm-supplicant-settings-verify.h \ + src/supplicant/nm-supplicant-types.h \ + src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \ + src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \ + src/nm-act-request.c src/nm-act-request.h \ + src/nm-active-connection.c src/nm-active-connection.h \ + src/nm-audit-manager.c src/nm-audit-manager.h \ + src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \ + src/nm-config.h src/nm-config-data.c src/nm-config-data.h \ + src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \ + src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \ + src/nm-dhcp6-config.c src/nm-dhcp6-config.h \ + src/nm-dispatcher.c src/nm-dispatcher.h \ + src/nm-firewall-manager.c src/nm-firewall-manager.h \ + src/nm-proxy-config.c src/nm-proxy-config.h \ + src/nm-auth-manager.c src/nm-auth-manager.h \ + src/nm-auth-subject.c src/nm-auth-subject.h \ + src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \ + src/nm-manager.h src/nm-pacrunner-manager.c \ + src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \ + src/nm-rfkill-manager.c src/nm-rfkill-manager.h \ + src/nm-session-monitor.h src/nm-session-monitor.c \ + src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \ + src/nm-connectivity.c +@WITH_CONCHECK_TRUE@am__objects_23 = src/src_libNetworkManager_la-nm-connectivity.lo am_src_libNetworkManager_la_OBJECTS = \ - src/src_libNetworkManager_la-nm-checkpoint.lo \ src/src_libNetworkManager_la-nm-checkpoint-manager.lo \ + src/src_libNetworkManager_la-nm-checkpoint.lo \ src/devices/src_libNetworkManager_la-nm-device.lo \ src/devices/src_libNetworkManager_la-nm-lldp-listener.lo \ - src/devices/src_libNetworkManager_la-nm-acd-manager.lo \ + src/devices/src_libNetworkManager_la-nm-arping-manager.lo \ src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo \ src/devices/src_libNetworkManager_la-nm-device-factory.lo \ src/devices/src_libNetworkManager_la-nm-device-generic.lo \ @@ -1373,11 +1444,11 @@ am_src_libNetworkManager_la_OBJECTS = \ src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcd.lo \ src/dhcp/src_libNetworkManager_la-nm-dhcp-listener.lo \ src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo \ - src/dns/src_libNetworkManager_la-nm-dns-manager.lo \ - src/dns/src_libNetworkManager_la-nm-dns-plugin.lo \ src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo \ src/dns/src_libNetworkManager_la-nm-dns-systemd-resolved.lo \ src/dns/src_libNetworkManager_la-nm-dns-unbound.lo \ + src/dns/src_libNetworkManager_la-nm-dns-manager.lo \ + src/dns/src_libNetworkManager_la-nm-dns-plugin.lo \ src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo \ src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-utils.lo \ src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo \ @@ -1401,10 +1472,9 @@ am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-act-request.lo \ src/src_libNetworkManager_la-nm-active-connection.lo \ src/src_libNetworkManager_la-nm-audit-manager.lo \ - src/src_libNetworkManager_la-nm-dbus-manager.lo \ + src/src_libNetworkManager_la-nm-bus-manager.lo \ src/src_libNetworkManager_la-nm-config.lo \ src/src_libNetworkManager_la-nm-config-data.lo \ - src/src_libNetworkManager_la-nm-connectivity.lo \ src/src_libNetworkManager_la-nm-dcb.lo \ src/src_libNetworkManager_la-nm-netns.lo \ src/src_libNetworkManager_la-nm-dhcp4-config.lo \ @@ -1420,16 +1490,16 @@ am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-policy.lo \ src/src_libNetworkManager_la-nm-rfkill-manager.lo \ src/src_libNetworkManager_la-nm-session-monitor.lo \ - src/src_libNetworkManager_la-nm-sleep-monitor.lo + src/src_libNetworkManager_la-nm-sleep-monitor.lo \ + $(am__objects_23) src_libNetworkManager_la_OBJECTS = \ $(am_src_libNetworkManager_la_OBJECTS) src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + introspection/libnmdbus.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \ src/NetworkManagerUtils.c src/NetworkManagerUtils.h \ - src/platform/nm-netlink.c src/platform/nm-netlink.h \ src/platform/nmp-netns.c src/platform/nmp-netns.h \ src/platform/nmp-object.c src/platform/nmp-object.h \ src/platform/nm-platform-utils.c \ @@ -1443,22 +1513,21 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ src/platform/wifi/wifi-utils.c src/platform/wifi/wifi-utils.h \ src/ndisc/nm-lndp-ndisc.c src/ndisc/nm-lndp-ndisc.h \ src/ndisc/nm-ndisc.c src/ndisc/nm-ndisc.h \ - src/ndisc/nm-ndisc-private.h src/nm-dbus-utils.c \ - src/nm-dbus-utils.h src/nm-dbus-object.c src/nm-dbus-object.h \ - src/nm-ip4-config.c src/nm-ip4-config.h src/nm-ip6-config.c \ - src/nm-ip6-config.h src/dhcp/nm-dhcp-client.c \ - src/dhcp/nm-dhcp-client.h src/dhcp/nm-dhcp-client-logging.h \ - src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \ - src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \ - src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \ + src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \ + src/nm-exported-object.h src/nm-ip4-config.c \ + src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \ + src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \ + src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \ + src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \ + src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \ + src/main-utils.c src/main-utils.h \ src/platform/wifi/wifi-utils-wext.c \ src/platform/wifi/wifi-utils-wext.h -@WITH_WEXT_TRUE@am__objects_25 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo +@WITH_WEXT_TRUE@am__objects_24 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo am_src_libNetworkManagerBase_la_OBJECTS = \ src/src_libNetworkManagerBase_la-nm-core-utils.lo \ src/src_libNetworkManagerBase_la-nm-logging.lo \ src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo \ - src/platform/src_libNetworkManagerBase_la-nm-netlink.lo \ src/platform/src_libNetworkManagerBase_la-nmp-netns.lo \ src/platform/src_libNetworkManagerBase_la-nmp-object.lo \ src/platform/src_libNetworkManagerBase_la-nm-platform-utils.lo \ @@ -1468,8 +1537,7 @@ am_src_libNetworkManagerBase_la_OBJECTS = \ src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo \ src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo \ src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo \ - src/src_libNetworkManagerBase_la-nm-dbus-utils.lo \ - src/src_libNetworkManagerBase_la-nm-dbus-object.lo \ + src/src_libNetworkManagerBase_la-nm-exported-object.lo \ src/src_libNetworkManagerBase_la-nm-ip4-config.lo \ src/src_libNetworkManagerBase_la-nm-ip6-config.lo \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo \ @@ -1477,12 +1545,12 @@ am_src_libNetworkManagerBase_la_OBJECTS = \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-systemd.lo \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-manager.lo \ src/src_libNetworkManagerBase_la-main-utils.lo \ - $(am__objects_25) + $(am__objects_24) src_libNetworkManagerBase_la_OBJECTS = \ $(am_src_libNetworkManagerBase_la_OBJECTS) src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_src_libNetworkManagerTest_la_OBJECTS = \ src/ndisc/src_libNetworkManagerTest_la-nm-fake-ndisc.lo \ src/platform/src_libNetworkManagerTest_la-nm-fake-platform.lo \ @@ -1545,6 +1613,7 @@ am_src_libsystemd_nm_la_OBJECTS = \ src/systemd/src/shared/src_libsystemd_nm_la-dns-domain.lo src_libsystemd_nm_la_OBJECTS = $(am_src_libsystemd_nm_la_OBJECTS) @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \ +@WITH_PPP_TRUE@ introspection/libnmdbus.la \ @WITH_PPP_TRUE@ $(am__DEPENDENCIES_1) am__src_ppp_libnm_ppp_plugin_la_SOURCES_DIST = \ src/ppp/nm-pppd-plugin.h src/ppp/nm-ppp-manager.c \ @@ -1596,7 +1665,8 @@ am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST = \ src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS = \ $(am_src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS) @CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnms_ibft_core_la_rpath = -@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST = \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h \ @@ -1636,6 +1706,39 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) @CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath = +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES = src/settings/plugins/ifnet/libnms-ifnet-core.la +am__src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES_DIST = \ + src/settings/plugins/ifnet/nms-ifnet-connection.c \ + src/settings/plugins/ifnet/nms-ifnet-connection.h \ + src/settings/plugins/ifnet/nms-ifnet-plugin.c \ + src/settings/plugins/ifnet/nms-ifnet-plugin.h +@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS = src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS = $(am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LINK = \ + $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_rpath = \ +@CONFIG_PLUGIN_IFNET_TRUE@ -rpath $(pkglibdir) +src_settings_plugins_ifnet_libnms_ifnet_core_la_LIBADD = +am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST = \ + src/settings/plugins/ifnet/nms-ifnet-net-parser.c \ + src/settings/plugins/ifnet/nms-ifnet-net-parser.h \ + src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \ + src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \ + src/settings/plugins/ifnet/nms-ifnet-net-utils.h \ + src/settings/plugins/ifnet/nms-ifnet-net-utils.c \ + src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h \ + src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c +@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS = src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo +src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS = \ + $(am_src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) +@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnms_ifnet_core_la_rpath = @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(am__DEPENDENCIES_1) am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST = \ @@ -1673,11 +1776,12 @@ am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) \ @CONFIG_PLUGIN_IBFT_TRUE@am__EXEEXT_4 = src/settings/plugins/ibft/tests/test-ibft$(EXEEXT) @CONFIG_PLUGIN_IFCFG_RH_TRUE@am__EXEEXT_5 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT) @CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_6 = src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT) -@WITH_WIFI_TRUE@am__EXEEXT_7 = \ +@CONFIG_PLUGIN_IFNET_TRUE@am__EXEEXT_7 = src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT) +@WITH_WIFI_TRUE@am__EXEEXT_8 = \ @WITH_WIFI_TRUE@ src/devices/wifi/tests/test-general$(EXEEXT) -@HAVE_INTROSPECTION_TRUE@am__EXEEXT_8 = clients/common/tests/test-general$(EXEEXT) -@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_9 = clients/common/tests/test-general$(EXEEXT) -@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_10 = libnm-util/tests/test-settings-defaults$(EXEEXT) \ +@HAVE_INTROSPECTION_TRUE@am__EXEEXT_9 = clients/common/tests/test-general$(EXEEXT) +@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_10 = clients/common/tests/test-general$(EXEEXT) +@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_11 = libnm-util/tests/test-settings-defaults$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-crypto$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-secrets$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-general$(EXEEXT) \ @@ -1685,7 +1789,7 @@ am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-remote-settings-client$(EXEEXT) -am__EXEEXT_11 = libnm-core/tests/test-compare$(EXEEXT) \ +am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \ libnm-core/tests/test-crypto$(EXEEXT) \ libnm-core/tests/test-general$(EXEEXT) \ libnm-core/tests/test-keyfile$(EXEEXT) \ @@ -1696,7 +1800,8 @@ am__EXEEXT_11 = libnm-core/tests/test-compare$(EXEEXT) \ src/dhcp/tests/test-dhcp-utils$(EXEEXT) \ src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT) \ $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ - $(am__EXEEXT_7) src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \ + $(am__EXEEXT_7) $(am__EXEEXT_8) \ + src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \ src/platform/tests/test-link-fake$(EXEEXT) \ src/platform/tests/test-link-linux$(EXEEXT) \ src/platform/tests/test-address-fake$(EXEEXT) \ @@ -1708,7 +1813,7 @@ am__EXEEXT_11 = libnm-core/tests/test-compare$(EXEEXT) \ src/platform/tests/test-cleanup-fake$(EXEEXT) \ src/platform/tests/test-cleanup-linux$(EXEEXT) \ src/devices/tests/test-lldp$(EXEEXT) \ - src/devices/tests/test-acd$(EXEEXT) \ + src/devices/tests/test-arping$(EXEEXT) \ src/ndisc/tests/test-ndisc-fake$(EXEEXT) \ src/supplicant/tests/test-supplicant-config$(EXEEXT) \ src/tests/config/test-config$(EXEEXT) \ @@ -1717,19 +1822,20 @@ am__EXEEXT_11 = libnm-core/tests/test-compare$(EXEEXT) \ src/tests/test-ip4-config$(EXEEXT) \ src/tests/test-ip6-config$(EXEEXT) src/tests/test-dcb$(EXEEXT) \ src/tests/test-systemd$(EXEEXT) \ + src/tests/test-resolvconf-capture$(EXEEXT) \ src/tests/test-wired-defname$(EXEEXT) \ src/tests/test-utils$(EXEEXT) \ - dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_8) \ - $(am__EXEEXT_9) $(am__EXEEXT_10) -@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_12 = libnm-util/tests/test-libnm-linking$(EXEEXT) \ + dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_9) \ + $(am__EXEEXT_10) $(am__EXEEXT_11) +@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_13 = libnm-util/tests/test-libnm-linking$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test$(EXEEXT) -@WITH_QT_TRUE@am__EXEEXT_13 = \ +@WITH_QT_TRUE@am__EXEEXT_14 = \ @WITH_QT_TRUE@ examples/C/qt/add-connection-wired$(EXEEXT) \ @WITH_QT_TRUE@ examples/C/qt/list-connections$(EXEEXT) \ @WITH_QT_TRUE@ examples/C/qt/change-ipv4-addresses$(EXEEXT) \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running$(EXEEXT) -am__EXEEXT_14 = src/platform/tests/monitor$(EXEEXT) \ - src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_12) \ +am__EXEEXT_15 = src/platform/tests/monitor$(EXEEXT) \ + src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_13) \ examples/C/glib/add-connection-gdbus$(EXEEXT) \ examples/C/glib/add-connection-libnm$(EXEEXT) \ examples/C/glib/get-active-connections-gdbus$(EXEEXT) \ @@ -1738,9 +1844,9 @@ am__EXEEXT_14 = src/platform/tests/monitor$(EXEEXT) \ examples/C/glib/list-connections-libnm$(EXEEXT) \ examples/C/glib/monitor-nm-running-gdbus$(EXEEXT) \ examples/C/glib/monitor-nm-state-gdbus$(EXEEXT) \ - $(am__EXEEXT_13) -@ENABLE_TESTS_FALSE@am__EXEEXT_15 = $(am__EXEEXT_11) $(am__EXEEXT_14) -@ENABLE_TESTS_TRUE@am__EXEEXT_16 = $(am__EXEEXT_11) $(am__EXEEXT_14) + $(am__EXEEXT_14) +@ENABLE_TESTS_FALSE@am__EXEEXT_16 = $(am__EXEEXT_12) $(am__EXEEXT_15) +@ENABLE_TESTS_TRUE@am__EXEEXT_17 = $(am__EXEEXT_12) $(am__EXEEXT_15) PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) \ $(sbin_PROGRAMS) am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \ @@ -1753,7 +1859,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \ clients/cli/polkit-agent.c clients/cli/polkit-agent.h \ clients/common/nm-polkit-listener.c \ clients/common/nm-polkit-listener.h -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_26 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_25 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT) @BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS = clients/cli/clients_cli_nmcli-common.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-utils.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-agent.$(OBJEXT) \ @@ -1763,7 +1869,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-settings.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-nmcli.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-polkit-agent.$(OBJEXT) \ -@BUILD_NMCLI_TRUE@ $(am__objects_26) +@BUILD_NMCLI_TRUE@ $(am__objects_25) clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS) @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \ @@ -1781,10 +1887,6 @@ clients_common_tests_test_general_OBJECTS = clients/common/tests/clients_common_ clients_common_tests_test_general_DEPENDENCIES = libnm/libnm.la \ clients/common/libnmc-base.la clients/common/libnmc.la \ $(am__DEPENDENCIES_1) -clients_common_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(clients_common_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@ clients_nm_online_SOURCES = clients/nm-online.c clients_nm_online_OBJECTS = \ clients/clients_nm_online-nm-online.$(OBJEXT) @@ -1893,8 +1995,8 @@ clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -o $@ am_dispatcher_nm_dispatcher_OBJECTS = \ dispatcher/dispatcher_nm_dispatcher-nm-dispatcher.$(OBJEXT) -am__objects_27 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) -nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_27) +am__objects_26 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) +nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_26) dispatcher_nm_dispatcher_OBJECTS = \ $(am_dispatcher_nm_dispatcher_OBJECTS) \ $(nodist_dispatcher_nm_dispatcher_OBJECTS) @@ -1909,11 +2011,6 @@ dispatcher_tests_test_dispatcher_envp_SOURCES = \ dispatcher_tests_test_dispatcher_envp_OBJECTS = dispatcher/tests/dispatcher_tests_test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT) dispatcher_tests_test_dispatcher_envp_DEPENDENCIES = libnm/libnm.la \ dispatcher/libnm-dispatcher-core.la $(am__DEPENDENCIES_1) -dispatcher_tests_test_dispatcher_envp_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(dispatcher_tests_test_dispatcher_envp_LDFLAGS) $(LDFLAGS) -o \ - $@ examples_C_glib_add_connection_gdbus_SOURCES = \ examples/C/glib/add-connection-gdbus.c examples_C_glib_add_connection_gdbus_OBJECTS = examples/C/glib/examples_C_glib_add_connection_gdbus-add-connection-gdbus.$(OBJEXT) @@ -1987,61 +2084,32 @@ libnm_core_tests_test_compare_SOURCES = \ libnm_core_tests_test_compare_OBJECTS = libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT) am__DEPENDENCIES_9 = libnm-core/libnm-core.la $(am__DEPENDENCIES_1) libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_9) -libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_core_tests_test_compare_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_crypto_SOURCES = libnm-core/tests/test-crypto.c libnm_core_tests_test_crypto_OBJECTS = libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT) libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_9) -libnm_core_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libnm_core_tests_test_crypto_LDFLAGS) \ - $(LDFLAGS) -o $@ am_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT) nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT) libnm_core_tests_test_general_OBJECTS = \ $(am_libnm_core_tests_test_general_OBJECTS) \ $(nodist_libnm_core_tests_test_general_OBJECTS) libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_9) -libnm_core_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_core_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_keyfile_SOURCES = \ libnm-core/tests/test-keyfile.c libnm_core_tests_test_keyfile_OBJECTS = libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT) libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_9) -libnm_core_tests_test_keyfile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_core_tests_test_keyfile_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_secrets_SOURCES = \ libnm-core/tests/test-secrets.c libnm_core_tests_test_secrets_OBJECTS = libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT) libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_9) -libnm_core_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_core_tests_test_secrets_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_setting_SOURCES = \ libnm-core/tests/test-setting.c libnm_core_tests_test_setting_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT) libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_9) -libnm_core_tests_test_setting_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_core_tests_test_setting_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_settings_defaults_SOURCES = \ libnm-core/tests/test-settings-defaults.c libnm_core_tests_test_settings_defaults_OBJECTS = libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT) libnm_core_tests_test_settings_defaults_DEPENDENCIES = \ $(am__DEPENDENCIES_9) -libnm_core_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_core_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \ - -o $@ libnm_glib_libnm_glib_test_SOURCES = libnm-glib/libnm-glib-test.c libnm_glib_libnm_glib_test_OBJECTS = libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_DEPENDENCIES = \ @@ -2086,107 +2154,58 @@ libnm_util_tests_test_crypto_OBJECTS = libnm-util/tests/libnm_util_tests_test_cr @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libtest-crypto.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) -libnm_util_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libnm_util_tests_test_crypto_LDFLAGS) \ - $(LDFLAGS) -o $@ libnm_util_tests_test_general_SOURCES = \ libnm-util/tests/test-general.c libnm_util_tests_test_general_OBJECTS = libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT) -libnm_util_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_util_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@ libnm_util_tests_test_libnm_linking_SOURCES = \ libnm-util/tests/test-libnm-linking.c libnm_util_tests_test_libnm_linking_OBJECTS = libnm-util/tests/libnm_util_tests_test_libnm_linking-test-libnm-linking.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm/libnm.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) -libnm_util_tests_test_libnm_linking_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_util_tests_test_libnm_linking_LDFLAGS) $(LDFLAGS) -o \ - $@ libnm_util_tests_test_secrets_SOURCES = \ libnm-util/tests/test-secrets.c libnm_util_tests_test_secrets_OBJECTS = libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) -libnm_util_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_util_tests_test_secrets_LDFLAGS) $(LDFLAGS) -o $@ libnm_util_tests_test_setting_8021x_SOURCES = \ libnm-util/tests/test-setting-8021x.c libnm_util_tests_test_setting_8021x_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) -libnm_util_tests_test_setting_8021x_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_util_tests_test_setting_8021x_LDFLAGS) $(LDFLAGS) -o \ - $@ libnm_util_tests_test_setting_dcb_SOURCES = \ libnm-util/tests/test-setting-dcb.c libnm_util_tests_test_setting_dcb_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) -libnm_util_tests_test_setting_dcb_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_util_tests_test_setting_dcb_LDFLAGS) $(LDFLAGS) -o $@ libnm_util_tests_test_settings_defaults_SOURCES = \ libnm-util/tests/test-settings-defaults.c libnm_util_tests_test_settings_defaults_OBJECTS = libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) -libnm_util_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_util_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \ - -o $@ am_libnm_tests_test_general_OBJECTS = \ - shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT) \ libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT) libnm_tests_test_general_OBJECTS = \ $(am_libnm_tests_test_general_OBJECTS) am__DEPENDENCIES_11 = libnm/libnm.la $(am__DEPENDENCIES_1) libnm_tests_test_general_DEPENDENCIES = libnm/libnm-utils.la \ $(am__DEPENDENCIES_11) -libnm_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_general_LDFLAGS) \ - $(LDFLAGS) -o $@ am_libnm_tests_test_nm_client_OBJECTS = shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT) libnm_tests_test_nm_client_OBJECTS = \ $(am_libnm_tests_test_nm_client_OBJECTS) libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_11) -libnm_tests_test_nm_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_nm_client_LDFLAGS) \ - $(LDFLAGS) -o $@ am_libnm_tests_test_remote_settings_client_OBJECTS = shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT) libnm_tests_test_remote_settings_client_OBJECTS = \ $(am_libnm_tests_test_remote_settings_client_OBJECTS) libnm_tests_test_remote_settings_client_DEPENDENCIES = \ $(am__DEPENDENCIES_11) -libnm_tests_test_remote_settings_client_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_tests_test_remote_settings_client_LDFLAGS) $(LDFLAGS) \ - -o $@ am_libnm_tests_test_secret_agent_OBJECTS = shared/libnm_tests_test_secret_agent-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT) libnm_tests_test_secret_agent_OBJECTS = \ $(am_libnm_tests_test_secret_agent_OBJECTS) libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_11) -libnm_tests_test_secret_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(libnm_tests_test_secret_agent_LDFLAGS) $(LDFLAGS) -o $@ am_src_NetworkManager_OBJECTS = src/src_NetworkManager-main.$(OBJEXT) src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS) src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la @@ -2194,14 +2213,15 @@ src_NetworkManager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_NetworkManager_LDFLAGS) \ $(LDFLAGS) -o $@ -src_devices_tests_test_acd_SOURCES = src/devices/tests/test-acd.c -src_devices_tests_test_acd_OBJECTS = src/devices/tests/src_devices_tests_test_acd-test-acd.$(OBJEXT) -src_devices_tests_test_acd_DEPENDENCIES = \ +src_devices_tests_test_arping_SOURCES = \ + src/devices/tests/test-arping.c +src_devices_tests_test_arping_OBJECTS = src/devices/tests/src_devices_tests_test_arping-test-arping.$(OBJEXT) +src_devices_tests_test_arping_DEPENDENCIES = \ src/libNetworkManagerTest.la -src_devices_tests_test_acd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +src_devices_tests_test_arping_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(src_devices_tests_test_acd_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(AM_CFLAGS) $(CFLAGS) \ + $(src_devices_tests_test_arping_LDFLAGS) $(LDFLAGS) -o $@ src_devices_tests_test_lldp_SOURCES = src/devices/tests/test-lldp.c src_devices_tests_test_lldp_OBJECTS = src/devices/tests/src_devices_tests_test_lldp-test-lldp.$(OBJEXT) src_devices_tests_test_lldp_DEPENDENCIES = \ @@ -2222,11 +2242,6 @@ src_devices_wifi_tests_test_general_OBJECTS = \ $(am_src_devices_wifi_tests_test_general_OBJECTS) @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_DEPENDENCIES = \ @WITH_WIFI_TRUE@ src/libNetworkManagerTest.la -src_devices_wifi_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(src_devices_wifi_tests_test_general_LDFLAGS) $(LDFLAGS) -o \ - $@ am_src_dhcp_nm_dhcp_helper_OBJECTS = \ src/dhcp/src_dhcp_nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT) src_dhcp_nm_dhcp_helper_OBJECTS = \ @@ -2241,28 +2256,15 @@ src_dhcp_tests_test_dhcp_dhclient_SOURCES = \ src_dhcp_tests_test_dhcp_dhclient_OBJECTS = src/dhcp/tests/src_dhcp_tests_test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT) src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES = \ $(src_dhcp_tests_ldadd) -src_dhcp_tests_test_dhcp_dhclient_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(src_dhcp_tests_test_dhcp_dhclient_LDFLAGS) $(LDFLAGS) -o $@ src_dhcp_tests_test_dhcp_utils_SOURCES = \ src/dhcp/tests/test-dhcp-utils.c src_dhcp_tests_test_dhcp_utils_OBJECTS = src/dhcp/tests/src_dhcp_tests_test_dhcp_utils-test-dhcp-utils.$(OBJEXT) src_dhcp_tests_test_dhcp_utils_DEPENDENCIES = $(src_dhcp_tests_ldadd) -src_dhcp_tests_test_dhcp_utils_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(src_dhcp_tests_test_dhcp_utils_LDFLAGS) $(LDFLAGS) -o $@ src_dnsmasq_tests_test_dnsmasq_utils_SOURCES = \ src/dnsmasq/tests/test-dnsmasq-utils.c src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS = src/dnsmasq/tests/src_dnsmasq_tests_test_dnsmasq_utils-test-dnsmasq-utils.$(OBJEXT) src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES = \ src/libNetworkManagerTest.la -src_dnsmasq_tests_test_dnsmasq_utils_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS) $(LDFLAGS) -o \ - $@ src_ndisc_tests_test_ndisc_fake_SOURCES = \ src/ndisc/tests/test-ndisc-fake.c src_ndisc_tests_test_ndisc_fake_OBJECTS = src/ndisc/tests/src_ndisc_tests_test_ndisc_fake-test-ndisc-fake.$(OBJEXT) @@ -2288,7 +2290,7 @@ src_nm_iface_helper_OBJECTS = $(am_src_nm_iface_helper_OBJECTS) src_nm_iface_helper_DEPENDENCIES = src/libNetworkManagerBase.la \ src/libsystemd-nm.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_nm_iface_helper_LDFLAGS) \ @@ -2296,7 +2298,8 @@ src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ src_platform_tests_monitor_SOURCES = src/platform/tests/monitor.c src_platform_tests_monitor_OBJECTS = src/platform/tests/src_platform_tests_monitor-monitor.$(OBJEXT) am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_13) src_platform_tests_monitor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -2418,6 +2421,16 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK = $(LIBTOOL) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS) \ $(LDFLAGS) -o $@ +src_settings_plugins_ifnet_tests_test_ifnet_SOURCES = \ + src/settings/plugins/ifnet/tests/test-ifnet.c +src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS = src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.$(OBJEXT) +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES = src/settings/plugins/ifnet/libnms-ifnet-core.la \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/libNetworkManagerTest.la +src_settings_plugins_ifnet_tests_test_ifnet_LINK = $(LIBTOOL) \ + $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS) \ + $(LDFLAGS) -o $@ src_settings_plugins_ifupdown_tests_test_ifupdown_SOURCES = \ src/settings/plugins/ifupdown/tests/test-ifupdown.c src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS = src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.$(OBJEXT) @@ -2443,21 +2456,12 @@ src_supplicant_tests_test_supplicant_config_SOURCES = \ src_supplicant_tests_test_supplicant_config_OBJECTS = src/supplicant/tests/src_supplicant_tests_test_supplicant_config-test-supplicant-config.$(OBJEXT) src_supplicant_tests_test_supplicant_config_DEPENDENCIES = \ src/libNetworkManagerTest.la -src_supplicant_tests_test_supplicant_config_LINK = $(LIBTOOL) \ - $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(src_supplicant_tests_test_supplicant_config_LDFLAGS) \ - $(LDFLAGS) -o $@ am_src_tests_config_test_config_OBJECTS = src/tests/config/src_tests_config_test_config-nm-test-device.$(OBJEXT) \ src/tests/config/src_tests_config_test_config-test-config.$(OBJEXT) src_tests_config_test_config_OBJECTS = \ $(am_src_tests_config_test_config_OBJECTS) src_tests_config_test_config_DEPENDENCIES = \ src/libNetworkManagerTest.la -src_tests_config_test_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(src_tests_config_test_config_LDFLAGS) \ - $(LDFLAGS) -o $@ src_tests_test_dcb_SOURCES = src/tests/test-dcb.c src_tests_test_dcb_OBJECTS = \ src/tests/src_tests_test_dcb-test-dcb.$(OBJEXT) @@ -2498,6 +2502,14 @@ src_tests_test_ip6_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_tests_test_ip6_config_LDFLAGS) \ $(LDFLAGS) -o $@ +src_tests_test_resolvconf_capture_SOURCES = \ + src/tests/test-resolvconf-capture.c +src_tests_test_resolvconf_capture_OBJECTS = src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.$(OBJEXT) +src_tests_test_resolvconf_capture_DEPENDENCIES = $(src_tests_ldadd) +src_tests_test_resolvconf_capture_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(src_tests_test_resolvconf_capture_LDFLAGS) $(LDFLAGS) -o $@ am_src_tests_test_systemd_OBJECTS = \ shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT) \ src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT) @@ -2586,11 +2598,9 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(libnm_util_libnm_util_la_SOURCES) \ $(nodist_libnm_util_libnm_util_la_SOURCES) \ $(libnm_util_libtest_crypto_la_SOURCES) \ - $(libnm_libnm_utils_la_SOURCES) \ - $(nodist_libnm_libnm_utils_la_SOURCES) \ - $(libnm_libnm_la_SOURCES) $(nodist_libnm_libnm_la_SOURCES) \ + $(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \ + $(nodist_libnm_libnm_la_SOURCES) \ $(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \ - $(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \ $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES) \ $(src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \ @@ -2609,6 +2619,8 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES) \ $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) \ $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES) \ + $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES) \ + $(src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES) \ $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES) \ $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES) \ $(clients_cli_nmcli_SOURCES) \ @@ -2649,7 +2661,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(libnm_tests_test_nm_client_SOURCES) \ $(libnm_tests_test_remote_settings_client_SOURCES) \ $(libnm_tests_test_secret_agent_SOURCES) \ - $(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \ + $(src_NetworkManager_SOURCES) src/devices/tests/test-arping.c \ src/devices/tests/test-lldp.c \ $(src_devices_wifi_tests_test_general_SOURCES) \ $(src_dhcp_nm_dhcp_helper_SOURCES) \ @@ -2671,12 +2683,14 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(src_platform_tests_test_route_linux_SOURCES) \ src/settings/plugins/ibft/tests/test-ibft.c \ $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES) \ + src/settings/plugins/ifnet/tests/test-ifnet.c \ src/settings/plugins/ifupdown/tests/test-ifupdown.c \ src/settings/plugins/keyfile/tests/test-keyfile.c \ src/supplicant/tests/test-supplicant-config.c \ $(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \ src/tests/test-general.c src/tests/test-general-with-expect.c \ src/tests/test-ip4-config.c src/tests/test-ip6-config.c \ + src/tests/test-resolvconf-capture.c \ $(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \ src/tests/test-wired-defname.c DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ @@ -2691,7 +2705,6 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(am__libnm_util_libtest_crypto_la_SOURCES_DIST) \ $(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \ $(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \ - $(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \ $(am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST) \ $(am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \ @@ -2699,7 +2712,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST) \ $(am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \ $(am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST) \ - $(src_libNetworkManager_la_SOURCES) \ + $(am__src_libNetworkManager_la_SOURCES_DIST) \ $(am__src_libNetworkManagerBase_la_SOURCES_DIST) \ $(src_libNetworkManagerTest_la_SOURCES) \ $(src_libsystemd_nm_la_SOURCES) \ @@ -2709,6 +2722,8 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST) \ + $(am__src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES_DIST) \ + $(am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST) \ $(am__clients_cli_nmcli_SOURCES_DIST) \ @@ -2747,7 +2762,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(libnm_tests_test_nm_client_SOURCES) \ $(libnm_tests_test_remote_settings_client_SOURCES) \ $(libnm_tests_test_secret_agent_SOURCES) \ - $(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \ + $(src_NetworkManager_SOURCES) src/devices/tests/test-arping.c \ src/devices/tests/test-lldp.c \ $(am__src_devices_wifi_tests_test_general_SOURCES_DIST) \ $(src_dhcp_nm_dhcp_helper_SOURCES) \ @@ -2769,12 +2784,14 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(src_platform_tests_test_route_linux_SOURCES) \ src/settings/plugins/ibft/tests/test-ibft.c \ $(am__src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES_DIST) \ + src/settings/plugins/ifnet/tests/test-ifnet.c \ src/settings/plugins/ifupdown/tests/test-ifupdown.c \ src/settings/plugins/keyfile/tests/test-keyfile.c \ src/supplicant/tests/test-supplicant-config.c \ $(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \ src/tests/test-general.c src/tests/test-general-with-expect.c \ src/tests/test-ip4-config.c src/tests/test-ip6-config.c \ + src/tests/test-resolvconf-capture.c \ $(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \ src/tests/test-wired-defname.c RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -3173,7 +3190,7 @@ GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -3227,13 +3244,14 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBNDP_CFLAGS = @LIBNDP_CFLAGS@ LIBNDP_LIBS = @LIBNDP_LIBS@ +LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBS = @LIBS@ LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ -LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ @@ -3304,11 +3322,8 @@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ +SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ -SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@ -SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@ -SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@ -SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -3429,67 +3444,60 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LTLIBRARIES = introspection/libnmdbus.la \ libnm-core/libnm-core.la libnm/libnm-utils.la \ src/libNetworkManagerBase.la src/libNetworkManager.la \ - src/libsystemd-nm.la shared/libcsiphash.la shared/libnacd.la \ - $(am__append_24) $(am__append_29) $(am__append_35) \ - dispatcher/libnm-dispatcher-core.la $(am__append_89) \ - $(am__append_107) -check_LTLIBRARIES = $(am__append_109) -noinst_LIBRARIES = $(am__append_63) -noinst_DATA = $(am__append_17) + src/libsystemd-nm.la $(am__append_24) $(am__append_29) \ + $(am__append_35) $(am__append_39) \ + dispatcher/libnm-dispatcher-core.la $(am__append_92) \ + $(am__append_110) +check_LTLIBRARIES = $(am__append_112) +noinst_LIBRARIES = $(am__append_66) +noinst_DATA = $(am__append_16) ############################################################################### -lib_LTLIBRARIES = libnm/libnm.la $(am__append_68) +lib_LTLIBRARIES = libnm/libnm.la $(am__append_71) pkglib_LTLIBRARIES = $(core_plugins) ############################################################################### # src/devices/adsl ############################################################################### core_plugins = $(am__append_21) $(am__append_23) $(am__append_28) \ - $(am__append_34) src/devices/adsl/libnm-device-plugin-adsl.la \ - $(am__append_38) $(am__append_44) $(am__append_48) \ - $(am__append_50) -service_DATA = $(am__append_67) -man_MANS = $(am__append_100) + $(am__append_34) $(am__append_38) \ + src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_42) \ + $(am__append_48) $(am__append_51) $(am__append_53) +service_DATA = $(am__append_70) +man_MANS = $(am__append_103) examples_DATA = data/server.conf CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \ - $(am__append_16) src/NetworkManager.ver $(am__append_30) \ + src/NetworkManager.ver $(am__append_30) \ $(dispatcher_nmdbus_dispatcher_sources) \ dispatcher/org.freedesktop.nm_dispatcher.service \ data/NetworkManager.service \ data/NetworkManager-wait-online.service \ data/NetworkManager-dispatcher.service \ data/org.freedesktop.NetworkManager.service data/server.conf \ - $(am__append_90) $(am__append_91) man/common.ent \ - $(am__append_101) $(am__append_105) $(GLIB_GENERATED) \ + $(am__append_93) $(am__append_94) man/common.ent \ + $(am__append_104) $(am__append_108) $(GLIB_GENERATED) \ $(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \ - cscope.po.out $(NULL) $(am__append_111) + cscope.po.out $(NULL) $(am__append_114) DISTCLEANFILES = intltool-extract intltool-merge intltool-update \ - $(polkit_policy_DATA) libnm/libnm.pc $(am__append_51) \ - $(am__append_83) + $(polkit_policy_DATA) libnm/libnm.pc $(am__append_54) \ + $(am__append_86) # test-cert.p12 created with: # # openssl pkcs12 -export \ -# -in test_key_and_cert.pem \ -# -inkey test_key_and_cert.pem \ -# -certfile test_ca_cert.pem \ -# -name "test-pkcs12" \ -# -out test-cert.p12 +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 ############################################################################### -############################################################################### -# src/devices -############################################################################### - ############################################################################### # examples ############################################################################### -EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ - libnm-core/crypto_gnutls.c libnm-core/crypto_nss.c \ - libnm-core/nm-core-enum-types.c.template \ - libnm-core/nm-core-enum-types.h.template \ - libnm-core/meson.build \ +EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ + libnm-core/crypto_nss.c \ libnm-core/tests/certs/ca-no-ending-newline.pem \ libnm-core/tests/certs/pkcs8-decrypted.der \ libnm-core/tests/certs/pkcs8-enc-key.pem \ @@ -3506,23 +3514,17 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ libnm-core/tests/certs/test-key-and-cert.pem \ libnm-core/tests/certs/test-key-only-decrypted.der \ libnm-core/tests/certs/test-key-only-decrypted.pem \ - libnm-core/tests/certs/test-key-only.pem \ - libnm-core/tests/nm-core-tests-enum-types.c.template \ - libnm-core/tests/nm-core-tests-enum-types.h.template \ - libnm-core/tests/meson.build libnm/libnm.pc.in libnm/libnm.ver \ - libnm/fake-typelib/NetworkManager.gir \ - libnm/fake-typelib/NMClient.gir \ - libnm/fake-typelib/typelibs.gresource.xml \ - libnm/fake-typelib/meson.build $(am__append_18) \ + libnm-core/tests/certs/test-key-only.pem libnm/libnm.pc.in \ + libnm/libnm.ver $(am__append_17) \ libnm/generate-setting-docs.py libnm/generate-plugin-docs.pl \ - libnm/nm-enum-types.c.template libnm/nm-enum-types.h.template \ - libnm/meson.build libnm/tests/meson.build \ - shared/c-list/src/c-list.h src/systemd/meson.build \ src/org.freedesktop.NetworkManager.conf \ - src/nm-test-utils-core.h src/meson.build src/dhcp/meson.build \ + src/nm-test-utils-core.h \ src/dhcp/tests/test-dhclient-duid.leases \ src/dhcp/tests/test-dhclient-commented-duid.leases \ - src/dhcp/tests/meson.build src/ppp/meson.build \ + src/dhcp/tests/leases/basic.leases \ + src/dhcp/tests/leases/malformed1.leases \ + src/dhcp/tests/leases/malformed2.leases \ + src/dhcp/tests/leases/malformed3.leases \ src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \ src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \ @@ -3560,9 +3562,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \ src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ - src/settings/plugins/keyfile/tests/meson.build \ - $(am__append_26) src/settings/plugins/ibft/meson.build \ - src/settings/plugins/ibft/tests/meson.build \ + $(am__append_26) \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \ @@ -3625,8 +3625,6 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \ - src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \ @@ -3754,8 +3752,6 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \ $(NULL) src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \ - src/settings/plugins/ifcfg-rh/meson.build \ - src/settings/plugins/ifcfg-rh/tests/meson.build \ src/settings/plugins/ifupdown/tests/test1 \ src/settings/plugins/ifupdown/tests/test2 \ src/settings/plugins/ifupdown/tests/test3 \ @@ -3779,19 +3775,14 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \ src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \ src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \ - src/settings/plugins/ifupdown/meson.build \ - src/settings/plugins/ifupdown/tests/meson.build \ - src/devices/meson.build src/devices/adsl/meson.build \ - src/devices/wwan/libnm-wwan.ver src/devices/wwan/meson.build \ - src/devices/bluetooth/meson.build src/devices/wifi/meson.build \ - src/devices/wifi/tests/meson.build \ - src/devices/team/meson.build data/NetworkManager-ovs.conf \ - src/devices/ovs/meson.build src/dnsmasq/tests/meson.build \ - src/platform/tests/meson.build src/devices/tests/meson.build \ - src/ndisc/tests/meson.build \ + src/settings/plugins/ifnet/tests/net \ + src/settings/plugins/ifnet/tests/net.all \ + src/settings/plugins/ifnet/tests/nm-system-settings.conf \ + src/settings/plugins/ifnet/tests/wpa_supplicant.conf \ + src/settings/plugins/ifnet/tests/test_ca_cert.pem \ + src/devices/wwan/libnm-wwan.ver data/NetworkManager-ovs.conf \ src/supplicant/tests/certs/test-ca-cert.pem \ src/supplicant/tests/certs/test-cert.p12 \ - src/supplicant/tests/meson.build \ src/tests/config/NetworkManager.conf \ src/tests/config/NetworkManager.state \ src/tests/config/bad.conf \ @@ -3800,10 +3791,9 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ src/tests/config/conf.d/10-more.conf \ src/tests/config/conf.d/20-config-enable-1.conf \ src/tests/config/conf.d/90-last.conf \ - src/tests/config/meson.build src/tests/test-secret-agent.py \ - src/tests/meson.build dispatcher/nm-dispatcher.conf \ + src/tests/test-secret-agent.py dispatcher/nm-dispatcher.conf \ dispatcher/org.freedesktop.nm_dispatcher.service.in \ - dispatcher/nm-dispatcher.xml dispatcher/meson.build \ + dispatcher/nm-dispatcher.xml \ dispatcher/tests/dispatcher-connectivity-full \ dispatcher/tests/dispatcher-connectivity-unknown \ dispatcher/tests/dispatcher-down \ @@ -3811,42 +3801,33 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ dispatcher/tests/dispatcher-up \ dispatcher/tests/dispatcher-vpn-down \ dispatcher/tests/dispatcher-vpn-up \ - dispatcher/tests/meson.build clients/meson.build \ - $(clients_common_settings_doc_h) \ - $(clients_common_settings_doc_h).in \ - clients/cli/nmcli-completion clients/cli/meson.build \ - clients/common/settings-docs.xsl clients/common/meson.build \ - clients/common/tests/meson.build clients/tui/meson.build \ - clients/tui/newt/meson.build data/NetworkManager.service.in \ + $(clients_common_settings_doc_c) \ + $(clients_common_settings_doc_c).in \ + clients/cli/nmcli-completion clients/common/settings-docs.xsl \ + data/NetworkManager.service.in \ data/NetworkManager-wait-online.service.in \ data/NetworkManager-wait-online-systemd-pre200.service.in \ data/NetworkManager-dispatcher.service.in \ data/org.freedesktop.NetworkManager.service.in \ data/84-nm-drivers.rules data/85-nm-unmanaged.rules \ - data/90-nm-thunderbolt.rules data/server.conf.in \ - data/meson.build $(am__append_76) libnm-glib/tests/meson.build \ - $(am__append_93) $(am__append_96) 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) \ - man/meson.build vapi/NM-1.0.metadata \ + data/server.conf.in $(am__append_79) $(am__append_96) \ + $(am__append_99) 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) vapi/NM-1.0.metadata \ vapi/NetworkManager-1.0.metadata vapi/NMClient-1.0.metadata \ vapi/libnm.deps vapi/libnm-util.deps vapi/libnm-glib.deps \ - vapi/meson.build CONTRIBUTING NetworkManager.pc.in \ - intltool-extract.in intltool-merge.in intltool-update.in \ - linker-script-binary.ver linker-script-devices.ver \ - linker-script-settings.ver src/ppp/nm-ppp-plugin.ver \ - Makefile.glib autogen.sh valgrind.suppressions meson.build \ - meson_options.txt meson_post_install.py config.h.meson \ - docs/meson.build po/meson.build shared/nm-common-macros.h \ + CONTRIBUTING NetworkManager.pc.in intltool-extract.in \ + intltool-merge.in intltool-update.in linker-script-binary.ver \ + linker-script-devices.ver linker-script-settings.ver \ + src/ppp/nm-ppp-plugin.ver Makefile.glib autogen.sh \ + valgrind.suppressions shared/nm-common-macros.h \ shared/nm-dbus-compat.h shared/nm-default.h \ shared/nm-dispatcher-api.h shared/nm-test-libnm-utils.h \ - shared/nm-test-utils-impl.c shared/nm-utils/c-list-util.c \ - shared/nm-utils/c-list-util.h \ + shared/nm-test-utils-impl.c shared/nm-utils/c-list.h \ + shared/nm-utils/c-list-util.c shared/nm-utils/c-list-util.h \ shared/nm-utils/gsystem-local-alloc.h \ - shared/nm-utils/nm-c-list.h shared/nm-utils/nm-compat.c \ - shared/nm-utils/nm-compat.h shared/nm-utils/nm-glib.h \ - shared/nm-utils/nm-jansson.h shared/nm-utils/nm-obj.h \ + shared/nm-utils/nm-glib.h shared/nm-utils/nm-obj.h \ shared/nm-utils/nm-macros-internal.h \ shared/nm-utils/nm-shared-utils.c \ shared/nm-utils/nm-shared-utils.h \ @@ -3855,21 +3836,19 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ shared/nm-utils/nm-vpn-plugin-macros.h \ shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.h \ - shared/nm-utils/siphash24.c shared/nm-utils/siphash24.h \ shared/nm-utils/unaligned.h shared/nm-version-macros.h.in \ - shared/meson.build tools/check-exports.sh \ - tools/create-exports-NetworkManager.sh tools/debug-helper.py \ - tools/run-nm-test.sh tools/test-networkmanager-service.py \ + tools/check-exports.sh tools/create-exports-NetworkManager.sh \ + tools/debug-helper.py tools/run-nm-test.sh \ + tools/test-networkmanager-service.py \ tools/test-sudo-wrapper.sh tools/enums-to-docbook.pl \ - src/settings/plugins/README src/settings/plugins/meson.build \ - $(NULL) examples/C/glib/meson.build \ + src/settings/plugins/README $(NULL) \ examples/C/qt/add-connection-wired.cpp \ examples/C/qt/list-connections.cpp \ examples/C/qt/change-ipv4-addresses.cpp \ - examples/C/qt/monitor-nm-running.cpp examples/C/qt/meson.build \ + examples/C/qt/monitor-nm-running.cpp \ examples/dispatcher/10-ifcfg-rh-routes.sh \ examples/dispatcher/70-wifi-wired-exclusive.sh \ - examples/js/get_ips.js examples/lua/lgi/add-connection.lua \ + examples/lua/lgi/add-connection.lua \ examples/lua/lgi/list-connections.lua \ examples/lua/lgi/list-devices.lua \ examples/lua/lgi/show-wifi-networks.lua \ @@ -3879,7 +3858,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ examples/lua/lgi/deactivate-all.lua \ examples/nm-conf.d/30-anon.conf \ examples/nm-conf.d/31-mac-addr-change.conf \ - examples/python/nmex.py examples/python/dbus/nm-state.py \ + examples/python/dbus/nm-state.py \ examples/python/dbus/add-connection.py \ examples/python/dbus/add-connection-compat.py \ examples/python/dbus/add-wifi-eap-connection.py \ @@ -3914,16 +3893,16 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ examples/shell/get-hostname.sh examples/shell/list-devices.sh \ examples/shell/disconnect-device.sh \ examples/shell/active-wifi.sh $(NULL) -EXTRA_LTLIBRARIES = $(am__append_54) +EXTRA_LTLIBRARIES = $(am__append_57) dist_hook = dist-hook-settings-ifcfg-rh-alias-files dist_dependencies = libnm-core/nm-vpn-dbus-types.xml \ - libnm-core/nm-dbus-types.xml $(am__append_86) $(am__append_94) \ - $(am__append_97) $(man_pages) $(man_pages_autogen) + libnm-core/nm-dbus-types.xml $(am__append_89) $(am__append_97) \ + $(am__append_100) $(man_pages) $(man_pages_autogen) dist_configure_check = $(am__append_3) $(am__append_4) -install_data_hook = install-data-hook-dispatcher $(am__append_61) \ - $(am__append_98) -install_exec_hook = $(am__append_65) -uninstall_hook = $(am__append_62) $(am__append_66) $(am__append_99) +install_data_hook = install-data-hook-dispatcher $(am__append_64) \ + $(am__append_101) +install_exec_hook = $(am__append_68) +uninstall_hook = $(am__append_65) $(am__append_69) $(am__append_102) BUILT_SOURCES = libnm-core/nm-vpn-dbus-types.xml \ libnm-core/nm-dbus-types.xml $(gir_DATA) $(typelib_DATA) GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ @@ -3931,12 +3910,12 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ libnm-core/tests/nm-core-tests-enum-types.h \ libnm-core/tests/nm-core-tests-enum-types.c \ $(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \ - $(am__append_69) + $(am__append_72) man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \ man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1 \ - $(am__append_92) -man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \ $(am__append_95) +man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \ + $(am__append_98) ############################################################################### @@ -3968,7 +3947,8 @@ check_programs = libnm-core/tests/test-compare \ src/dhcp/tests/test-dhcp-utils \ src/settings/plugins/keyfile/tests/test-keyfile \ $(am__append_25) $(am__append_32) $(am__append_37) \ - $(am__append_47) src/dnsmasq/tests/test-dnsmasq-utils \ + $(am__append_41) $(am__append_50) \ + src/dnsmasq/tests/test-dnsmasq-utils \ src/platform/tests/test-link-fake \ src/platform/tests/test-link-linux \ src/platform/tests/test-address-fake \ @@ -3979,17 +3959,18 @@ check_programs = libnm-core/tests/test-compare \ src/platform/tests/test-route-linux \ src/platform/tests/test-cleanup-fake \ src/platform/tests/test-cleanup-linux \ - src/devices/tests/test-lldp src/devices/tests/test-acd \ + src/devices/tests/test-lldp src/devices/tests/test-arping \ src/ndisc/tests/test-ndisc-fake \ src/supplicant/tests/test-supplicant-config \ src/tests/config/test-config src/tests/test-general \ src/tests/test-general-with-expect src/tests/test-ip4-config \ src/tests/test-ip6-config src/tests/test-dcb \ - src/tests/test-systemd src/tests/test-wired-defname \ - src/tests/test-utils dispatcher/tests/test-dispatcher-envp \ - $(am__append_55) $(am__append_56) $(am__append_87) + src/tests/test-systemd src/tests/test-resolvconf-capture \ + src/tests/test-wired-defname src/tests/test-utils \ + dispatcher/tests/test-dispatcher-envp $(am__append_58) \ + $(am__append_59) $(am__append_90) check_programs_norun = src/platform/tests/monitor \ - src/ndisc/tests/test-ndisc-linux $(am__append_88) \ + src/ndisc/tests/test-ndisc-linux $(am__append_91) \ examples/C/glib/add-connection-gdbus \ examples/C/glib/add-connection-libnm \ examples/C/glib/get-active-connections-gdbus \ @@ -3997,7 +3978,7 @@ check_programs_norun = src/platform/tests/monitor \ examples/C/glib/list-connections-gdbus \ examples/C/glib/list-connections-libnm \ examples/C/glib/monitor-nm-running-gdbus \ - examples/C/glib/monitor-nm-state-gdbus $(am__append_110) + examples/C/glib/monitor-nm-state-gdbus $(am__append_113) ############################################################################### @@ -4006,33 +3987,33 @@ check_programs_norun = src/platform/tests/monitor \ ############################################################################### check_ltlibraries = libnm/tests/libnm-vpn-plugin-utils-test.la \ src/libNetworkManagerTest.la clients/common/libnmc-base.la \ - $(am__append_53) $(am__append_77) + $(am__append_56) $(am__append_80) check_local = check-local-exports-libnm $(am__append_27) \ - $(am__append_31) $(am__append_36) check-local-devices-adsl \ - $(am__append_40) $(am__append_46) $(am__append_49) \ - $(am__append_52) $(am__append_85) -VAPIGEN_VAPIS = $(am__append_102) $(am__append_103) + $(am__append_31) $(am__append_36) $(am__append_40) \ + check-local-devices-adsl $(am__append_44) $(am__append_49) \ + $(am__append_52) $(am__append_55) $(am__append_88) +VAPIGEN_VAPIS = $(am__append_105) $(am__append_106) dbusservice_DATA = $(am__append_33) dispatcher/nm-dispatcher.conf \ src/org.freedesktop.NetworkManager.conf dbusactivation_DATA = \ dispatcher/org.freedesktop.nm_dispatcher.service -INTROSPECTION_GIRS = $(am__append_15) $(am__append_84) +INTROSPECTION_GIRS = $(am__append_15) $(am__append_87) INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = # Pass SANITIZER_ENV where a command that uses built libraries is # executed, to suppress possible errors -INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) LDFLAGS="$(SANITIZER_LIB_LDFLAGS)" +INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) libnmincludedir = $(includedir)/libnm libnminclude_HEADERS = $(libnm_core_lib_h_pub_real) \ - $(libnm_lib_h_pub_real) + $(libnm_lib_h_pub_real) $(libnm_lib_h_pub_nointrospect) nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \ $(libnm_lib_h_pub_mkenums) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_82) +pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_85) pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugin_LTLIBRARIES = $(am__append_22) vapidir = $(datadir)/vala/vapi -vapi_DATA = $(am__append_104) +vapi_DATA = $(am__append_107) examplesdir = $(docdir)/examples rundir = $(runstatedir)/NetworkManager statedir = $(localstatedir)/lib/NetworkManager @@ -4046,13 +4027,12 @@ SUBDIRS = . po $(am__append_1) $(am__append_2) ############################################################################### set_sanitizer_env = \ [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ - if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \ - [ -n "$(1)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ - [ -n "$(2)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(2) | grep libasan\.so\.. -o | head -n 1)"; \ + if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \ + export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ fi check_so_symbols = \ - $(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \ + $(call set_sanitizer_env,$(1)); \ LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null @@ -4066,6 +4046,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ + --enable-ifnet \ --disable-dependency-tracking @@ -4075,7 +4056,15 @@ dist_polkit_policy_in_in_files = \ data/org.freedesktop.NetworkManager.policy.in.in polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy) -introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS) + +# gdbus-codegen 2.38 will emit code that requires glib 2.38, which +# will then cause availability warnings if we define +# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32. +# +# This is fixed in GLib 2.40 (it emits code that takes +# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go +# away when we depend on that. +introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) introspection_sources = \ introspection/org.freedesktop.NetworkManager.AccessPoint.c \ introspection/org.freedesktop.NetworkManager.AccessPoint.h \ @@ -4327,59 +4316,45 @@ libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \ libnm-core/nm-property-compare.h \ libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \ $(am__append_6) -libnm_core_lib_c_settings_real = \ - libnm-core/nm-setting-8021x.c \ - libnm-core/nm-setting-adsl.c \ - libnm-core/nm-setting-bluetooth.c \ +libnm_core_lib_c_real = shared/nm-utils/c-list-util.c \ + shared/nm-utils/nm-dedup-multi.c \ + shared/nm-utils/nm-enum-utils.c \ + shared/nm-utils/nm-hash-utils.c \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-random-utils.c \ + shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \ + shared/nm-meta-setting.c libnm-core/crypto.c \ + libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \ + libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \ + libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \ + libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \ + libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \ libnm-core/nm-setting-bond.c \ libnm-core/nm-setting-bridge-port.c \ - libnm-core/nm-setting-bridge.c \ - libnm-core/nm-setting-cdma.c \ - libnm-core/nm-setting-connection.c \ - libnm-core/nm-setting-dcb.c \ - libnm-core/nm-setting-dummy.c \ - libnm-core/nm-setting-generic.c \ - libnm-core/nm-setting-gsm.c \ - libnm-core/nm-setting-infiniband.c \ + libnm-core/nm-setting-bridge.c libnm-core/nm-setting-cdma.c \ + libnm-core/nm-setting-connection.c libnm-core/nm-setting-dcb.c \ + libnm-core/nm-setting-dummy.c libnm-core/nm-setting-generic.c \ + libnm-core/nm-setting-gsm.c libnm-core/nm-setting-infiniband.c \ libnm-core/nm-setting-ip-config.c \ libnm-core/nm-setting-ip-tunnel.c \ libnm-core/nm-setting-ip4-config.c \ libnm-core/nm-setting-ip6-config.c \ - libnm-core/nm-setting-macsec.c \ - libnm-core/nm-setting-macvlan.c \ + libnm-core/nm-setting-macsec.c libnm-core/nm-setting-macvlan.c \ libnm-core/nm-setting-olpc-mesh.c \ libnm-core/nm-setting-ovs-bridge.c \ libnm-core/nm-setting-ovs-interface.c \ libnm-core/nm-setting-ovs-patch.c \ - libnm-core/nm-setting-ovs-port.c \ - libnm-core/nm-setting-ppp.c \ - libnm-core/nm-setting-pppoe.c \ - libnm-core/nm-setting-proxy.c \ + libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \ + libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \ libnm-core/nm-setting-serial.c \ libnm-core/nm-setting-tc-config.c \ - libnm-core/nm-setting-team-port.c \ - libnm-core/nm-setting-team.c \ - libnm-core/nm-setting-tun.c \ - libnm-core/nm-setting-user.c \ - libnm-core/nm-setting-vlan.c \ - libnm-core/nm-setting-vpn.c \ - libnm-core/nm-setting-vxlan.c \ - libnm-core/nm-setting-wimax.c \ + libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \ + libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \ + libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \ + libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \ libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c - -libnm_core_lib_c_real = $(libnm_core_lib_c_settings_real) \ - shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-udev-utils.c shared/nm-meta-setting.c \ - libnm-core/crypto.c libnm-core/nm-connection.c \ - libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \ - libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \ - libnm-core/nm-property-compare.c libnm-core/nm-setting.c \ + libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \ libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ libnm-core/nm-vpn-plugin-info.c $(am__append_7) \ @@ -4392,15 +4367,19 @@ libnm_core_lib_c_mkenums = \ dflt_cppflags_libnm_core = -I$(srcdir)/shared -I$(builddir)/shared \ -I$(srcdir)/libnm-core -I$(builddir)/libnm-core \ $(CODE_COVERAGE_CFLAGS) $(GLIB_CFLAGS) $(LIBUDEV_CFLAGS) \ - $(SANITIZER_LIB_CFLAGS) $(am__append_8) $(am__append_9) + $(am__append_8) $(am__append_9) $(am__append_10) nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' -libnm_core_libnm_core_la_CPPFLAGS = $(dflt_cppflags_libnm_core) \ +libnm_core_libnm_core_la_CPPFLAGS = \ + $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ - -DLOCALEDIR=\"$(datadir)/locale\" -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLIBDIR=\"$(nmlibdir)\" -DNMPLUGINDIR=\"$(pkglibdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" $(NULL) $(am__append_10) + -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DNMLIBDIR=\"$(nmlibdir)\" \ + -DNMPLUGINDIR=\"$(pkglibdir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB + libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_h_pub_real) \ $(libnm_core_lib_h_priv) \ @@ -4413,16 +4392,13 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ libnm_core_libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) \ $(LIBUDEV_LIBS) $(am__append_12) $(am__append_14) libnm_core_libnm_core_la_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_LIB_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h libnm_core_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) @@ -4444,9 +4420,6 @@ libnm_core_tests_ldadd = \ libnm-core/libnm-core.la \ $(GLIB_LIBS) -libnm_core_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) - libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd) @@ -4454,13 +4427,6 @@ libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd) -libnm_core_tests_test_compare_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_crypto_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_general_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_keyfile_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_secrets_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_setting_LDFLAGS = $(libnm_core_tests_ldflags) -libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags) ############################################################################### libnm_lib_h_pub_real = \ @@ -4468,8 +4434,6 @@ libnm_lib_h_pub_real = \ libnm/NetworkManager.h \ libnm/nm-access-point.h \ libnm/nm-active-connection.h \ - libnm/nm-autoptr.h \ - libnm/nm-checkpoint.h \ libnm/nm-client.h \ libnm/nm-device-adsl.h \ libnm/nm-device-bond.h \ @@ -4499,14 +4463,16 @@ libnm_lib_h_pub_real = \ libnm/nm-ip-config.h \ libnm/nm-object.h \ libnm/nm-remote-connection.h \ - libnm/nm-secret-agent-old.h \ libnm/nm-types.h \ libnm/nm-vpn-connection.h \ libnm/nm-vpn-editor.h \ - libnm/nm-vpn-plugin-old.h \ - libnm/nm-vpn-service-plugin.h \ libnm/nm-wimax-nsp.h +libnm_lib_h_pub_nointrospect = \ + libnm/nm-secret-agent-old.h \ + libnm/nm-vpn-plugin-old.h \ + libnm/nm-vpn-service-plugin.h + libnm_lib_h_pub_mkenums = \ libnm/nm-enum-types.h @@ -4527,7 +4493,6 @@ libnm_lib_h_priv = \ libnm_lib_c_real = \ libnm/nm-access-point.c \ libnm/nm-active-connection.c \ - libnm/nm-checkpoint.c \ libnm/nm-client.c \ libnm/nm-dbus-helpers.c \ libnm/nm-device-adsl.c \ @@ -4580,11 +4545,10 @@ libnm_lib_cppflags = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNMRUNDIR=\"$(nmrundir)\" libnm_libnm_utils_la_CPPFLAGS = \ - $(INTROSPECTION_CFLAGS) \ $(libnm_lib_cppflags) libnm_libnm_utils_la_SOURCES = \ @@ -4597,17 +4561,18 @@ libnm_libnm_utils_la_LIBADD = \ nm_enum_types_sources = \ $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_h_pub_real) + $(libnm_lib_h_pub_real) \ + $(libnm_lib_h_pub_nointrospect) nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' libnm_libnm_la_CPPFLAGS = \ $(libnm_lib_cppflags) \ - $(LIBUDEV_CFLAGS) \ - $(SANITIZER_LIB_CFLAGS) + $(LIBUDEV_CFLAGS) libnm_libnm_la_SOURCES = \ $(libnm_lib_h_pub_real) \ + $(libnm_lib_h_pub_nointrospect) \ $(libnm_lib_h_priv) \ $(libnm_lib_c_real) @@ -4628,7 +4593,6 @@ libnm_libnm_la_LIBADD = \ libnm_libnm_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_LIB_LDFLAGS) \ -version-info "1:0:1" @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_INCLUDES = Gio-2.0 @@ -4643,13 +4607,11 @@ libnm_libnm_la_LDFLAGS = \ @HAVE_INTROSPECTION_TRUE@ $(libnm_core_lib_c_real) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_h_pub_mkenums) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_h_pub_real) \ +@HAVE_INTROSPECTION_TRUE@ $(libnm_lib_h_pub_nointrospect) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_c_mkenums) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_c_real) @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_SOURCES = \ -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/typelibs.c - @HAVE_INTROSPECTION_TRUE@libnm_noinst_data = \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-property-docs.xml \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-settings-docs-overrides.xml \ @@ -4657,7 +4619,7 @@ libnm_libnm_la_LDFLAGS = \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-settings-keyfile-docs.xml \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-settings-ifcfg-rh-docs.xml -@HAVE_INTROSPECTION_TRUE@libnm_docs_sources = $(libnm_core_lib_c_settings_real) +@HAVE_INTROSPECTION_TRUE@libnm_docs_sources = $(libnm_core_lib_c_real) ############################################################################### libnm_tests_programs = \ @@ -4670,23 +4632,18 @@ libnm_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" libnm_tests_ldadd = \ libnm/libnm.la \ $(GLIB_LIBS) -libnm_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) - libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_general_SOURCES = \ - shared/nm-utils/nm-compat.c \ libnm/tests/test-general.c libnm_tests_test_nm_client_SOURCES = \ @@ -4711,10 +4668,6 @@ libnm_tests_test_general_LDADD = \ libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd) -libnm_tests_test_general_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags) -libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags) libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.h @@ -4726,10 +4679,7 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - $(GLIB_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + $(GLIB_CFLAGS) libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ $(GLIB_LIBS) @@ -4744,7 +4694,8 @@ src_cppflags = \ -I$(builddir)/src \ \ -DPREFIX=\"$(prefix)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ @@ -4767,6 +4718,7 @@ src_cppflags = \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ \ $(LIBUDEV_CFLAGS) \ + $(LIBNL_CFLAGS) \ $(LIBNDP_CFLAGS) \ $(LIBPSL_CFLAGS) \ $(LIBCURL_CFLAGS) \ @@ -4774,29 +4726,11 @@ src_cppflags = \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ \ $(NULL) src_ldflags = $(CODE_COVERAGE_LDFLAGS) -############################################################################### -shared_libcsiphash_la_CPPFLAGS = $(src_cppflags) -shared_libcsiphash_la_SOURCES = \ - shared/c-siphash/src/c-siphash.c \ - shared/c-siphash/src/c-siphash.h - -shared_libnacd_la_CFLAGS = -std=gnu99 -shared_libnacd_la_CPPFLAGS = \ - $(src_cppflags) \ - -I $(srcdir)/shared/c-list/src \ - -I $(srcdir)/shared/c-siphash/src - -shared_libnacd_la_SOURCES = \ - shared/n-acd/src/n-acd.c \ - shared/n-acd/src/n-acd.h - - ############################################################################### src_libsystemd_nm_la_cppflags = \ -I$(srcdir)/shared \ @@ -4811,7 +4745,6 @@ src_libsystemd_nm_la_cppflags = \ -I$(srcdir)/src/systemd/src/shared \ -I$(srcdir)/src/systemd/src/libsystemd-network \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ - $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) @@ -4831,29 +4764,23 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/sd-adapt/condition.h \ src/systemd/sd-adapt/conf-parser.h \ src/systemd/sd-adapt/def.h \ - src/systemd/sd-adapt/device-nodes.h \ src/systemd/sd-adapt/dirent-util.h \ src/systemd/sd-adapt/env-util.h \ - src/systemd/sd-adapt/errno-list.h \ src/systemd/sd-adapt/format-util.h \ - src/systemd/sd-adapt/glob-util.h \ src/systemd/sd-adapt/gunicode.h \ src/systemd/sd-adapt/ioprio.h \ src/systemd/sd-adapt/khash.h \ src/systemd/sd-adapt/libudev.h \ - src/systemd/sd-adapt/locale-util.h \ - src/systemd/sd-adapt/memfd-util.h \ src/systemd/sd-adapt/missing.h \ src/systemd/sd-adapt/mkdir.h \ - src/systemd/sd-adapt/procfs-util.h \ src/systemd/sd-adapt/raw-clone.h \ src/systemd/sd-adapt/sd-daemon.h \ src/systemd/sd-adapt/stat-util.h \ - src/systemd/sd-adapt/terminal-util.h \ src/systemd/sd-adapt/udev-util.h \ src/systemd/sd-adapt/udev.h \ src/systemd/sd-adapt/user-util.h \ src/systemd/sd-adapt/virt.h \ + src/systemd/sd-adapt/glob-util.h \ src/systemd/src/basic/alloc-util.c \ src/systemd/src/basic/alloc-util.h \ src/systemd/src/basic/async.h \ @@ -4971,7 +4898,6 @@ src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags) src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \ src/NetworkManagerUtils.c src/NetworkManagerUtils.h \ - src/platform/nm-netlink.c src/platform/nm-netlink.h \ src/platform/nmp-netns.c src/platform/nmp-netns.h \ src/platform/nmp-object.c src/platform/nmp-object.h \ src/platform/nm-platform-utils.c \ @@ -4985,17 +4911,17 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ src/platform/wifi/wifi-utils.c src/platform/wifi/wifi-utils.h \ src/ndisc/nm-lndp-ndisc.c src/ndisc/nm-lndp-ndisc.h \ src/ndisc/nm-ndisc.c src/ndisc/nm-ndisc.h \ - src/ndisc/nm-ndisc-private.h src/nm-dbus-utils.c \ - src/nm-dbus-utils.h src/nm-dbus-object.c src/nm-dbus-object.h \ - src/nm-ip4-config.c src/nm-ip4-config.h src/nm-ip6-config.c \ - src/nm-ip6-config.h src/dhcp/nm-dhcp-client.c \ - src/dhcp/nm-dhcp-client.h src/dhcp/nm-dhcp-client-logging.h \ - src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \ - src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \ - src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \ - $(NULL) $(am__append_19) + src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \ + src/nm-exported-object.h src/nm-ip4-config.c \ + src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \ + src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \ + src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \ + src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \ + src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \ + src/main-utils.c src/main-utils.h $(NULL) $(am__append_18) src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ + introspection/libnmdbus.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -5004,19 +4930,12 @@ src_libNetworkManagerBase_la_LIBADD = \ ############################################################################### src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) -src_libNetworkManager_la_SOURCES = \ - \ - src/nm-checkpoint.c \ - src/nm-checkpoint.h \ - src/nm-checkpoint-manager.c \ - src/nm-checkpoint-manager.h \ - \ - src/devices/nm-device.c \ - src/devices/nm-device.h \ - src/devices/nm-lldp-listener.c \ - src/devices/nm-lldp-listener.h \ - src/devices/nm-acd-manager.c \ - src/devices/nm-acd-manager.h \ +src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \ + src/nm-checkpoint-manager.h src/nm-checkpoint.c \ + src/nm-checkpoint.h src/devices/nm-device.c \ + src/devices/nm-device.h src/devices/nm-lldp-listener.c \ + src/devices/nm-lldp-listener.h src/devices/nm-arping-manager.c \ + src/devices/nm-arping-manager.h \ src/devices/nm-device-ethernet-utils.c \ src/devices/nm-device-ethernet-utils.h \ src/devices/nm-device-factory.c \ @@ -5024,79 +4943,45 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-generic.c \ src/devices/nm-device-generic.h \ src/devices/nm-device-logging.h \ - src/devices/nm-device-private.h \ - \ - src/devices/nm-device-bond.c \ - src/devices/nm-device-bond.h \ - src/devices/nm-device-bridge.c \ - src/devices/nm-device-bridge.h \ - src/devices/nm-device-dummy.c \ - src/devices/nm-device-dummy.h \ - src/devices/nm-device-ethernet.c \ + src/devices/nm-device-private.h src/devices/nm-device-bond.c \ + src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \ + src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \ + src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \ src/devices/nm-device-ethernet.h \ src/devices/nm-device-infiniband.c \ src/devices/nm-device-infiniband.h \ src/devices/nm-device-ip-tunnel.c \ src/devices/nm-device-ip-tunnel.h \ - src/devices/nm-device-macsec.c \ - src/devices/nm-device-macsec.h \ + src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \ src/devices/nm-device-macvlan.c \ - src/devices/nm-device-macvlan.h \ - src/devices/nm-device-ppp.c \ - src/devices/nm-device-ppp.h \ - src/devices/nm-device-tun.c \ - src/devices/nm-device-tun.h \ - src/devices/nm-device-veth.c \ - src/devices/nm-device-veth.h \ - src/devices/nm-device-vlan.c \ - src/devices/nm-device-vlan.h \ - src/devices/nm-device-vxlan.c \ - src/devices/nm-device-vxlan.h \ - \ - src/dhcp/nm-dhcp-dhcpcanon.c \ - src/dhcp/nm-dhcp-dhclient.c \ - src/dhcp/nm-dhcp-dhcpcd.c \ - src/dhcp/nm-dhcp-helper-api.h \ - src/dhcp/nm-dhcp-listener.c \ - src/dhcp/nm-dhcp-listener.h \ - src/dhcp/nm-dhcp-dhclient-utils.c \ - src/dhcp/nm-dhcp-dhclient-utils.h \ - \ - src/dns/nm-dns-manager.c \ - src/dns/nm-dns-manager.h \ - src/dns/nm-dns-plugin.c \ - src/dns/nm-dns-plugin.h \ - src/dns/nm-dns-dnsmasq.c \ - src/dns/nm-dns-dnsmasq.h \ - src/dns/nm-dns-systemd-resolved.c \ - src/dns/nm-dns-systemd-resolved.h \ - src/dns/nm-dns-unbound.c \ - src/dns/nm-dns-unbound.h \ - \ - src/dnsmasq/nm-dnsmasq-manager.c \ + src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \ + src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \ + src/devices/nm-device-tun.h src/devices/nm-device-veth.c \ + src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \ + src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \ + src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \ + src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \ + src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \ + src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \ + src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \ + src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \ + src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \ + src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \ src/dnsmasq/nm-dnsmasq-manager.h \ - src/dnsmasq/nm-dnsmasq-utils.c \ - src/dnsmasq/nm-dnsmasq-utils.h \ - \ - src/ppp/nm-ppp-manager-call.c \ - src/ppp/nm-ppp-manager-call.h \ - src/ppp/nm-ppp-manager.h \ - src/ppp/nm-ppp-status.h \ - \ - src/nm-hostname-manager.c \ - src/nm-hostname-manager.h \ - \ + src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \ + src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \ + src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \ + src/nm-hostname-manager.c src/nm-hostname-manager.h \ src/settings/nm-agent-manager.c \ - src/settings/nm-agent-manager.h \ - src/settings/nm-secret-agent.c \ + src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \ src/settings/nm-secret-agent.h \ src/settings/nm-settings-connection.c \ src/settings/nm-settings-connection.h \ src/settings/nm-settings-plugin.c \ - src/settings/nm-settings-plugin.h \ - src/settings/nm-settings.c \ + src/settings/nm-settings-plugin.h src/settings/nm-settings.c \ src/settings/nm-settings.h \ - \ src/settings/plugins/keyfile/nms-keyfile-connection.c \ src/settings/plugins/keyfile/nms-keyfile-connection.h \ src/settings/plugins/keyfile/nms-keyfile-plugin.c \ @@ -5107,7 +4992,6 @@ src_libNetworkManager_la_SOURCES = \ src/settings/plugins/keyfile/nms-keyfile-utils.h \ src/settings/plugins/keyfile/nms-keyfile-writer.c \ src/settings/plugins/keyfile/nms-keyfile-writer.h \ - \ src/supplicant/nm-supplicant-config.c \ src/supplicant/nm-supplicant-config.h \ src/supplicant/nm-supplicant-interface.c \ @@ -5117,69 +5001,34 @@ src_libNetworkManager_la_SOURCES = \ src/supplicant/nm-supplicant-settings-verify.c \ src/supplicant/nm-supplicant-settings-verify.h \ src/supplicant/nm-supplicant-types.h \ - \ - src/vpn/nm-vpn-connection.c \ - src/vpn/nm-vpn-connection.h \ - src/vpn/nm-vpn-manager.c \ - src/vpn/nm-vpn-manager.h \ - \ - src/nm-act-request.c \ - src/nm-act-request.h \ - src/nm-active-connection.c \ - src/nm-active-connection.h \ - src/nm-audit-manager.c \ - src/nm-audit-manager.h \ - src/nm-dbus-manager.c \ - src/nm-dbus-manager.h \ - src/nm-config.c \ - src/nm-config.h \ - src/nm-config-data.c \ - src/nm-config-data.h \ - src/nm-connectivity.c \ - src/nm-connectivity.h \ - src/nm-dcb.c \ - src/nm-dcb.h \ - src/nm-netns.c \ - src/nm-netns.h \ - src/nm-dhcp4-config.c \ - src/nm-dhcp4-config.h \ - src/nm-dhcp6-config.c \ - src/nm-dhcp6-config.h \ - src/nm-dispatcher.c \ - src/nm-dispatcher.h \ - src/nm-firewall-manager.c \ - src/nm-firewall-manager.h \ - src/nm-proxy-config.c \ - src/nm-proxy-config.h \ - src/nm-auth-manager.c \ - src/nm-auth-manager.h \ - src/nm-auth-subject.c \ - src/nm-auth-subject.h \ - src/nm-auth-utils.c \ - src/nm-auth-utils.h \ - src/nm-manager.c \ - src/nm-manager.h \ - src/nm-pacrunner-manager.c \ - src/nm-pacrunner-manager.h \ - src/nm-policy.c \ - src/nm-policy.h \ - src/nm-rfkill-manager.c \ - src/nm-rfkill-manager.h \ - src/nm-session-monitor.h \ - src/nm-session-monitor.c \ - src/nm-sleep-monitor.c \ - src/nm-sleep-monitor.h \ - src/nm-types.h \ - \ - $(NULL) - + src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \ + src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \ + src/nm-act-request.c src/nm-act-request.h \ + src/nm-active-connection.c src/nm-active-connection.h \ + src/nm-audit-manager.c src/nm-audit-manager.h \ + src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \ + src/nm-config.h src/nm-config-data.c src/nm-config-data.h \ + src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \ + src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \ + src/nm-dhcp6-config.c src/nm-dhcp6-config.h \ + src/nm-dispatcher.c src/nm-dispatcher.h \ + src/nm-firewall-manager.c src/nm-firewall-manager.h \ + src/nm-proxy-config.c src/nm-proxy-config.h \ + src/nm-auth-manager.c src/nm-auth-manager.h \ + src/nm-auth-subject.c src/nm-auth-subject.h \ + src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \ + src/nm-manager.h src/nm-pacrunner-manager.c \ + src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \ + src/nm-rfkill-manager.c src/nm-rfkill-manager.h \ + src/nm-session-monitor.h src/nm-session-monitor.c \ + src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \ + $(NULL) $(am__append_19) src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ - shared/libcsiphash.la \ - shared/libnacd.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) \ @@ -5188,8 +5037,7 @@ src_libNetworkManager_la_LIBADD = \ $(LIBPSL_LIBS) \ $(LIBCURL_LIBS) -src_tests_cppflags = $(src_cppflags) $(SANITIZER_EXEC_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION_TEST $(am__append_20) +src_tests_cppflags = $(src_cppflags) $(am__append_20) src_tests_cppflags_fake = $(src_tests_cppflags) -DSETUP=nm_fake_platform_setup src_tests_cppflags_linux = $(src_tests_cppflags) -DSETUP=nm_linux_platform_setup src_libNetworkManagerTest_la_CPPFLAGS = $(src_tests_cppflags) @@ -5205,7 +5053,8 @@ src_libNetworkManagerTest_la_LIBADD = \ src/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) EXTRA_src_NetworkManager_DEPENDENCIES = \ src/NetworkManager.ver @@ -5219,8 +5068,7 @@ src_NetworkManager_LDADD = \ src_NetworkManager_LDFLAGS = \ -rdynamic \ - -Wl,--version-script="src/NetworkManager.ver" \ - $(SANITIZER_EXEC_LDFLAGS) + -Wl,--version-script="src/NetworkManager.ver" ############################################################################### @@ -5233,19 +5081,20 @@ src_nm_iface_helper_LDADD = \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) src_nm_iface_helper_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ - $(SANITIZER_EXEC_LDFLAGS) + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" src_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ -DNMRUNDIR=\"$(nmrundir)\" src_dhcp_nm_dhcp_helper_SOURCES = \ @@ -5272,14 +5121,14 @@ src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags) src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags) src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd) src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) -src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags) -src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags) @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ @WITH_PPP_TRUE@ -I$(srcdir)/shared \ @WITH_PPP_TRUE@ -I$(builddir)/shared \ @WITH_PPP_TRUE@ -I$(srcdir)/libnm-core \ +@WITH_PPP_TRUE@ -I$(srcdir)/src \ +@WITH_PPP_TRUE@ -I$(builddir)/libnm-core \ @WITH_PPP_TRUE@ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ -@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ +@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_PPP_TRUE@ $(GLIB_CFLAGS) @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_SOURCES = \ @@ -5312,7 +5161,8 @@ src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags) @WITH_PPP_TRUE@ -I$(builddir)/libnm-core \ @WITH_PPP_TRUE@ -I$(srcdir)/libnm-core \ @WITH_PPP_TRUE@ -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ -@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@WITH_PPP_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_PPP_TRUE@ $(GLIB_CFLAGS) @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ @@ -5320,6 +5170,7 @@ src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags) @WITH_PPP_TRUE@ -Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LIBADD = \ +@WITH_PPP_TRUE@ introspection/libnmdbus.la \ @WITH_PPP_TRUE@ $(GLIB_LIBS) src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ @@ -5329,8 +5180,7 @@ src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ src/libNetworkManagerTest.la @@ -5341,8 +5191,9 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(builddir)/shared \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(builddir)/libnm-core \ +@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IBFT_TRUE@ $(GLIB_CFLAGS) \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@CONFIG_PLUGIN_IBFT_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ @CONFIG_PLUGIN_IBFT_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ @CONFIG_PLUGIN_IBFT_TRUE@ -DSBINDIR=\"$(sbindir)\" @@ -5373,15 +5224,14 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(builddir)/libnm-core \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(srcdir)/src \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@CONFIG_PLUGIN_IBFT_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IBFT_TRUE@ -DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \ @CONFIG_PLUGIN_IBFT_TRUE@ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\" @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ @CONFIG_PLUGIN_IBFT_TRUE@ $(GLIB_LIBS) \ -@CONFIG_PLUGIN_IBFT_TRUE@ $(CODE_COVERAGE_LDFLAGS) \ -@CONFIG_PLUGIN_IBFT_TRUE@ $(SANITIZER_EXEC_LDFLAGS) +@CONFIG_PLUGIN_IBFT_TRUE@ $(CODE_COVERAGE_LDFLAGS) @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDADD = \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/libnms-ibft-core.la \ @@ -5394,10 +5244,10 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -I$(builddir)/shared \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -I$(builddir)/libnm-core \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(GLIB_CFLAGS) \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(NSS_CFLAGS) \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(SANITIZER_EXEC_CFLAGS) \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DSBINDIR=\"$(sbindir)\" @@ -5435,11 +5285,11 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -module -avoid-version \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(SANITIZER_EXEC_LDFLAGS) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -5451,8 +5301,7 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(GLIB_LIBS) \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(CODE_COVERAGE_LDFLAGS) \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(SANITIZER_EXEC_LDFLAGS) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(CODE_COVERAGE_LDFLAGS) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ @@ -5480,7 +5329,8 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(builddir)/shared \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(builddir)/libnm-core \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_CFLAGS) \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(LIBUDEV_CFLAGS) \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" @@ -5516,20 +5366,78 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(builddir)/libnm-core \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/src \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_CFLAGS) \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\" @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_LDFLAGS) \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(CODE_COVERAGE_LDFLAGS) \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(SANITIZER_EXEC_LDFLAGS) +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(CODE_COVERAGE_LDFLAGS) @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/libNetworkManagerTest.la +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_cppflags = \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/src \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/shared \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/shared \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/libnm-core \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/libnm-core \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@CONFIG_PLUGIN_IFNET_TRUE@ $(GLIB_CFLAGS) \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DSBINDIR=\"$(sbindir)\" + +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-parser.c\ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-parser.h\ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-utils.h\ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-utils.c\ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h\ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c + +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES = \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection.c \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection.h \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-plugin.c \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-plugin.h + +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS = \ +@CONFIG_PLUGIN_IFNET_TRUE@ -module -avoid-version \ +@CONFIG_PLUGIN_IFNET_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" + +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD = \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/libnms-ifnet-core.la + +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/shared \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/shared \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/libnm-core \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/libnm-core \ +@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/src \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@CONFIG_PLUGIN_IFNET_TRUE@ $(GLIB_CFLAGS) \ +@CONFIG_PLUGIN_IFNET_TRUE@ $(CODE_COVERAGE_CFLAGS) \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DTEST_IFNET_DIR=\"$(abs_srcdir)/src/settings/plugins/ifnet/tests\" \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifnet/tests/\" \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/src/settings/plugins/ifnet/tests/wpa_supplicant.conf"' \ +@CONFIG_PLUGIN_IFNET_TRUE@ -DSYSCONFDIR=\"nonexistent\" + +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \ +@CONFIG_PLUGIN_IFNET_TRUE@ $(GLIB_LDFLAGS) + +@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/libnms-ifnet-core.la \ +@CONFIG_PLUGIN_IFNET_TRUE@ src/libNetworkManagerTest.la + src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \ src/devices/adsl/nm-atm-manager.c \ src/devices/adsl/nm-device-adsl.c \ @@ -5542,7 +5450,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) @@ -5551,6 +5460,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ + introspection/libnmdbus.la \ $(LIBUDEV_LIBS) @@ -5564,7 +5474,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/shared \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/libnm-core \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/libnm-core \ -@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@WITH_MODEM_MANAGER_1_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) \ @WITH_MODEM_MANAGER_1_TRUE@ $(LIBSYSTEMD_CFLAGS) \ @WITH_MODEM_MANAGER_1_TRUE@ $(MM_GLIB_CFLAGS) @@ -5575,7 +5486,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem-manager.h \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_39) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_43) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -avoid-version \ @@ -5600,6 +5511,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \ +@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) @@ -5617,23 +5529,25 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bt-error.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_42) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_46) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/src -I$(builddir)/src \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/shared \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/shared \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/libnm-core \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/libnm-core \ -@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ -@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) $(am__append_41) +@WITH_MODEM_MANAGER_1_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) $(am__append_45) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -module -avoid-version \ @WITH_MODEM_MANAGER_1_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ +@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ -@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_43) -@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_47) +@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-factory.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-wifi.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-wifi.h \ @@ -5641,11 +5555,9 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-ap.h \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-utils.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-utils.h \ -@WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-common.c \ -@WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-common.h \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.c \ -@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.h \ -@WITH_WIFI_TRUE@ $(am__append_45) +@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.h + @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ @WITH_WIFI_TRUE@ -I$(srcdir)/src \ @WITH_WIFI_TRUE@ -I$(builddir)/src \ @@ -5653,7 +5565,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ -I$(builddir)/shared \ @WITH_WIFI_TRUE@ -I$(builddir)/libnm-core \ @WITH_WIFI_TRUE@ -I$(srcdir)/libnm-core \ -@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@WITH_WIFI_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_WIFI_TRUE@ $(GLIB_CFLAGS) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ @@ -5661,6 +5574,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ +@WITH_WIFI_TRUE@ introspection/libnmdbus.la \ @WITH_WIFI_TRUE@ $(GLIB_LIBS) @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_SOURCES = \ @@ -5677,12 +5591,11 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ -I$(builddir)/libnm-core \ @WITH_WIFI_TRUE@ -I$(srcdir)/src \ @WITH_WIFI_TRUE@ -I$(builddir)/src \ -@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ -@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@WITH_WIFI_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_WIFI_TRUE@ $(GLIB_CFLAGS) @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la -@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_SOURCES = \ @WITH_TEAMDCTL_TRUE@ src/devices/team/nm-team-factory.c \ @WITH_TEAMDCTL_TRUE@ src/devices/team/nm-device-team.c \ @@ -5695,7 +5608,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_TEAMDCTL_TRUE@ -I$(builddir)/shared \ @WITH_TEAMDCTL_TRUE@ -I$(builddir)/libnm-core \ @WITH_TEAMDCTL_TRUE@ -I$(srcdir)/libnm-core \ -@WITH_TEAMDCTL_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@WITH_TEAMDCTL_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@WITH_TEAMDCTL_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_TEAMDCTL_TRUE@ $(LIBTEAMDCTL_CFLAGS) \ @WITH_TEAMDCTL_TRUE@ $(JANSSON_CFLAGS) \ @WITH_TEAMDCTL_TRUE@ $(GLIB_CFLAGS) @@ -5705,6 +5619,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_TEAMDCTL_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LIBADD = \ +@WITH_TEAMDCTL_TRUE@ introspection/libnmdbus.la \ @WITH_TEAMDCTL_TRUE@ $(LIBTEAMDCTL_LIBS) \ @WITH_TEAMDCTL_TRUE@ $(JANSSON_LIBS) \ @WITH_TEAMDCTL_TRUE@ $(GLIB_LIBS) @@ -5736,7 +5651,8 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_OPENVSWITCH_TRUE@ -I$(builddir)/libnm-core \ @WITH_OPENVSWITCH_TRUE@ -I$(srcdir)/libnm-core \ @WITH_OPENVSWITCH_TRUE@ \ -@WITH_OPENVSWITCH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@WITH_OPENVSWITCH_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@WITH_OPENVSWITCH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @WITH_OPENVSWITCH_TRUE@ -DRUNSTATEDIR=\"$(runstatedir)\" \ @WITH_OPENVSWITCH_TRUE@ \ @WITH_OPENVSWITCH_TRUE@ $(JANSSON_CFLAGS) \ @@ -5747,6 +5663,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_OPENVSWITCH_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \ +@WITH_OPENVSWITCH_TRUE@ introspection/libnmdbus.la \ @WITH_OPENVSWITCH_TRUE@ $(JANSSON_LIBS) \ @WITH_OPENVSWITCH_TRUE@ $(GLIB_LIBS) @@ -5757,21 +5674,18 @@ src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \ src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ src/libNetworkManagerTest.la -src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) - ############################################################################### # src/platform/tests ############################################################################### src_platform_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_platform_tests_libadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(LIBNL_LIBS) src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags) src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags) @@ -5819,17 +5733,16 @@ src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la # src/devices/tests ############################################################################### src_devices_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags) src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_lldp_LDADD = \ src/libNetworkManagerTest.la -src_devices_tests_test_acd_CPPFLAGS = $(src_tests_cppflags) -src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags) -src_devices_tests_test_acd_LDADD = \ +src_devices_tests_test_arping_CPPFLAGS = $(src_tests_cppflags) +src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_arping_LDADD = \ src/libNetworkManagerTest.la @@ -5837,18 +5750,17 @@ src_devices_tests_test_acd_LDADD = \ # src/ndisc/tests ############################################################################### src_ndisc_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_ndisc_tests_ldadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags) +src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_flags) src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd) src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags) +src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags) src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ $(src_tests_cppflags) \ @@ -5857,9 +5769,6 @@ src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ src_supplicant_tests_test_supplicant_config_LDADD = \ src/libNetworkManagerTest.la -src_supplicant_tests_test_supplicant_config_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) - src_tests_config_test_config_SOURCES = \ src/tests/config/nm-test-device.c \ src/tests/config/nm-test-device.h \ @@ -5873,16 +5782,12 @@ src_tests_config_test_config_CPPFLAGS = \ src_tests_config_test_config_LDADD = \ src/libNetworkManagerTest.la -src_tests_config_test_config_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) - ############################################################################### # src/tests ############################################################################### src_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) src_tests_ldadd = \ src/libNetworkManagerTest.la @@ -5896,6 +5801,9 @@ src_tests_test_ip6_config_LDADD = $(src_tests_ldadd) src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags) src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags) src_tests_test_dcb_LDADD = $(src_tests_ldadd) +src_tests_test_resolvconf_capture_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_resolvconf_capture_LDFLAGS = $(src_tests_ldflags) +src_tests_test_resolvconf_capture_LDADD = $(src_tests_ldadd) src_tests_test_general_CPPFLAGS = $(src_tests_cppflags) src_tests_test_general_LDFLAGS = $(src_tests_ldflags) src_tests_test_general_LDADD = $(src_tests_ldadd) @@ -5908,10 +5816,7 @@ src_tests_test_wired_defname_LDADD = $(src_tests_ldadd) src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags) src_tests_test_utils_LDFLAGS = $(src_tests_ldflags) src_tests_test_utils_LDADD = $(src_tests_ldadd) -src_tests_test_systemd_CPPFLAGS = \ - $(src_libsystemd_nm_la_cppflags) \ - -DNETWORKMANAGER_COMPILATION_TEST - +src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) src_tests_test_systemd_SOURCES = \ shared/nm-utils/siphash24.c \ src/tests/test-systemd.c @@ -5925,13 +5830,9 @@ dispatcher_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ $(GLIB_CFLAGS) \ - -DG_LOG_DOMAIN=\""nm-dispatcher"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" @@ -5970,18 +5871,10 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ -DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - $(GLIB_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) - -dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) + $(GLIB_CFLAGS) dispatcher_tests_test_dispatcher_envp_LDADD = \ libnm/libnm.la \ @@ -5997,7 +5890,6 @@ clients_nm_online_CPPFLAGS = \ -I$(builddir)/libnm \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nm-online"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DNMLOCALEDIR=\"$(datadir)/locale\" clients_nm_online_LDFLAGS = \ @@ -6021,8 +5913,7 @@ clients_cppflags = \ -I$(srcdir)/clients/common \ -I$(builddir)/clients/common \ $(GLIB_CFLAGS) \ - -DNMLOCALEDIR=\"$(datadir)/locale\" \ - $(NULL) + -DNMLOCALEDIR=\"$(datadir)/locale\" clients_common_libnmc_base_la_SOURCES = \ shared/nm-utils/nm-enum-utils.c \ @@ -6033,6 +5924,7 @@ clients_common_libnmc_base_la_SOURCES = \ shared/nm-utils/nm-random-utils.h \ shared/nm-utils/nm-shared-utils.c \ shared/nm-utils/nm-shared-utils.h \ + shared/nm-utils/siphash24.c \ shared/nm-utils/siphash24.h \ \ clients/common/nm-secret-agent-simple.c \ @@ -6044,14 +5936,13 @@ clients_common_libnmc_base_la_SOURCES = \ clients_common_libnmc_base_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + -DG_LOG_DOMAIN=\""libnmc"\" clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ $(GLIB_LIBS) -clients_common_settings_doc_h = clients/common/settings-docs.h +clients_common_settings_doc_c = clients/common/settings-docs.c clients_common_libnmc_la_SOURCES = \ shared/nm-meta-setting.c \ shared/nm-meta-setting.h \ @@ -6064,8 +5955,7 @@ clients_common_libnmc_la_SOURCES = \ clients_common_libnmc_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + -DG_LOG_DOMAIN=\""libnmc"\" clients_common_libnmc_la_LIBADD = \ libnm/libnm.la \ @@ -6075,12 +5965,7 @@ clients_common_libnmc_la_LIBADD = \ clients_common_tests_test_general_CPPFLAGS = \ -I$(srcdir)/clients/common/tests \ $(clients_cppflags) \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - $(SANITIZER_EXEC_CFLAGS) - -clients_common_tests_test_general_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) + -DG_LOG_DOMAIN=\""libnmc"\" clients_common_tests_test_general_LDADD = \ libnm/libnm.la \ @@ -6101,21 +5986,18 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMCLI_TRUE@ clients/cli/nmcli.h \ @BUILD_NMCLI_TRUE@ clients/cli/polkit-agent.c \ @BUILD_NMCLI_TRUE@ clients/cli/polkit-agent.h $(NULL) \ -@BUILD_NMCLI_TRUE@ $(am__append_59) +@BUILD_NMCLI_TRUE@ $(am__append_62) @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS = \ @BUILD_NMCLI_TRUE@ -I$(srcdir)/clients/cli $(clients_cppflags) \ -@BUILD_NMCLI_TRUE@ $(SANITIZER_EXEC_CFLAGS) \ @BUILD_NMCLI_TRUE@ -DG_LOG_DOMAIN=\""nmcli"\" \ -@BUILD_NMCLI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ @BUILD_NMCLI_TRUE@ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ -@BUILD_NMCLI_TRUE@ $(am__append_58) +@BUILD_NMCLI_TRUE@ $(am__append_61) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = libnm/libnm.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc-base.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc.la $(GLIB_LIBS) \ -@BUILD_NMCLI_TRUE@ $(READLINE_LIBS) $(am__append_60) +@BUILD_NMCLI_TRUE@ $(READLINE_LIBS) $(am__append_63) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \ -@BUILD_NMCLI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ -@BUILD_NMCLI_TRUE@ $(SANITIZER_EXEC_LDFLAGS) +@BUILD_NMCLI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @BUILD_NMTUI_TRUE@clients_tui_newt_libnmt_newt_a_SOURCES = \ @BUILD_NMTUI_TRUE@ clients/tui/newt/nmt-newt.h \ @@ -6167,13 +6049,9 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMTUI_TRUE@ -I$(builddir)/shared \ @BUILD_NMTUI_TRUE@ -I$(srcdir)/libnm-core \ @BUILD_NMTUI_TRUE@ -I$(builddir)/libnm-core \ -@BUILD_NMTUI_TRUE@ -I$(srcdir)/libnm \ -@BUILD_NMTUI_TRUE@ -I$(builddir)/libnm \ @BUILD_NMTUI_TRUE@ -DG_LOG_DOMAIN=\""nmtui"\" \ -@BUILD_NMTUI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ @BUILD_NMTUI_TRUE@ $(GLIB_CFLAGS) \ @BUILD_NMTUI_TRUE@ $(NEWT_CFLAGS) \ -@BUILD_NMTUI_TRUE@ $(SANITIZER_EXEC_CFLAGS) \ @BUILD_NMTUI_TRUE@ $(NULL) @BUILD_NMTUI_TRUE@clients_tui_nmtui_SOURCES = \ @@ -6266,12 +6144,10 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMTUI_TRUE@ $(clients_cppflags) \ @BUILD_NMTUI_TRUE@ $(NEWT_CFLAGS) \ @BUILD_NMTUI_TRUE@ -DG_LOG_DOMAIN=\""nmtui"\" \ -@BUILD_NMTUI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ @BUILD_NMTUI_TRUE@ -DLOCALEDIR=\""$(localedir)"\" @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDFLAGS = \ -@BUILD_NMTUI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ -@BUILD_NMTUI_TRUE@ $(SANITIZER_EXEC_LDFLAGS) +@BUILD_NMTUI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDADD = \ @BUILD_NMTUI_TRUE@ libnm/libnm.la \ @@ -6309,8 +6185,7 @@ data_edit = sed \ @WITH_UDEV_DIR_TRUE@udevrulesdir = $(UDEV_DIR)/rules.d @WITH_UDEV_DIR_TRUE@udevrules_DATA = \ @WITH_UDEV_DIR_TRUE@ data/84-nm-drivers.rules \ -@WITH_UDEV_DIR_TRUE@ data/85-nm-unmanaged.rules \ -@WITH_UDEV_DIR_TRUE@ data/90-nm-thunderbolt.rules +@WITH_UDEV_DIR_TRUE@ data/85-nm-unmanaged.rules @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_includedir = $(includedir)/NetworkManager @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_cppflags = \ @@ -6319,11 +6194,11 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/shared \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(builddir)/shared \ @WITH_LEGACY_LIBRARIES_TRUE@ -DG_LOG_DOMAIN=\""libnm-util"\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ @WITH_LEGACY_LIBRARIES_TRUE@ -DLOCALEDIR=\"$(datadir)/locale\" \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_70) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_73) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_73) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_real = \ @WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-version-macros.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/NetworkManager.h \ @@ -6411,7 +6286,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-setting-vpn.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-value-transforms.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_71) $(am__append_74) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_74) $(am__append_77) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.c @@ -6428,19 +6303,19 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real)) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(DBUS_LIBS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_72) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_75) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_75) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_78) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \ @WITH_LEGACY_LIBRARIES_TRUE@ -Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \ @WITH_LEGACY_LIBRARIES_TRUE@ -version-info "9:0:7" @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_78) $(am__append_80) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_81) $(am__append_83) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_79) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_81) +@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_82) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_84) @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util @@ -6471,47 +6346,34 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_CFLAGS) \ @WITH_LEGACY_LIBRARIES_TRUE@ -DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(SANITIZER_EXEC_CFLAGS) +@WITH_LEGACY_LIBRARIES_TRUE@ -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldadd = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldflags = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(SANITIZER_EXEC_LDFLAGS) - @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libtest-crypto.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_tests_ldadd) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm/libnm.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_tests_ldadd) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDFLAGS = $(libnm_util_tests_ldflags) ############################################################################### # libnm-glib @@ -6524,7 +6386,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/libnm-glib \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(builddir)/libnm-glib \ @WITH_LEGACY_LIBRARIES_TRUE@ -DG_LOG_DOMAIN=\""libnm-glib"\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_CFLAGS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) @@ -6735,8 +6597,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(builddir)/libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/libnm-glib \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ @WITH_LEGACY_LIBRARIES_TRUE@ -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_CFLAGS) @@ -6805,7 +6666,8 @@ examples_C_glib_cppflags = \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags) @@ -7167,6 +7029,9 @@ shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo: \ shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo: \ shared/nm-utils/$(am__dirstamp) \ shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) clients/common/$(am__dirstamp): @$(MKDIR_P) clients/common @: > clients/common/$(am__dirstamp) @@ -7349,12 +7214,62 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plug introspection/libnmdbus.la: $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_DEPENDENCIES) $(EXTRA_introspection_libnmdbus_la_DEPENDENCIES) introspection/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_LIBADD) $(LIBS) +shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/libnm_core_libnm_core_la-nm-meta-setting.lo: \ + shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm-core/$(am__dirstamp): @$(MKDIR_P) libnm-core @: > libnm-core/$(am__dirstamp) libnm-core/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) libnm-core/$(DEPDIR) @: > libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-crypto.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-connection.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-errors.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) @@ -7475,50 +7390,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless-security.lo: \ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/libnm_core_libnm_core_la-nm-meta-setting.lo: \ - shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-crypto.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-connection.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-errors.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_libnm_core_la-nm-setting.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) @@ -7812,15 +7683,6 @@ libnm/$(DEPDIR)/$(am__dirstamp): @: > libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_utils_la-nm-libnm-utils.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) -libnm/fake-typelib/$(am__dirstamp): - @$(MKDIR_P) libnm/fake-typelib - @: > libnm/fake-typelib/$(am__dirstamp) -libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) libnm/fake-typelib/$(DEPDIR) - @: > libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp) -libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo: \ - libnm/fake-typelib/$(am__dirstamp) \ - libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp) libnm/libnm-utils.la: $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_DEPENDENCIES) $(EXTRA_libnm_libnm_utils_la_DEPENDENCIES) libnm/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_LIBADD) $(LIBS) @@ -7828,8 +7690,6 @@ libnm/libnm_libnm_la-nm-access-point.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-active-connection.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) -libnm/libnm_libnm_la-nm-checkpoint.lo: libnm/$(am__dirstamp) \ - libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-client.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-dbus-helpers.lo: libnm/$(am__dirstamp) \ @@ -7930,30 +7790,6 @@ libnm/tests/$(am__dirstamp): libnm/tests/libnm-vpn-plugin-utils-test.la: $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) $(EXTRA_libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) libnm/tests/$(am__dirstamp) $(AM_V_CCLD)$(libnm_tests_libnm_vpn_plugin_utils_test_la_LINK) $(am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath) $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD) $(LIBS) -shared/c-siphash/src/$(am__dirstamp): - @$(MKDIR_P) shared/c-siphash/src - @: > shared/c-siphash/src/$(am__dirstamp) -shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) shared/c-siphash/src/$(DEPDIR) - @: > shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp) -shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo: \ - shared/c-siphash/src/$(am__dirstamp) \ - shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp) - -shared/libcsiphash.la: $(shared_libcsiphash_la_OBJECTS) $(shared_libcsiphash_la_DEPENDENCIES) $(EXTRA_shared_libcsiphash_la_DEPENDENCIES) shared/$(am__dirstamp) - $(AM_V_CCLD)$(LINK) $(shared_libcsiphash_la_OBJECTS) $(shared_libcsiphash_la_LIBADD) $(LIBS) -shared/n-acd/src/$(am__dirstamp): - @$(MKDIR_P) shared/n-acd/src - @: > shared/n-acd/src/$(am__dirstamp) -shared/n-acd/src/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) shared/n-acd/src/$(DEPDIR) - @: > shared/n-acd/src/$(DEPDIR)/$(am__dirstamp) -shared/n-acd/src/shared_libnacd_la-n-acd.lo: \ - shared/n-acd/src/$(am__dirstamp) \ - shared/n-acd/src/$(DEPDIR)/$(am__dirstamp) - -shared/libnacd.la: $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_DEPENDENCIES) $(EXTRA_shared_libnacd_la_DEPENDENCIES) shared/$(am__dirstamp) - $(AM_V_CCLD)$(shared_libnacd_la_LINK) $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_LIBADD) $(LIBS) src/devices/adsl/$(am__dirstamp): @$(MKDIR_P) src/devices/adsl @: > src/devices/adsl/$(am__dirstamp) @@ -8059,18 +7895,9 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.lo: \ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo: \ src/devices/wifi/$(am__dirstamp) \ src/devices/wifi/$(DEPDIR)/$(am__dirstamp) -src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo: \ - src/devices/wifi/$(am__dirstamp) \ - src/devices/wifi/$(DEPDIR)/$(am__dirstamp) src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: \ src/devices/wifi/$(am__dirstamp) \ src/devices/wifi/$(DEPDIR)/$(am__dirstamp) -src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo: \ - src/devices/wifi/$(am__dirstamp) \ - src/devices/wifi/$(DEPDIR)/$(am__dirstamp) -src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo: \ - src/devices/wifi/$(am__dirstamp) \ - src/devices/wifi/$(DEPDIR)/$(am__dirstamp) src/devices/wifi/libnm-device-plugin-wifi.la: $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp) $(AM_V_CCLD)$(src_devices_wifi_libnm_device_plugin_wifi_la_LINK) $(am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath) $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD) $(LIBS) @@ -8110,10 +7937,10 @@ src/$(am__dirstamp): src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/$(DEPDIR) @: > src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManager_la-nm-checkpoint.lo: src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-checkpoint-manager.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +src/src_libNetworkManager_la-nm-checkpoint.lo: src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) src/devices/$(am__dirstamp): @$(MKDIR_P) src/devices @: > src/devices/$(am__dirstamp) @@ -8126,7 +7953,7 @@ src/devices/src_libNetworkManager_la-nm-device.lo: \ src/devices/src_libNetworkManager_la-nm-lldp-listener.lo: \ src/devices/$(am__dirstamp) \ src/devices/$(DEPDIR)/$(am__dirstamp) -src/devices/src_libNetworkManager_la-nm-acd-manager.lo: \ +src/devices/src_libNetworkManager_la-nm-arping-manager.lo: \ src/devices/$(am__dirstamp) \ src/devices/$(DEPDIR)/$(am__dirstamp) src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo: \ @@ -8199,16 +8026,16 @@ src/dns/$(am__dirstamp): src/dns/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/dns/$(DEPDIR) @: > src/dns/$(DEPDIR)/$(am__dirstamp) -src/dns/src_libNetworkManager_la-nm-dns-manager.lo: \ - src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) -src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: \ - src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo: \ src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dns/src_libNetworkManager_la-nm-dns-systemd-resolved.lo: \ src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dns/src_libNetworkManager_la-nm-dns-unbound.lo: \ src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) +src/dns/src_libNetworkManager_la-nm-dns-manager.lo: \ + src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) +src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: \ + src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dnsmasq/$(am__dirstamp): @$(MKDIR_P) src/dnsmasq @: > src/dnsmasq/$(am__dirstamp) @@ -8307,14 +8134,12 @@ src/src_libNetworkManager_la-nm-active-connection.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-audit-manager.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManager_la-nm-dbus-manager.lo: src/$(am__dirstamp) \ +src/src_libNetworkManager_la-nm-bus-manager.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-config.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-config-data.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-dcb.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-netns.lo: src/$(am__dirstamp) \ @@ -8347,6 +8172,8 @@ src/src_libNetworkManager_la-nm-session-monitor.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) +src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) src/libNetworkManager.la: $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_DEPENDENCIES) $(EXTRA_src_libNetworkManager_la_DEPENDENCIES) src/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_LIBADD) $(LIBS) @@ -8362,9 +8189,6 @@ src/platform/$(am__dirstamp): src/platform/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/platform/$(DEPDIR) @: > src/platform/$(DEPDIR)/$(am__dirstamp) -src/platform/src_libNetworkManagerBase_la-nm-netlink.lo: \ - src/platform/$(am__dirstamp) \ - src/platform/$(DEPDIR)/$(am__dirstamp) src/platform/src_libNetworkManagerBase_la-nmp-netns.lo: \ src/platform/$(am__dirstamp) \ src/platform/$(DEPDIR)/$(am__dirstamp) @@ -8402,9 +8226,7 @@ src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo: \ src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp) src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo: \ src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManagerBase_la-nm-dbus-utils.lo: \ - src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManagerBase_la-nm-dbus-object.lo: \ +src/src_libNetworkManagerBase_la-nm-exported-object.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManagerBase_la-nm-ip4-config.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) @@ -8705,6 +8527,36 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la: $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) src/settings/plugins/ifcfg-rh/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_LIBADD) $(LIBS) +src/settings/plugins/ifnet/$(am__dirstamp): + @$(MKDIR_P) src/settings/plugins/ifnet + @: > src/settings/plugins/ifnet/$(am__dirstamp) +src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/settings/plugins/ifnet/$(DEPDIR) + @: > src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo: \ + src/settings/plugins/ifnet/$(am__dirstamp) \ + src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo: \ + src/settings/plugins/ifnet/$(am__dirstamp) \ + src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) + +src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la: $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES) src/settings/plugins/ifnet/$(am__dirstamp) + $(AM_V_CCLD)$(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LINK) $(am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_rpath) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD) $(LIBS) +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo: \ + src/settings/plugins/ifnet/$(am__dirstamp) \ + src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo: \ + src/settings/plugins/ifnet/$(am__dirstamp) \ + src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo: \ + src/settings/plugins/ifnet/$(am__dirstamp) \ + src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo: \ + src/settings/plugins/ifnet/$(am__dirstamp) \ + src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) + +src/settings/plugins/ifnet/libnms-ifnet-core.la: $(src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_libnms_ifnet_core_la_DEPENDENCIES) src/settings/plugins/ifnet/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifnet_libnms_ifnet_core_la_rpath) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_LIBADD) $(LIBS) src/settings/plugins/ifupdown/$(am__dirstamp): @$(MKDIR_P) src/settings/plugins/ifupdown @: > src/settings/plugins/ifupdown/$(am__dirstamp) @@ -8946,7 +8798,7 @@ clients/common/tests/clients_common_tests_test_general-test-general.$(OBJEXT): clients/common/tests/test-general$(EXEEXT): $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_DEPENDENCIES) $(EXTRA_clients_common_tests_test_general_DEPENDENCIES) clients/common/tests/$(am__dirstamp) @rm -f clients/common/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(clients_common_tests_test_general_LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS) clients/$(am__dirstamp): @$(MKDIR_P) clients @: > clients/$(am__dirstamp) @@ -9111,7 +8963,7 @@ dispatcher/tests/dispatcher_tests_test_dispatcher_envp-test-dispatcher-envp.$(OB dispatcher/tests/test-dispatcher-envp$(EXEEXT): $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) $(EXTRA_dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) dispatcher/tests/$(am__dirstamp) @rm -f dispatcher/tests/test-dispatcher-envp$(EXEEXT) - $(AM_V_CCLD)$(dispatcher_tests_test_dispatcher_envp_LINK) $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_LDADD) $(LIBS) examples/C/glib/$(am__dirstamp): @$(MKDIR_P) examples/C/glib @: > examples/C/glib/$(am__dirstamp) @@ -9220,14 +9072,14 @@ libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT): \ libnm-core/tests/test-compare$(EXEEXT): $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_compare_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-compare$(EXEEXT) - $(AM_V_CCLD)$(libnm_core_tests_test_compare_LINK) $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-crypto$(EXEEXT): $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_crypto_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-crypto$(EXEEXT) - $(AM_V_CCLD)$(libnm_core_tests_test_crypto_LINK) $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) @@ -9237,35 +9089,35 @@ libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT libnm-core/tests/test-general$(EXEEXT): $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_general_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(libnm_core_tests_test_general_LINK) $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-keyfile$(EXEEXT): $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_keyfile_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-keyfile$(EXEEXT) - $(AM_V_CCLD)$(libnm_core_tests_test_keyfile_LINK) $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-secrets$(EXEEXT): $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_secrets_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-secrets$(EXEEXT) - $(AM_V_CCLD)$(libnm_core_tests_test_secrets_LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-setting$(EXEEXT): $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-setting$(EXEEXT) - $(AM_V_CCLD)$(libnm_core_tests_test_setting_LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-settings-defaults$(EXEEXT): $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_settings_defaults_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-settings-defaults$(EXEEXT) - $(AM_V_CCLD)$(libnm_core_tests_test_settings_defaults_LINK) $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_LDADD) $(LIBS) libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT): \ libnm-glib/$(am__dirstamp) \ libnm-glib/$(DEPDIR)/$(am__dirstamp) @@ -9309,52 +9161,49 @@ libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT): \ libnm-util/tests/test-crypto$(EXEEXT): $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_crypto_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-crypto$(EXEEXT) - $(AM_V_CCLD)$(libnm_util_tests_test_crypto_LINK) $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-general$(EXEEXT): $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_general_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(libnm_util_tests_test_general_LINK) $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_libnm_linking-test-libnm-linking.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-libnm-linking$(EXEEXT): $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_libnm_linking_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-libnm-linking$(EXEEXT) - $(AM_V_CCLD)$(libnm_util_tests_test_libnm_linking_LINK) $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-secrets$(EXEEXT): $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_secrets_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-secrets$(EXEEXT) - $(AM_V_CCLD)$(libnm_util_tests_test_secrets_LINK) $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-setting-8021x$(EXEEXT): $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_8021x_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-setting-8021x$(EXEEXT) - $(AM_V_CCLD)$(libnm_util_tests_test_setting_8021x_LINK) $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-setting-dcb$(EXEEXT): $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_dcb_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-setting-dcb$(EXEEXT) - $(AM_V_CCLD)$(libnm_util_tests_test_setting_dcb_LINK) $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-settings-defaults$(EXEEXT): $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_settings_defaults_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-settings-defaults$(EXEEXT) - $(AM_V_CCLD)$(libnm_util_tests_test_settings_defaults_LINK) $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_LDADD) $(LIBS) -shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT): \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) + $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_LDADD) $(LIBS) libnm/tests/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) libnm/tests/$(DEPDIR) @: > libnm/tests/$(DEPDIR)/$(am__dirstamp) @@ -9364,7 +9213,7 @@ libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT): \ libnm/tests/test-general$(EXEEXT): $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_tests_test_general_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(libnm_tests_test_general_LINK) $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_LDADD) $(LIBS) shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT): \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT): \ @@ -9373,7 +9222,7 @@ libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT): \ libnm/tests/test-nm-client$(EXEEXT): $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_DEPENDENCIES) $(EXTRA_libnm_tests_test_nm_client_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-nm-client$(EXEEXT) - $(AM_V_CCLD)$(libnm_tests_test_nm_client_LINK) $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_LDADD) $(LIBS) shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT): \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT): \ @@ -9382,7 +9231,7 @@ libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client. libnm/tests/test-remote-settings-client$(EXEEXT): $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_DEPENDENCIES) $(EXTRA_libnm_tests_test_remote_settings_client_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-remote-settings-client$(EXEEXT) - $(AM_V_CCLD)$(libnm_tests_test_remote_settings_client_LINK) $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_LDADD) $(LIBS) shared/libnm_tests_test_secret_agent-nm-test-utils-impl.$(OBJEXT): \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT): \ @@ -9391,7 +9240,7 @@ libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT): \ libnm/tests/test-secret-agent$(EXEEXT): $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_DEPENDENCIES) $(EXTRA_libnm_tests_test_secret_agent_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-secret-agent$(EXEEXT) - $(AM_V_CCLD)$(libnm_tests_test_secret_agent_LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS) src/src_NetworkManager-main.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -9404,13 +9253,13 @@ src/devices/tests/$(am__dirstamp): src/devices/tests/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/devices/tests/$(DEPDIR) @: > src/devices/tests/$(DEPDIR)/$(am__dirstamp) -src/devices/tests/src_devices_tests_test_acd-test-acd.$(OBJEXT): \ +src/devices/tests/src_devices_tests_test_arping-test-arping.$(OBJEXT): \ src/devices/tests/$(am__dirstamp) \ src/devices/tests/$(DEPDIR)/$(am__dirstamp) -src/devices/tests/test-acd$(EXEEXT): $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_DEPENDENCIES) $(EXTRA_src_devices_tests_test_acd_DEPENDENCIES) src/devices/tests/$(am__dirstamp) - @rm -f src/devices/tests/test-acd$(EXEEXT) - $(AM_V_CCLD)$(src_devices_tests_test_acd_LINK) $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_LDADD) $(LIBS) +src/devices/tests/test-arping$(EXEEXT): $(src_devices_tests_test_arping_OBJECTS) $(src_devices_tests_test_arping_DEPENDENCIES) $(EXTRA_src_devices_tests_test_arping_DEPENDENCIES) src/devices/tests/$(am__dirstamp) + @rm -f src/devices/tests/test-arping$(EXEEXT) + $(AM_V_CCLD)$(src_devices_tests_test_arping_LINK) $(src_devices_tests_test_arping_OBJECTS) $(src_devices_tests_test_arping_LDADD) $(LIBS) src/devices/tests/src_devices_tests_test_lldp-test-lldp.$(OBJEXT): \ src/devices/tests/$(am__dirstamp) \ src/devices/tests/$(DEPDIR)/$(am__dirstamp) @@ -9436,7 +9285,7 @@ src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.$(OBJEXT): \ src/devices/wifi/tests/test-general$(EXEEXT): $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_DEPENDENCIES) $(EXTRA_src_devices_wifi_tests_test_general_DEPENDENCIES) src/devices/wifi/tests/$(am__dirstamp) @rm -f src/devices/wifi/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(src_devices_wifi_tests_test_general_LINK) $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_LDADD) $(LIBS) src/dhcp/src_dhcp_nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT): \ src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp) @@ -9455,14 +9304,14 @@ src/dhcp/tests/src_dhcp_tests_test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT): src/dhcp/tests/test-dhcp-dhclient$(EXEEXT): $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp) @rm -f src/dhcp/tests/test-dhcp-dhclient$(EXEEXT) - $(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_dhclient_LINK) $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS) src/dhcp/tests/src_dhcp_tests_test_dhcp_utils-test-dhcp-utils.$(OBJEXT): \ src/dhcp/tests/$(am__dirstamp) \ src/dhcp/tests/$(DEPDIR)/$(am__dirstamp) src/dhcp/tests/test-dhcp-utils$(EXEEXT): $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp) @rm -f src/dhcp/tests/test-dhcp-utils$(EXEEXT) - $(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_utils_LINK) $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS) src/dnsmasq/tests/$(am__dirstamp): @$(MKDIR_P) src/dnsmasq/tests @: > src/dnsmasq/tests/$(am__dirstamp) @@ -9475,7 +9324,7 @@ src/dnsmasq/tests/src_dnsmasq_tests_test_dnsmasq_utils-test-dnsmasq-utils.$(OBJE src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT): $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) $(EXTRA_src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) src/dnsmasq/tests/$(am__dirstamp) @rm -f src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) - $(AM_V_CCLD)$(src_dnsmasq_tests_test_dnsmasq_utils_LINK) $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS) src/ndisc/tests/$(am__dirstamp): @$(MKDIR_P) src/ndisc/tests @: > src/ndisc/tests/$(am__dirstamp) @@ -9605,6 +9454,19 @@ src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifc src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT): $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp) @rm -f src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT) $(AM_V_CCLD)$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD) $(LIBS) +src/settings/plugins/ifnet/tests/$(am__dirstamp): + @$(MKDIR_P) src/settings/plugins/ifnet/tests + @: > src/settings/plugins/ifnet/tests/$(am__dirstamp) +src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/settings/plugins/ifnet/tests/$(DEPDIR) + @: > src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp) +src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.$(OBJEXT): \ + src/settings/plugins/ifnet/tests/$(am__dirstamp) \ + src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp) + +src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT): $(src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS) $(src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES) src/settings/plugins/ifnet/tests/$(am__dirstamp) + @rm -f src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT) + $(AM_V_CCLD)$(src_settings_plugins_ifnet_tests_test_ifnet_LINK) $(src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS) $(src_settings_plugins_ifnet_tests_test_ifnet_LDADD) $(LIBS) src/settings/plugins/ifupdown/tests/$(am__dirstamp): @$(MKDIR_P) src/settings/plugins/ifupdown/tests @: > src/settings/plugins/ifupdown/tests/$(am__dirstamp) @@ -9643,7 +9505,7 @@ src/supplicant/tests/src_supplicant_tests_test_supplicant_config-test-supplicant src/supplicant/tests/test-supplicant-config$(EXEEXT): $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_DEPENDENCIES) $(EXTRA_src_supplicant_tests_test_supplicant_config_DEPENDENCIES) src/supplicant/tests/$(am__dirstamp) @rm -f src/supplicant/tests/test-supplicant-config$(EXEEXT) - $(AM_V_CCLD)$(src_supplicant_tests_test_supplicant_config_LINK) $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_LDADD) $(LIBS) src/tests/config/$(am__dirstamp): @$(MKDIR_P) src/tests/config @: > src/tests/config/$(am__dirstamp) @@ -9659,7 +9521,7 @@ src/tests/config/src_tests_config_test_config-test-config.$(OBJEXT): \ src/tests/config/test-config$(EXEEXT): $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_DEPENDENCIES) $(EXTRA_src_tests_config_test_config_DEPENDENCIES) src/tests/config/$(am__dirstamp) @rm -f src/tests/config/test-config$(EXEEXT) - $(AM_V_CCLD)$(src_tests_config_test_config_LINK) $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_LDADD) $(LIBS) src/tests/$(am__dirstamp): @$(MKDIR_P) src/tests @: > src/tests/$(am__dirstamp) @@ -9696,6 +9558,12 @@ src/tests/src_tests_test_ip6_config-test-ip6-config.$(OBJEXT): \ src/tests/test-ip6-config$(EXEEXT): $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_DEPENDENCIES) $(EXTRA_src_tests_test_ip6_config_DEPENDENCIES) src/tests/$(am__dirstamp) @rm -f src/tests/test-ip6-config$(EXEEXT) $(AM_V_CCLD)$(src_tests_test_ip6_config_LINK) $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_LDADD) $(LIBS) +src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.$(OBJEXT): \ + src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp) + +src/tests/test-resolvconf-capture$(EXEEXT): $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_DEPENDENCIES) $(EXTRA_src_tests_test_resolvconf_capture_DEPENDENCIES) src/tests/$(am__dirstamp) + @rm -f src/tests/test-resolvconf-capture$(EXEEXT) + $(AM_V_CCLD)$(src_tests_test_resolvconf_capture_LINK) $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_LDADD) $(LIBS) shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT): \ shared/nm-utils/$(am__dirstamp) \ shared/nm-utils/$(DEPDIR)/$(am__dirstamp) @@ -9745,15 +9613,9 @@ mostlyclean-compile: -rm -f libnm-util/tests/*.$(OBJEXT) -rm -f libnm/*.$(OBJEXT) -rm -f libnm/*.lo - -rm -f libnm/fake-typelib/*.$(OBJEXT) - -rm -f libnm/fake-typelib/*.lo -rm -f libnm/tests/*.$(OBJEXT) -rm -f shared/*.$(OBJEXT) -rm -f shared/*.lo - -rm -f shared/c-siphash/src/*.$(OBJEXT) - -rm -f shared/c-siphash/src/*.lo - -rm -f shared/n-acd/src/*.$(OBJEXT) - -rm -f shared/n-acd/src/*.lo -rm -f shared/nm-utils/*.$(OBJEXT) -rm -f shared/nm-utils/*.lo -rm -f src/*.$(OBJEXT) @@ -9801,6 +9663,9 @@ mostlyclean-compile: -rm -f src/settings/plugins/ifcfg-rh/*.$(OBJEXT) -rm -f src/settings/plugins/ifcfg-rh/*.lo -rm -f src/settings/plugins/ifcfg-rh/tests/*.$(OBJEXT) + -rm -f src/settings/plugins/ifnet/*.$(OBJEXT) + -rm -f src/settings/plugins/ifnet/*.lo + -rm -f src/settings/plugins/ifnet/tests/*.$(OBJEXT) -rm -f src/settings/plugins/ifupdown/*.$(OBJEXT) -rm -f src/settings/plugins/ifupdown/*.lo -rm -f src/settings/plugins/ifupdown/tests/*.$(OBJEXT) @@ -9975,8 +9840,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-json.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-adsl.Plo@am__quote@ @@ -10117,7 +9983,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-active-connection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-dbus-helpers.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-adsl.Plo@am__quote@ @@ -10163,7 +10028,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-vpn-service-plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-wimax-nsp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_utils_la-nm-libnm-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@ @@ -10175,12 +10039,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo@am__quote@ @@ -10188,17 +10051,16 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_NetworkManager-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-main-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip4-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip6-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-logging.Plo@am__quote@ @@ -10208,12 +10070,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-subject.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-config-data.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp4-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp6-config.Plo@am__quote@ @@ -10229,7 +10091,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-session-monitor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-sleep-monitor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_nm_iface_helper-nm-iface-helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bond.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bridge.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-dummy.Plo@am__quote@ @@ -10265,14 +10127,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-device-team.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_lldp-test-lldp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-wifi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po@am__quote@ @@ -10310,7 +10169,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/src_ndisc_tests_test_ndisc_fake-test-ndisc-fake.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/src_ndisc_tests_test_ndisc_linux-test-ndisc-linux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-linux-platform.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-platform-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-platform.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Plo@am__quote@ @@ -10352,6 +10210,13 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh-test-ifcfg-rh.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo@am__quote@ @@ -10422,6 +10287,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_general_with_expect-test-general-with-expect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip4_config-test-ip4-config.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip6_config-test-ip6-config.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_utils-test-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_wired_defname-test-wired-defname.Po@am__quote@ @@ -10762,6 +10628,13 @@ shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo: shared/nm-util @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) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c +shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo: shared/nm-utils/siphash24.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/clients_common_libnmc_base_la-siphash24.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) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c + clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo: clients/common/nm-secret-agent-simple.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo -c -o clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Plo @@ -11068,42 +10941,161 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.PPP.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.PPP.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.PPP.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.PPP.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo `test -f 'introspection/org.freedesktop.NetworkManager.PPP.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.PPP.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.PPP.lo `test -f 'introspection/org.freedesktop.NetworkManager.PPP.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.PPP.c + +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo: introspection/org.freedesktop.NetworkManager.SecretAgent.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo `test -f 'introspection/org.freedesktop.NetworkManager.SecretAgent.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.SecretAgent.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.SecretAgent.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo `test -f 'introspection/org.freedesktop.NetworkManager.SecretAgent.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.SecretAgent.c + +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo: introspection/org.freedesktop.NetworkManager.Settings.Connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.Connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Settings.Connection.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.Connection.c + +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo: introspection/org.freedesktop.NetworkManager.Settings.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Settings.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.c + +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo: introspection/org.freedesktop.NetworkManager.VPN.Connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Connection.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.c + +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo: introspection/org.freedesktop.NetworkManager.VPN.Plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c + +shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: shared/nm-utils/c-list-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_core_libnm_core_la-c-list-util.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c + +shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c + +shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c + +shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c + +shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c + +shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c + +shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c + +shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo: shared/nm-utils/siphash24.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/libnm_core_libnm_core_la-siphash24.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c + +shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c + +libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/crypto.c' object='libnm-core/libnm_core_libnm_core_la-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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c + +libnm-core/libnm_core_libnm_core_la-nm-connection.lo: libnm-core/nm-connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-connection.c' object='libnm-core/libnm_core_libnm_core_la-nm-connection.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c + +libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: libnm-core/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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-dbus-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo: introspection/org.freedesktop.NetworkManager.SecretAgent.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo `test -f 'introspection/org.freedesktop.NetworkManager.SecretAgent.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.SecretAgent.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.SecretAgent.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo' libtool=yes @AMDEPBACKSLASH@ +libnm-core/libnm_core_libnm_core_la-nm-errors.lo: libnm-core/nm-errors.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-errors.c' object='libnm-core/libnm_core_libnm_core_la-nm-errors.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.SecretAgent.lo `test -f 'introspection/org.freedesktop.NetworkManager.SecretAgent.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.SecretAgent.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo: introspection/org.freedesktop.NetworkManager.Settings.Connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.Connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Settings.Connection.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo' libtool=yes @AMDEPBACKSLASH@ +libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo: libnm-core/nm-keyfile-reader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo `test -f 'libnm-core/nm-keyfile-reader.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-reader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-reader.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.Connection.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo `test -f 'libnm-core/nm-keyfile-reader.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-reader.c -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo: introspection/org.freedesktop.NetworkManager.Settings.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Settings.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo' libtool=yes @AMDEPBACKSLASH@ +libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo: introspection/org.freedesktop.NetworkManager.VPN.Connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Connection.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo' libtool=yes @AMDEPBACKSLASH@ +libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo: libnm-core/nm-keyfile-writer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo `test -f 'libnm-core/nm-keyfile-writer.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-writer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-writer.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo `test -f 'libnm-core/nm-keyfile-writer.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-writer.c -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo: introspection/org.freedesktop.NetworkManager.VPN.Plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo' libtool=yes @AMDEPBACKSLASH@ +libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-property-compare.c' object='libnm-core/libnm_core_libnm_core_la-nm-property-compare.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo: libnm-core/nm-setting-8021x.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo `test -f 'libnm-core/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/nm-setting-8021x.c @@ -11385,111 +11377,6 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo: libnm-core/nm-settin @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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo `test -f 'libnm-core/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless.c -shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: shared/nm-utils/c-list-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_core_libnm_core_la-c-list-util.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c - -shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c - -shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c - -shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c - -shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c - -shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c - -shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c - -shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c - -libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/crypto.c' object='libnm-core/libnm_core_libnm_core_la-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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c - -libnm-core/libnm_core_libnm_core_la-nm-connection.lo: libnm-core/nm-connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-connection.c' object='libnm-core/libnm_core_libnm_core_la-nm-connection.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c - -libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: libnm-core/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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-dbus-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c - -libnm-core/libnm_core_libnm_core_la-nm-errors.lo: libnm-core/nm-errors.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-errors.c' object='libnm-core/libnm_core_libnm_core_la-nm-errors.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c - -libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c - -libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c - -libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-property-compare.c' object='libnm-core/libnm_core_libnm_core_la-nm-property-compare.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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c - libnm-core/libnm_core_libnm_core_la-nm-setting.lo: libnm-core/nm-setting.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm-core/libnm_core_libnm_core_la-nm-setting.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting.lo `test -f 'libnm-core/nm-setting.c' || echo '$(srcdir)/'`libnm-core/nm-setting.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Plo @@ -12092,13 +11979,6 @@ libnm/libnm_libnm_utils_la-nm-libnm-utils.lo: libnm/nm-libnm-utils.c @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) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_utils_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c -libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo: libnm/fake-typelib/typelibs.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo -MD -MP -MF libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Tpo -c -o libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Tpo libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm/fake-typelib/typelibs.c' object='libnm/fake-typelib/libnm_libnm_utils_la-typelibs.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) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.c - libnm/libnm_libnm_la-nm-access-point.lo: libnm/nm-access-point.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-access-point.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Tpo -c -o libnm/libnm_libnm_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Plo @@ -12113,13 +11993,6 @@ libnm/libnm_libnm_la-nm-active-connection.lo: libnm/nm-active-connection.c @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) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.c -libnm/libnm_libnm_la-nm-checkpoint.lo: libnm/nm-checkpoint.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-checkpoint.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Tpo -c -o libnm/libnm_libnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm/nm-checkpoint.c' object='libnm/libnm_libnm_la-nm-checkpoint.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) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c - libnm/libnm_libnm_la-nm-client.lo: libnm/nm-client.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-client.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Tpo -c -o libnm/libnm_libnm_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Plo @@ -12435,20 +12308,6 @@ shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.lo `test -f 'shared/nm-utils/nm-vpn-plugin-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-vpn-plugin-utils.c -shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo: shared/c-siphash/src/c-siphash.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo -MD -MP -MF shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Tpo -c -o shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Tpo shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/c-siphash/src/c-siphash.c' object='shared/c-siphash/src/shared_libcsiphash_la-c-siphash.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) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c - -shared/n-acd/src/shared_libnacd_la-n-acd.lo: shared/n-acd/src/n-acd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -MT shared/n-acd/src/shared_libnacd_la-n-acd.lo -MD -MP -MF shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Tpo -c -o shared/n-acd/src/shared_libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Tpo shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/n-acd/src/n-acd.c' object='shared/n-acd/src/shared_libnacd_la-n-acd.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) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/shared_libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c - src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/devices/adsl/nm-atm-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/devices/adsl/nm-atm-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Plo @@ -12596,13 +12455,6 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c -src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo: src/devices/wifi/nm-wifi-common.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/wifi/nm-wifi-common.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c - src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo @@ -12610,20 +12462,6 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mes @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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c -src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo: src/devices/wifi/nm-device-iwd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/wifi/nm-device-iwd.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c - -src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo: src/devices/wifi/nm-iwd-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/wifi/nm-iwd-manager.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c - src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo: src/devices/wwan/nm-wwan-factory.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo -c -o src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/devices/wwan/nm-wwan-factory.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Plo @@ -12666,13 +12504,6 @@ src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo: src/devices/w @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_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo `test -f 'src/devices/wwan/nm-modem-ofono.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-ofono.c -src/src_libNetworkManager_la-nm-checkpoint.lo: src/nm-checkpoint.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-checkpoint.c' object='src/src_libNetworkManager_la-nm-checkpoint.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c - src/src_libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo @@ -12680,6 +12511,13 @@ src/src_libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-manager @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c +src/src_libNetworkManager_la-nm-checkpoint.lo: src/nm-checkpoint.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-checkpoint.c' object='src/src_libNetworkManager_la-nm-checkpoint.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c + src/devices/src_libNetworkManager_la-nm-device.lo: src/devices/nm-device.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Plo @@ -12694,12 +12532,12 @@ src/devices/src_libNetworkManager_la-nm-lldp-listener.lo: src/devices/nm-lldp-li @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/devices/nm-lldp-listener.c -src/devices/src_libNetworkManager_la-nm-acd-manager.lo: src/devices/nm-acd-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-acd-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Tpo -c -o src/devices/src_libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/nm-acd-manager.c' object='src/devices/src_libNetworkManager_la-nm-acd-manager.lo' libtool=yes @AMDEPBACKSLASH@ +src/devices/src_libNetworkManager_la-nm-arping-manager.lo: src/devices/nm-arping-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-arping-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Tpo -c -o src/devices/src_libNetworkManager_la-nm-arping-manager.lo `test -f 'src/devices/nm-arping-manager.c' || echo '$(srcdir)/'`src/devices/nm-arping-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/nm-arping-manager.c' object='src/devices/src_libNetworkManager_la-nm-arping-manager.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-arping-manager.lo `test -f 'src/devices/nm-arping-manager.c' || echo '$(srcdir)/'`src/devices/nm-arping-manager.c src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo: src/devices/nm-device-ethernet-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet-utils.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet-utils.c @@ -12848,20 +12686,6 @@ src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo: src/dhcp/nm-dhcp-dh @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo `test -f 'src/dhcp/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient-utils.c -src/dns/src_libNetworkManager_la-nm-dns-manager.lo: src/dns/nm-dns-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-manager.c' object='src/dns/src_libNetworkManager_la-nm-dns-manager.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c - -src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: src/dns/nm-dns-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-plugin.c' object='src/dns/src_libNetworkManager_la-nm-dns-plugin.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c - src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo: src/dns/nm-dns-dnsmasq.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo `test -f 'src/dns/nm-dns-dnsmasq.c' || echo '$(srcdir)/'`src/dns/nm-dns-dnsmasq.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Plo @@ -12883,6 +12707,20 @@ src/dns/src_libNetworkManager_la-nm-dns-unbound.lo: src/dns/nm-dns-unbound.c @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-unbound.lo `test -f 'src/dns/nm-dns-unbound.c' || echo '$(srcdir)/'`src/dns/nm-dns-unbound.c +src/dns/src_libNetworkManager_la-nm-dns-manager.lo: src/dns/nm-dns-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-manager.c' object='src/dns/src_libNetworkManager_la-nm-dns-manager.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c + +src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: src/dns/nm-dns-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-plugin.c' object='src/dns/src_libNetworkManager_la-nm-dns-plugin.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c + src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo: src/dnsmasq/nm-dnsmasq-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo -MD -MP -MF src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Tpo -c -o src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo `test -f 'src/dnsmasq/nm-dnsmasq-manager.c' || echo '$(srcdir)/'`src/dnsmasq/nm-dnsmasq-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Tpo src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Plo @@ -13044,12 +12882,12 @@ src/src_libNetworkManager_la-nm-audit-manager.lo: src/nm-audit-manager.c @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-audit-manager.lo `test -f 'src/nm-audit-manager.c' || echo '$(srcdir)/'`src/nm-audit-manager.c -src/src_libNetworkManager_la-nm-dbus-manager.lo: src/nm-dbus-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-dbus-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Tpo -c -o src/src_libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-dbus-manager.c' object='src/src_libNetworkManager_la-nm-dbus-manager.lo' libtool=yes @AMDEPBACKSLASH@ +src/src_libNetworkManager_la-nm-bus-manager.lo: src/nm-bus-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-bus-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Tpo -c -o src/src_libNetworkManager_la-nm-bus-manager.lo `test -f 'src/nm-bus-manager.c' || echo '$(srcdir)/'`src/nm-bus-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-bus-manager.c' object='src/src_libNetworkManager_la-nm-bus-manager.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-bus-manager.lo `test -f 'src/nm-bus-manager.c' || echo '$(srcdir)/'`src/nm-bus-manager.c src/src_libNetworkManager_la-nm-config.lo: src/nm-config.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-config.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-config.Tpo -c -o src/src_libNetworkManager_la-nm-config.lo `test -f 'src/nm-config.c' || echo '$(srcdir)/'`src/nm-config.c @@ -13065,13 +12903,6 @@ src/src_libNetworkManager_la-nm-config-data.lo: src/nm-config-data.c @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-config-data.lo `test -f 'src/nm-config-data.c' || echo '$(srcdir)/'`src/nm-config-data.c -src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c - src/src_libNetworkManager_la-nm-dcb.lo: src/nm-dcb.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-dcb.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo -c -o src/src_libNetworkManager_la-nm-dcb.lo `test -f 'src/nm-dcb.c' || echo '$(srcdir)/'`src/nm-dcb.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo @@ -13184,6 +13015,13 @@ src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/nm-sleep-monitor.c @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/nm-sleep-monitor.c +src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c + src/src_libNetworkManagerBase_la-nm-core-utils.lo: src/nm-core-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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-core-utils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo -c -o src/src_libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/nm-core-utils.c' || echo '$(srcdir)/'`src/nm-core-utils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Plo @@ -13205,13 +13043,6 @@ src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo: src/NetworkManagerUtils @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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/NetworkManagerUtils.c -src/platform/src_libNetworkManagerBase_la-nm-netlink.lo: src/platform/nm-netlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/src_libNetworkManagerBase_la-nm-netlink.lo -MD -MP -MF src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Tpo -c -o src/platform/src_libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Tpo src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/platform/nm-netlink.c' object='src/platform/src_libNetworkManagerBase_la-nm-netlink.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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/src_libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.c - src/platform/src_libNetworkManagerBase_la-nmp-netns.lo: src/platform/nmp-netns.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/src_libNetworkManagerBase_la-nmp-netns.lo -MD -MP -MF src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Tpo -c -o src/platform/src_libNetworkManagerBase_la-nmp-netns.lo `test -f 'src/platform/nmp-netns.c' || echo '$(srcdir)/'`src/platform/nmp-netns.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Tpo src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Plo @@ -13275,19 +13106,12 @@ src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo: src/ndisc/nm-ndisc.c @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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo `test -f 'src/ndisc/nm-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-ndisc.c -src/src_libNetworkManagerBase_la-nm-dbus-utils.lo: src/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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-dbus-utils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Tpo -c -o src/src_libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-dbus-utils.c' object='src/src_libNetworkManagerBase_la-nm-dbus-utils.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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c - -src/src_libNetworkManagerBase_la-nm-dbus-object.lo: src/nm-dbus-object.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-dbus-object.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Tpo -c -o src/src_libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-dbus-object.c' object='src/src_libNetworkManagerBase_la-nm-dbus-object.lo' libtool=yes @AMDEPBACKSLASH@ +src/src_libNetworkManagerBase_la-nm-exported-object.lo: src/nm-exported-object.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-exported-object.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Tpo -c -o src/src_libNetworkManagerBase_la-nm-exported-object.lo `test -f 'src/nm-exported-object.c' || echo '$(srcdir)/'`src/nm-exported-object.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-exported-object.c' object='src/src_libNetworkManagerBase_la-nm-exported-object.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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.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_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-exported-object.lo `test -f 'src/nm-exported-object.c' || echo '$(srcdir)/'`src/nm-exported-object.c src/src_libNetworkManagerBase_la-nm-ip4-config.lo: src/nm-ip4-config.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-ip4-config.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip4-config.Tpo -c -o src/src_libNetworkManagerBase_la-nm-ip4-config.lo `test -f 'src/nm-ip4-config.c' || echo '$(srcdir)/'`src/nm-ip4-config.c @@ -13800,6 +13624,48 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core @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_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo: src/settings/plugins/ifnet/nms-ifnet-connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-connection.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.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_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection.c + +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo: src/settings/plugins/ifnet/nms-ifnet-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-plugin.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.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_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-plugin.c + +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo: src/settings/plugins/ifnet/nms-ifnet-net-parser.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-parser.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-net-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-parser.c + +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo: src/settings/plugins/ifnet/nms-ifnet-connection-parser.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection-parser.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection-parser.c + +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo: src/settings/plugins/ifnet/nms-ifnet-net-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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-net-utils.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-utils.c + +src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo: src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c + src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo: src/settings/plugins/ifupdown/nms-ifupdown-connection.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo -MD -MP -MF src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo -c -o src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-connection.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo @@ -14990,20 +14856,6 @@ libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-util/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-util/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-settings-defaults.c'; fi` -shared/nm-utils/libnm_tests_test_general-nm-compat.o: shared/nm-utils/nm-compat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c - -shared/nm-utils/libnm_tests_test_general-nm-compat.obj: shared/nm-utils/nm-compat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi` - libnm/tests/libnm_tests_test_general-test-general.o: libnm/tests/test-general.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_general-test-general.o -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo -c -o libnm/tests/libnm_tests_test_general-test-general.o `test -f 'libnm/tests/test-general.c' || echo '$(srcdir)/'`libnm/tests/test-general.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po @@ -15116,19 +14968,19 @@ src/src_NetworkManager-main.obj: src/main.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_NetworkManager-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi` -src/devices/tests/src_devices_tests_test_acd-test-acd.o: src/devices/tests/test-acd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_acd-test-acd.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/src_devices_tests_test_acd-test-acd.o' libtool=no @AMDEPBACKSLASH@ +src/devices/tests/src_devices_tests_test_arping-test-arping.o: src/devices/tests/test-arping.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_arping-test-arping.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.o `test -f 'src/devices/tests/test-arping.c' || echo '$(srcdir)/'`src/devices/tests/test-arping.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-arping.c' object='src/devices/tests/src_devices_tests_test_arping-test-arping.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.o `test -f 'src/devices/tests/test-arping.c' || echo '$(srcdir)/'`src/devices/tests/test-arping.c -src/devices/tests/src_devices_tests_test_acd-test-acd.obj: src/devices/tests/test-acd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_acd-test-acd.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/src_devices_tests_test_acd-test-acd.obj' libtool=no @AMDEPBACKSLASH@ +src/devices/tests/src_devices_tests_test_arping-test-arping.obj: src/devices/tests/test-arping.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_arping-test-arping.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.obj `if test -f 'src/devices/tests/test-arping.c'; then $(CYGPATH_W) 'src/devices/tests/test-arping.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-arping.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-arping.c' object='src/devices/tests/src_devices_tests_test_arping-test-arping.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.obj `if test -f 'src/devices/tests/test-arping.c'; then $(CYGPATH_W) 'src/devices/tests/test-arping.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-arping.c'; fi` src/devices/tests/src_devices_tests_test_lldp-test-lldp.o: src/devices/tests/test-lldp.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_lldp-test-lldp.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_lldp-test-lldp.Tpo -c -o src/devices/tests/src_devices_tests_test_lldp-test-lldp.o `test -f 'src/devices/tests/test-lldp.c' || echo '$(srcdir)/'`src/devices/tests/test-lldp.c @@ -15466,6 +15318,20 @@ src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifc @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh-test-ifcfg-rh.obj `if test -f 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; then $(CYGPATH_W) 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; fi` +src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o: src/settings/plugins/ifnet/tests/test-ifnet.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o -MD -MP -MF src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o `test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/tests/test-ifnet.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/tests/test-ifnet.c' object='src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o `test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/tests/test-ifnet.c + +src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj: src/settings/plugins/ifnet/tests/test-ifnet.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj -MD -MP -MF src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj `if test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c'; then $(CYGPATH_W) 'src/settings/plugins/ifnet/tests/test-ifnet.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifnet/tests/test-ifnet.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/tests/test-ifnet.c' object='src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj `if test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c'; then $(CYGPATH_W) 'src/settings/plugins/ifnet/tests/test-ifnet.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifnet/tests/test-ifnet.c'; fi` + src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o: src/settings/plugins/ifupdown/tests/test-ifupdown.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o -MD -MP -MF src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Tpo -c -o src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o `test -f 'src/settings/plugins/ifupdown/tests/test-ifupdown.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/tests/test-ifupdown.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Tpo src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Po @@ -15606,6 +15472,20 @@ src/tests/src_tests_test_ip6_config-test-ip6-config.obj: src/tests/test-ip6-conf @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_ip6_config-test-ip6-config.obj `if test -f 'src/tests/test-ip6-config.c'; then $(CYGPATH_W) 'src/tests/test-ip6-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-ip6-config.c'; fi` +src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o: src/tests/test-resolvconf-capture.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o `test -f 'src/tests/test-resolvconf-capture.c' || echo '$(srcdir)/'`src/tests/test-resolvconf-capture.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/test-resolvconf-capture.c' object='src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o `test -f 'src/tests/test-resolvconf-capture.c' || echo '$(srcdir)/'`src/tests/test-resolvconf-capture.c + +src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj: src/tests/test-resolvconf-capture.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj `if test -f 'src/tests/test-resolvconf-capture.c'; then $(CYGPATH_W) 'src/tests/test-resolvconf-capture.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-resolvconf-capture.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/test-resolvconf-capture.c' object='src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj `if test -f 'src/tests/test-resolvconf-capture.c'; then $(CYGPATH_W) 'src/tests/test-resolvconf-capture.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-resolvconf-capture.c'; fi` + shared/nm-utils/src_tests_test_systemd-siphash24.o: shared/nm-utils/siphash24.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_tests_test_systemd-siphash24.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo -c -o shared/nm-utils/src_tests_test_systemd-siphash24.o `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po @@ -15764,11 +15644,8 @@ clean-libtool: -rm -rf libnm-glib/tests/.libs libnm-glib/tests/_libs -rm -rf libnm-util/.libs libnm-util/_libs -rm -rf libnm-util/tests/.libs libnm-util/tests/_libs - -rm -rf libnm/fake-typelib/.libs libnm/fake-typelib/_libs -rm -rf libnm/tests/.libs libnm/tests/_libs -rm -rf shared/.libs shared/_libs - -rm -rf shared/c-siphash/src/.libs shared/c-siphash/src/_libs - -rm -rf shared/n-acd/src/.libs shared/n-acd/src/_libs -rm -rf shared/nm-utils/.libs shared/nm-utils/_libs -rm -rf src/.libs src/_libs -rm -rf src/devices/.libs src/devices/_libs @@ -15796,6 +15673,8 @@ clean-libtool: -rm -rf src/settings/plugins/ibft/tests/.libs src/settings/plugins/ibft/tests/_libs -rm -rf src/settings/plugins/ifcfg-rh/.libs src/settings/plugins/ifcfg-rh/_libs -rm -rf src/settings/plugins/ifcfg-rh/tests/.libs src/settings/plugins/ifcfg-rh/tests/_libs + -rm -rf src/settings/plugins/ifnet/.libs src/settings/plugins/ifnet/_libs + -rm -rf src/settings/plugins/ifnet/tests/.libs src/settings/plugins/ifnet/tests/_libs -rm -rf src/settings/plugins/ifupdown/.libs src/settings/plugins/ifupdown/_libs -rm -rf src/settings/plugins/ifupdown/tests/.libs src/settings/plugins/ifupdown/tests/_libs -rm -rf src/settings/plugins/keyfile/.libs src/settings/plugins/keyfile/_libs @@ -16813,6 +16692,13 @@ src/settings/plugins/ifupdown/tests/test-ifupdown.log: src/settings/plugins/ifup --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +src/settings/plugins/ifnet/tests/test-ifnet.log: src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT) + @p='src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT)'; \ + b='src/settings/plugins/ifnet/tests/test-ifnet'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) src/devices/wifi/tests/test-general.log: src/devices/wifi/tests/test-general$(EXEEXT) @p='src/devices/wifi/tests/test-general$(EXEEXT)'; \ b='src/devices/wifi/tests/test-general'; \ @@ -16904,9 +16790,9 @@ src/devices/tests/test-lldp.log: src/devices/tests/test-lldp$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -src/devices/tests/test-acd.log: src/devices/tests/test-acd$(EXEEXT) - @p='src/devices/tests/test-acd$(EXEEXT)'; \ - b='src/devices/tests/test-acd'; \ +src/devices/tests/test-arping.log: src/devices/tests/test-arping$(EXEEXT) + @p='src/devices/tests/test-arping$(EXEEXT)'; \ + b='src/devices/tests/test-arping'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ @@ -16974,6 +16860,13 @@ src/tests/test-systemd.log: src/tests/test-systemd$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +src/tests/test-resolvconf-capture.log: src/tests/test-resolvconf-capture$(EXEEXT) + @p='src/tests/test-resolvconf-capture$(EXEEXT)'; \ + b='src/tests/test-resolvconf-capture'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) src/tests/test-wired-defname.log: src/tests/test-wired-defname$(EXEEXT) @p='src/tests/test-wired-defname$(EXEEXT)'; \ b='src/tests/test-wired-defname'; \ @@ -17344,16 +17237,10 @@ distclean-generic: -rm -f libnm-util/tests/$(am__dirstamp) -rm -f libnm/$(DEPDIR)/$(am__dirstamp) -rm -f libnm/$(am__dirstamp) - -rm -f libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp) - -rm -f libnm/fake-typelib/$(am__dirstamp) -rm -f libnm/tests/$(DEPDIR)/$(am__dirstamp) -rm -f libnm/tests/$(am__dirstamp) -rm -f shared/$(DEPDIR)/$(am__dirstamp) -rm -f shared/$(am__dirstamp) - -rm -f shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp) - -rm -f shared/c-siphash/src/$(am__dirstamp) - -rm -f shared/n-acd/src/$(DEPDIR)/$(am__dirstamp) - -rm -f shared/n-acd/src/$(am__dirstamp) -rm -f shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -rm -f shared/nm-utils/$(am__dirstamp) -rm -f src/$(DEPDIR)/$(am__dirstamp) @@ -17408,6 +17295,10 @@ distclean-generic: -rm -f src/settings/plugins/ifcfg-rh/$(am__dirstamp) -rm -f src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp) -rm -f src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp) + -rm -f src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) + -rm -f src/settings/plugins/ifnet/$(am__dirstamp) + -rm -f src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp) + -rm -f src/settings/plugins/ifnet/tests/$(am__dirstamp) -rm -f src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp) -rm -f src/settings/plugins/ifupdown/$(am__dirstamp) -rm -f src/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp) @@ -17456,7 +17347,7 @@ clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/fake-typelib/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/c-siphash/src/$(DEPDIR) shared/n-acd/src/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) + -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -17522,7 +17413,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/fake-typelib/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/c-siphash/src/$(DEPDIR) shared/n-acd/src/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) + -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -17675,6 +17566,8 @@ docs/api/dbus-%.xml: introspection/%.c $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources) $(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources) $(libnm_libnm_la_OBJECTS): $(introspection_sources) +$(src_libNetworkManager_la_OBJECTS): $(introspection_sources) +$(src_libNetworkManagerBase_la_OBJECTS): $(introspection_sources) libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp @@ -17727,17 +17620,8 @@ check-local-exports-libnm: libnm/libnm.la @HAVE_INTROSPECTION_TRUE@libnm/libnm.typelib: libnm/libnm.gir @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ - -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ - -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib -@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/libnm/fake-typelib --generate-source --manual-register - @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $@ $(filter-out $<,$^) +@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus "$(srcdir)" $@ # When the python scripts loads libnm and the address sanitizers is # enabled, we must LD_PRELOAD libasan otherwise it will complain that @@ -17764,9 +17648,9 @@ check-local-exports-libnm: libnm/libnm.la @HAVE_INTROSPECTION_TRUE@ --output $@ @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile $@ $(filter-out $<,$^) +@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile "$(srcdir)" $@ @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $@ $(filter-out $<,$^) +@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(srcdir)" $@ $(libnm_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -17840,6 +17724,10 @@ dist-hook-settings-ifcfg-rh-alias-files: @CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@CONFIG_PLUGIN_IFNET_TRUE@check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la +@CONFIG_PLUGIN_IFNET_TRUE@ $(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so) +@CONFIG_PLUGIN_IFNET_TRUE@ $(CODE_COVERAGE_LDFLAGS) + check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver" $(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so) @@ -17885,7 +17773,7 @@ $(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_devices_tests_test_arping_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -17897,6 +17785,7 @@ $(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_resolvconf_capture_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -17936,21 +17825,21 @@ $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp -@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) -@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_h) +@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_c) @HAVE_INTROSPECTION_TRUE@ @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ -@HAVE_INTROSPECTION_TRUE@ if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ -@HAVE_INTROSPECTION_TRUE@ echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ +@HAVE_INTROSPECTION_TRUE@ if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \ +@HAVE_INTROSPECTION_TRUE@ echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ @HAVE_INTROSPECTION_TRUE@ false; \ @HAVE_INTROSPECTION_TRUE@ fi;\ @HAVE_INTROSPECTION_TRUE@ fi -@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp -@HAVE_INTROSPECTION_FALSE@ $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" +@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp +@HAVE_INTROSPECTION_FALSE@ $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" @HAVE_INTROSPECTION_FALSE@check-local-settings-docs: $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) +$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c) $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp $(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) diff --git a/NEWS b/NEWS index bdb7a451..a9af5841 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,67 @@ -============================================= -NetworkManager-1.?? (not released yet) -Overview of changes since NetworkManager-1.10 -============================================= +=============================================== +NetworkManager-1.10.8 +Overview of changes since NetworkManager-1.10.6 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* Fix connectivity timeout handling (bgo #794464) +* Retry activating devices when the parent becomes managed (rh #1553595) +* Correctly set the rp_filter value (rh #1565529) +* A fix to ensure teamd is respawned after daemon restart (rh #1551958) +* Better handle DHCP expiry (bgo #783391) +* Fix configuration of IPv6 over master interfaces (rh #1575944) +* Other various bug fixes including possible crashes +* Updated translations + +=============================================== +NetworkManager-1.10.6 +Overview of changes since NetworkManager-1.10.4 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* ovs: fix compilation issue of OVS plugin and various fixes +* team: add support for team runner "random" +* core: cleanup activation of device (rh #1537160) +* dhcp: retry indefinitely to renew the lease (rh #1503587) +* core: fix blocking autoconnect for no-secrets (rh #794014) +* libnm: mark async results as cancelled (bgo #794088) +* Various bug fixes including possible crashes. +* Updated translations. + +=============================================== +NetworkManager-1.10.4 +Overview of changes since NetworkManager-1.10.2 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* Load jansson at runtime. This solves a clash with json-glib that caused + a gnome-control-center crash, but also gets rid of a hard dependency. +* Correct nmcli exit values after receiving a signal. +* Fix libnm secret agent asynchronous initialization. +* Add a default route for a modem even if it didn't sent a gateway. +* Improve communication of DAD failures. +* Remember device default metrics across daemon restarts. +* Various bug fixes including possible crashes. +* Updated translations. + +=============================================== +NetworkManager-1.10.2 +Overview of changes since NetworkManager-1.10.0 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: -* A non-hexadecimal DHCPv4 client-id is now properly passed to - dhclient with the first byte (type) set to zero, as stated in the - documentation. This represents a change in behavior since previous - versions where the first character of the string was used as - type. The internal client is not affected by the change. +* Added support for 'onlink' IPv4 routes attribute. +* Wait longer for the carrier to come up after a MTU change. +* Implemented abstraction for team connections that exposes team + configuration items as distinct properties. +* Added basic support for tc queueing disciplines and filters. +* Introduced an Update2() D-Bus method to update connection settings + with more flexibility. +* Many bug fixes and improvements. ============================================ NetworkManager-1.10 @@ -932,7 +986,7 @@ Overview of changes since NetworkManager-0.4.1 default action. * Fix icon animation smoothness * Display more data in the Connection Information dialog - (Robert Love). + (Robert Love) ============================================ diff --git a/README b/README index fd3898dd..286cabcb 100644 --- a/README +++ b/README @@ -45,7 +45,7 @@ settings service" and the "user settings service" store connection information and provide these to NetworkManager, also via D-Bus. Each settings service can determine how and where it persistently stores the connection information; for example, the GNOME applet stores its configuration in GConf, and the system -settings service stores its config in distro-specific formats, or in a distro- +settings service stores it's config in distro-specific formats, or in a distro- agnostic format, depending on user/administrator preference. A variety of other system services are used by NetworkManager to provide diff --git a/TODO b/TODO index 566bbd5a..86fef82b 100644 --- a/TODO +++ b/TODO @@ -19,7 +19,7 @@ The first is the largest obstacle, but ideally we implement this and enable it when we have the required glib and libsoup versions available. One other complication is that this checking should be done during the NM_DEVICE_STATE_IP_CHECK phase (along with other operations like WiFi hotspot -auto-login) while the current checks are done globally in nm-manager.c, so +auto-login) while the current checks are done globally in nm-manager.c, so keeping both code paths might be complex. But ideally, once the device has successfully gotten an IPv4 or IPv6 address, it @@ -38,7 +38,7 @@ based on it and the device's state. To allow for "pre-down" scenarios, this state should be implemented before a device is taken down while it still has connectivity. If the device is -taken down because its ethernet carrier was dropped, or because the WiFi +taken down because it's ethernet carrier was dropped, or because the WiFi connection was terminated by the supplicant, this state is pointless and should be skipped. But if the user requested a manual "disconnect", or NM is dropping connections on exit, etc, then this state should be entered. In the future @@ -235,7 +235,7 @@ proceeds with the connection. NM sends the correct wpa_supplicant config for WPS to the supplicant, and waits for the connection to occur. WPS can only be used the *first* time, so after a -first successfull connection, NM must request the actual hexadecimal PSK from +first successfull connection, NM must request the actual hexadecimal PSK from wpa_supplicant via D-Bus, and store that PSK in the connection, clear any WPS PIN code from the connection, and save the connection to backing storage. diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 46725c94..488b16f4 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -104,7 +104,7 @@ get_secrets_from_user (const char *request_id, rl_startup_hook = set_deftext; pre_input_deftext = g_strdup (secret->value); } - pwd = nmc_readline ("%s (%s): ", secret->pretty_name, secret->entry_id); + pwd = nmc_readline ("%s (%s): ", secret->name, secret->prop_name); /* No password provided, cancel the secrets. */ if (!pwd) diff --git a/clients/cli/common.c b/clients/cli/common.c index 81a3183d..0f5aea57 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2012 - 2017 Red Hat, Inc. + * Copyright 2012 - 2014 Red Hat, Inc. */ #include "nm-default.h" @@ -26,10 +26,12 @@ #include #include #include +#include #include #include #include +#include "nm-utils/nm-hash-utils.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" @@ -107,7 +109,6 @@ _metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free) { NMIPConfig *cfg4 = target; @@ -115,12 +116,10 @@ _metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment, char **arr; const char *const*arrc; guint i = 0; - const char *str; nm_assert (info->info_type < _NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM); NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); - NM_SET_OUT (out_is_default, TRUE); switch (info->info_type) { case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ADDRESS: @@ -141,9 +140,7 @@ _metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment, arr = NULL; goto arr_out; case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_GATEWAY: - str = nm_ip_config_get_gateway (cfg4); - NM_SET_OUT (out_is_default, !str); - return str; + return nm_ip_config_get_gateway (cfg4); case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ROUTE: if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV)) return NULL; @@ -171,12 +168,10 @@ _metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment, g_return_val_if_reached (NULL); arrc_out: - NM_SET_OUT (out_is_default, !arrc || !arrc[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; return arrc; arr_out: - NM_SET_OUT (out_is_default, !arr || !arr[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; *out_to_free = arr; return arr; @@ -190,7 +185,6 @@ _metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free) { NMIPConfig *cfg6 = target; @@ -198,12 +192,10 @@ _metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment, char **arr; const char *const*arrc; guint i = 0; - const char *str; nm_assert (info->info_type < _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM); NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); - NM_SET_OUT (out_is_default, TRUE); switch (info->info_type) { case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ADDRESS: @@ -224,9 +216,7 @@ _metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment, arr = NULL; goto arr_out; case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_GATEWAY: - str = nm_ip_config_get_gateway (cfg6); - NM_SET_OUT (out_is_default, !str); - return str; + return nm_ip_config_get_gateway (cfg6); case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ROUTE: if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV)) return NULL; @@ -249,12 +239,10 @@ _metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment, g_return_val_if_reached (NULL); arrc_out: - NM_SET_OUT (out_is_default, !arrc || !arrc[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; return arrc; arr_out: - NM_SET_OUT (out_is_default, !arr || !arr[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; *out_to_free = arr; return arr; @@ -544,10 +532,10 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets) { GError *error = NULL; NMSettingVpn *s_vpn; - const char *gw, *port; - gs_free char *cookie = NULL; - gs_free char *gateway = NULL; - gs_free char *gwcert = NULL; + const char *vpn_type, *gw, *port; + char *cookie = NULL; + char *gateway = NULL; + char *gwcert = NULL; int status = 0; int i; gboolean ret; @@ -559,7 +547,8 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets) return FALSE; s_vpn = nm_connection_get_setting_vpn (connection); - if (!nm_streq0 (nm_setting_vpn_get_service_type (s_vpn), NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT)) + vpn_type = nm_setting_vpn_get_service_type (s_vpn); + if (g_strcmp0 (vpn_type, NM_DBUS_INTERFACE ".openconnect")) return FALSE; /* Get gateway and port */ @@ -582,31 +571,34 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets) /* Append port to the host value */ if (gateway && port) { - gs_free char *tmp = gateway; - - gateway = g_strdup_printf ("%s%s", tmp, port); + char *tmp = gateway; + gateway = g_strdup_printf ("%s%s", gateway, port); + g_free (tmp); } /* Fill secrets to the array */ for (i = 0; i < secrets->len; i++) { NMSecretAgentSimpleSecret *secret = secrets->pdata[i]; - if (secret->secret_type != NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET) - continue; - if (!nm_streq0 (secret->vpn_type, NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT)) - continue; - - if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "cookie")) { - g_free (secret->value); - secret->value = g_steal_pointer (&cookie); - } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gateway")) { - g_free (secret->value); - secret->value = g_steal_pointer (&gateway); - } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gwcert")) { - g_free (secret->value); - secret->value = g_steal_pointer (&gwcert); + if (!g_strcmp0 (secret->vpn_type, vpn_type)) { + if (!g_strcmp0 (secret->vpn_property, "cookie")) { + g_free (secret->value); + secret->value = cookie; + cookie = NULL; + } else if (!g_strcmp0 (secret->vpn_property, "gateway")) { + g_free (secret->value); + secret->value = gateway; + gateway = NULL; + } else if (!g_strcmp0 (secret->vpn_property, "gwcert")) { + g_free (secret->value); + secret->value = gwcert; + gwcert = NULL; + } } } + g_free (cookie); + g_free (gateway); + g_free (gwcert); return TRUE; } @@ -633,7 +625,7 @@ get_secrets_from_user (const char *request_id, /* First try to find the password in provided passwords file, * then ask user. */ - if (pwds_hash && (pwd = g_hash_table_lookup (pwds_hash, secret->entry_id))) { + if (pwds_hash && (pwd = g_hash_table_lookup (pwds_hash, secret->prop_name))) { pwd = g_strdup (pwd); } else { if (ask) { @@ -649,10 +641,8 @@ get_secrets_from_user (const char *request_id, } if (msg) g_print ("%s\n", msg); - pwd = nmc_readline_echo (secret->is_secret - ? echo_on - : TRUE, - "%s (%s): ", secret->pretty_name, secret->entry_id); + pwd = nmc_readline_echo (secret->password ? echo_on : TRUE, + "%s (%s): ", secret->name, secret->prop_name); if (!pwd) pwd = g_strdup (""); } else { @@ -660,7 +650,7 @@ get_secrets_from_user (const char *request_id, g_print ("%s\n", msg); g_printerr (_("Warning: password for '%s' not given in 'passwd-file' " "and nmcli cannot ask without '--ask' option.\n"), - secret->entry_id); + secret->prop_name); } } /* No password provided, cancel the secrets. */ @@ -893,31 +883,6 @@ nmc_readline (const char *prompt_fmt, ...) return str; } -static void -nmc_secret_redisplay (void) -{ - int save_point = rl_point; - int save_end = rl_end; - char *save_line_buffer = rl_line_buffer; - const char *subst = nmc_password_subst_char (); - int subst_len = strlen (subst); - int i; - - rl_point = g_utf8_strlen (save_line_buffer, save_point) * subst_len; - rl_end = g_utf8_strlen (rl_line_buffer, -1) * subst_len; - rl_line_buffer = g_slice_alloc (rl_end + 1); - - for (i = 0; i + subst_len <= rl_end; i += subst_len) - memcpy (&rl_line_buffer[i], subst, subst_len); - rl_line_buffer[i] = '\0'; - - rl_redisplay (); - g_slice_free1 (rl_end + 1, rl_line_buffer); - rl_line_buffer = save_line_buffer; - rl_end = save_end; - rl_point = save_point; -} - /** * nmc_readline_echo: * @@ -929,28 +894,29 @@ nmc_readline_echo (gboolean echo_on, const char *prompt_fmt, ...) { va_list args; char *prompt, *str; - HISTORY_STATE *saved_history; - HISTORY_STATE passwd_history = { 0, }; + struct termios termios_orig, termios_new; va_start (args, prompt_fmt); prompt = g_strdup_vprintf (prompt_fmt, args); va_end (args); - /* Hide the actual password */ + /* Disable echoing characters */ if (!echo_on) { - saved_history = history_get_history_state (); - history_set_history_state (&passwd_history); - rl_redisplay_function = nmc_secret_redisplay; + tcgetattr (STDIN_FILENO, &termios_orig); + termios_new = termios_orig; + termios_new.c_lflag &= ~(ECHO); + tcsetattr (STDIN_FILENO, TCSADRAIN, &termios_new); } str = nmc_readline_helper (prompt); g_free (prompt); - /* Restore the non-hiding behavior */ + /* Restore original terminal settings */ if (!echo_on) { - rl_redisplay_function = rl_redisplay; - history_set_history_state (saved_history); + tcsetattr (STDIN_FILENO, TCSADRAIN, &termios_orig); + /* New line - setting ECHONL | ICANON did not help */ + fprintf (stdout, "\n"); } return str; @@ -1249,8 +1215,9 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char /* A valid command was specified. */ if (c->usage && argc == 2 && nmc->complete) nmc_complete_help (*(argv+1)); - if (!nmc->complete && c->usage && nmc_arg_is_help (*(argv+1))) { - c->usage (); + if (c->usage && nmc_arg_is_help (*(argv+1))) { + if (!nmc->complete) + c->usage (); g_simple_async_result_complete_in_idle (simple); g_object_unref (simple); } else { diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 705d3c25..e0f55c53 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -31,6 +31,8 @@ #include #include +#include "nm-utils/nm-hash-utils.h" + #include "nm-client-utils.h" #include "nm-vpn-helpers.h" #include "nm-meta-setting-access.h" @@ -503,8 +505,12 @@ usage_connection_export (void) static void quit (void) { - if (nm_clear_g_source (&progress_id)) + if (progress_id) { + g_source_remove (progress_id); + progress_id = 0; nmc_terminal_erase_line (); + } + g_main_loop_quit (loop); } @@ -1122,6 +1128,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) const char *fields_str = NULL; const NMMetaAbstractInfo *const*tmpl; NmcOutputField *arr; + size_t tmpl_len; const char *base_hdr = _("Activate connection details"); gboolean was_output = FALSE; @@ -1175,6 +1182,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) /* Add field names */ tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_general; + tmpl_len = sizeof (nmc_fields_con_active_details_general); out_indices = parse_output_fields (group_fld, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); @@ -1581,18 +1589,18 @@ get_invisible_active_connections (NmCli *nmc) static GArray * parse_preferred_connection_order (const char *order, GError **error) { - gs_free const char **strv = NULL; - const char *const*iter; + char **strv, **iter; const char *str; GArray *order_arr; NmcSortOrder val; gboolean inverse, unique; int i; - strv = nm_utils_strsplit_set (order, ":"); - if (!strv) { + strv = nmc_strsplit_set (order, ":", -1); + if (!strv || !*strv) { g_set_error (error, NMCLI_ERROR, 0, _("incorrect string '%s' of '--order' option"), order); + g_strfreev (strv); return NULL; } @@ -1634,6 +1642,7 @@ parse_preferred_connection_order (const char *order, GError **error) g_array_append_val (order_arr, val); } + g_strfreev (strv); return order_arr; } @@ -1653,17 +1662,16 @@ get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error) if (*argc == 1 && nmc->complete) nmc_complete_strings (**argv, "id", "uuid", "path", NULL); - if (NM_IN_STRSET (**argv, "id", "uuid", "path")) { - if (*argc == 1) { - if (!nmc->complete) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("%s argument is missing"), selector); - return NULL; - } - } else { - selector = **argv; - (*argv)++; - (*argc)--; + if ( strcmp (**argv, "id") == 0 + || strcmp (**argv, "uuid") == 0 + || strcmp (**argv, "path") == 0) { + selector = **argv; + (*argc)--; + (*argv)++; + if (!*argc) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("%s argument is missing"), selector); + return NULL; } } @@ -2287,50 +2295,48 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat static GHashTable * parse_passwords (const char *passwd_file, GError **error) { - gs_unref_hashtable GHashTable *pwds_hash = NULL; - gs_free char *contents = NULL; + GHashTable *pwds_hash; + char *contents = NULL; gsize len = 0; GError *local_err = NULL; - gs_free const char **strv = NULL; - const char *const*iter; + char **lines, **iter; char *pwd_spec, *pwd, *prop; const char *setting; pwds_hash = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free); if (!passwd_file) - return g_steal_pointer (&pwds_hash); + return pwds_hash; - /* Read the passwords file */ + /* Read the passwords file */ if (!g_file_get_contents (passwd_file, &contents, &len, &local_err)) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("failed to read passwd-file '%s': %s"), passwd_file, local_err->message); g_error_free (local_err); + g_hash_table_destroy (pwds_hash); return NULL; } - strv = nm_utils_strsplit_set (contents, "\r\n"); - for (iter = strv; *iter; iter++) { - gs_free char *iter_s = g_strdup (*iter); - - pwd = strchr (iter_s, ':'); + lines = nmc_strsplit_set (contents, "\r\n", -1); + for (iter = lines; *iter; iter++) { + pwd = strchr (*iter, ':'); if (!pwd) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("missing colon in 'password' entry '%s'"), *iter); - return NULL; + goto failure; } *(pwd++) = '\0'; - prop = strchr (iter_s, '.'); + prop = strchr (*iter, '.'); if (!prop) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("missing dot in 'password' entry '%s'"), *iter); - return NULL; + goto failure; } *(prop++) = '\0'; - setting = iter_s; + setting = *iter; while (g_ascii_isspace (*setting)) setting++; /* Accept wifi-sec or wifi instead of cumbersome '802-11-wireless-security' */ @@ -2339,13 +2345,21 @@ parse_passwords (const char *passwd_file, GError **error) if (nm_setting_lookup_type (setting) == G_TYPE_INVALID) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("invalid setting name in 'password' entry '%s'"), setting); - return NULL; + goto failure; } pwd_spec = g_strdup_printf ("%s.%s", setting, prop); g_hash_table_insert (pwds_hash, pwd_spec, g_strdup (pwd)); } - return g_steal_pointer (&pwds_hash); + g_strfreev (lines); + g_free (contents); + return pwds_hash; + +failure: + g_strfreev (lines); + g_free (contents); + g_hash_table_destroy (pwds_hash); + return NULL; } @@ -3325,7 +3339,7 @@ _dynamic_options_set (const NMMetaAbstractInfo *abstract_info, PropertyInfFlags v, v2; if (G_UNLIKELY (!cache)) - cache = g_hash_table_new (nm_direct_hash, NULL); + cache = g_hash_table_new (NULL, NULL); if (g_hash_table_lookup_extended (cache, (gpointer) abstract_info, NULL, &p)) v = GPOINTER_TO_UINT (p); @@ -5875,80 +5889,50 @@ typedef enum { NMC_EDITOR_MAIN_CMD_QUIT, } NmcEditorMainCmd; -static void -_split_cmd (const char *cmd, char **out_arg0, const char **out_argr) -{ - gs_free char *arg0 = NULL; - const char *argr = NULL; - gsize l; - - NM_SET_OUT (out_arg0, NULL); - NM_SET_OUT (out_argr, NULL); - - if (!cmd) - return; - while (NM_IN_SET (cmd[0], ' ', '\t')) - cmd++; - if (!cmd[0]) - return; - - l = strcspn (cmd, " \t"); - arg0 = g_strndup (cmd, l); - cmd += l; - if (cmd[0]) { - while (NM_IN_SET (cmd[0], ' ', '\t')) - cmd++; - if (cmd[0]) - argr = cmd; - } - - NM_SET_OUT (out_arg0, g_steal_pointer (&arg0)); - NM_SET_OUT (out_argr, argr); -} - static NmcEditorMainCmd parse_editor_main_cmd (const char *cmd, char **cmd_arg) { NmcEditorMainCmd editor_cmd = NMC_EDITOR_MAIN_CMD_UNKNOWN; - gs_free char *cmd_arg0 = NULL; - const char *cmd_argr; + char **vec; - _split_cmd (cmd, &cmd_arg0, &cmd_argr); - if (!cmd_arg0) - goto fail; + vec = nmc_strsplit_set (cmd, " \t", 2); + if (g_strv_length (vec) < 1) { + if (cmd_arg) + *cmd_arg = NULL; + return NMC_EDITOR_MAIN_CMD_UNKNOWN; + } - if (matches (cmd_arg0, "goto")) + if (matches (vec[0], "goto")) editor_cmd = NMC_EDITOR_MAIN_CMD_GOTO; - else if (matches (cmd_arg0, "remove")) + else if (matches (vec[0], "remove")) editor_cmd = NMC_EDITOR_MAIN_CMD_REMOVE; - else if (matches (cmd_arg0, "set")) + else if (matches (vec[0], "set")) editor_cmd = NMC_EDITOR_MAIN_CMD_SET; - else if (matches (cmd_arg0, "describe")) + else if (matches (vec[0], "describe")) editor_cmd = NMC_EDITOR_MAIN_CMD_DESCRIBE; - else if (matches (cmd_arg0, "print")) + else if (matches (vec[0], "print")) editor_cmd = NMC_EDITOR_MAIN_CMD_PRINT; - else if (matches (cmd_arg0, "verify")) + else if (matches (vec[0], "verify")) editor_cmd = NMC_EDITOR_MAIN_CMD_VERIFY; - else if (matches (cmd_arg0, "save")) + else if (matches (vec[0], "save")) editor_cmd = NMC_EDITOR_MAIN_CMD_SAVE; - else if (matches (cmd_arg0, "activate")) + else if (matches (vec[0], "activate")) editor_cmd = NMC_EDITOR_MAIN_CMD_ACTIVATE; - else if (matches (cmd_arg0, "back")) + else if (matches (vec[0], "back")) editor_cmd = NMC_EDITOR_MAIN_CMD_BACK; - else if (matches (cmd_arg0, "help") || strcmp (cmd_arg0, "?") == 0) + else if (matches (vec[0], "help") || strcmp (vec[0], "?") == 0) editor_cmd = NMC_EDITOR_MAIN_CMD_HELP; - else if (matches (cmd_arg0, "quit")) + else if (matches (vec[0], "quit")) editor_cmd = NMC_EDITOR_MAIN_CMD_QUIT; - else if (matches (cmd_arg0, "nmcli")) + else if (matches (vec[0], "nmcli")) editor_cmd = NMC_EDITOR_MAIN_CMD_NMCLI; - else - goto fail; - NM_SET_OUT (cmd_arg, g_strdup (cmd_argr)); + /* set pointer to command argument */ + if (cmd_arg) + *cmd_arg = vec[1] ? g_strstrip (g_strdup (vec[1])) : NULL; + + g_strfreev (vec); return editor_cmd; -fail: - NM_SET_OUT (cmd_arg, NULL); - return NMC_EDITOR_MAIN_CMD_UNKNOWN; } static void @@ -6097,39 +6081,40 @@ static NmcEditorSubCmd parse_editor_sub_cmd (const char *cmd, char **cmd_arg) { NmcEditorSubCmd editor_cmd = NMC_EDITOR_SUB_CMD_UNKNOWN; - gs_free char *cmd_arg0 = NULL; - const char *cmd_argr; + char **vec; - _split_cmd (cmd, &cmd_arg0, &cmd_argr); - if (!cmd_arg0) - goto fail; + vec = nmc_strsplit_set (cmd, " \t", 2); + if (g_strv_length (vec) < 1) { + if (cmd_arg) + *cmd_arg = NULL; + return NMC_EDITOR_SUB_CMD_UNKNOWN; + } - if (matches (cmd_arg0, "set")) + if (matches (vec[0], "set")) editor_cmd = NMC_EDITOR_SUB_CMD_SET; - else if (matches (cmd_arg0, "add")) + else if (matches (vec[0], "add")) editor_cmd = NMC_EDITOR_SUB_CMD_ADD; - else if (matches (cmd_arg0, "change")) + else if (matches (vec[0], "change")) editor_cmd = NMC_EDITOR_SUB_CMD_CHANGE; - else if (matches (cmd_arg0, "remove")) + else if (matches (vec[0], "remove")) editor_cmd = NMC_EDITOR_SUB_CMD_REMOVE; - else if (matches (cmd_arg0, "describe")) + else if (matches (vec[0], "describe")) editor_cmd = NMC_EDITOR_SUB_CMD_DESCRIBE; - else if (matches (cmd_arg0, "print")) + else if (matches (vec[0], "print")) editor_cmd = NMC_EDITOR_SUB_CMD_PRINT; - else if (matches (cmd_arg0, "back")) + else if (matches (vec[0], "back")) editor_cmd = NMC_EDITOR_SUB_CMD_BACK; - else if (matches (cmd_arg0, "help") || strcmp (cmd_arg0, "?") == 0) + else if (matches (vec[0], "help") || strcmp (vec[0], "?") == 0) editor_cmd = NMC_EDITOR_SUB_CMD_HELP; - else if (matches (cmd_arg0, "quit")) + else if (matches (vec[0], "quit")) editor_cmd = NMC_EDITOR_SUB_CMD_QUIT; - else - goto fail; - NM_SET_OUT (cmd_arg, g_strdup (cmd_argr)); + /* set pointer to command argument */ + if (cmd_arg) + *cmd_arg = g_strdup (vec[1]); + + g_strfreev (vec); return editor_cmd; -fail: - NM_SET_OUT (cmd_arg, NULL); - return NMC_EDITOR_SUB_CMD_UNKNOWN; } static void @@ -6665,26 +6650,29 @@ property_edit_submenu (NmCli *nmc, static void split_editor_main_cmd_args (const char *str, char **setting, char **property, char **value) { - gs_free char *cmd_arg0 = NULL; - const char *cmd_argr; - const char *s; + char **args, **items; - NM_SET_OUT (setting, NULL); - NM_SET_OUT (property, NULL); - NM_SET_OUT (value, NULL); - - _split_cmd (str, &cmd_arg0, &cmd_argr); - if (!cmd_arg0) + if (!str) return; - NM_SET_OUT (value, g_strdup (cmd_argr)); - s = strchr (cmd_arg0, '.'); - if (s && s > cmd_arg0) { - NM_SET_OUT (setting, g_strndup (cmd_arg0, s - cmd_arg0)); - NM_SET_OUT (property, g_strdup (&s[1])); - } else { - NM_SET_OUT (property, g_steal_pointer (&cmd_arg0)); + args = nmc_strsplit_set (str, " \t", 2); + if (args[0]) { + items = nmc_strsplit_set (args[0], ".", 2); + if (g_strv_length (items) == 2) { + if (setting) + *setting = g_strdup (items[0]); + if (property) + *property = g_strdup (items[1]); + } else { + if (property) + *property = g_strdup (items[0]); + } + g_strfreev (items); + + if (value && args[1]) + *value = g_strstrip (g_strdup (args[1])); } + g_strfreev (args); } static NMSetting * @@ -6805,7 +6793,7 @@ confirm_connection_saving (NMConnection *local, NMConnection *remote) return confirmed; } -typedef struct { +typedef struct { guint level; char *main_prompt; NMSetting *curr_setting; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index a43861fa..da969fbe 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -451,8 +451,11 @@ usage_device_lldp (void) static void quit (void) { - if (nm_clear_g_source (&progress_id)) + if (progress_id) { + g_source_remove (progress_id); nmc_terminal_erase_line (); + } + g_main_loop_quit (loop); } @@ -831,7 +834,7 @@ fill_output_access_point (gpointer data, gpointer user_data) strength_str = g_strdup_printf ("%u", strength); wpa_flags_str = ap_wpa_rsn_flags_to_string (wpa_flags); rsn_flags_str = ap_wpa_rsn_flags_to_string (rsn_flags); - sig_bars = nmc_wifi_strength_bars (strength); + sig_bars = nm_utils_wifi_strength_bars (strength); security_str = g_string_new (NULL); diff --git a/clients/cli/general.c b/clients/cli/general.c index 647ee5fc..7ac6b22c 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -175,7 +175,6 @@ _metagen_general_status_get_fcn (const NMMetaEnvironment *environment, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free) { NmCli *nmc = target; @@ -283,7 +282,6 @@ _metagen_general_permissions_get_fcn (const NMMetaEnvironment *environment, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free) { NMClientPermission perm = GPOINTER_TO_UINT (target); @@ -332,7 +330,6 @@ _metagen_general_logging_get_fcn (const NMMetaEnvironment *environment, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free) { NmCli *nmc = environment_user_data; diff --git a/clients/cli/meson.build b/clients/cli/meson.build deleted file mode 100644 index 65317a0a..00000000 --- a/clients/cli/meson.build +++ /dev/null @@ -1,48 +0,0 @@ -name = 'nmcli' - -# FIXME: nmcli-completion should be renamed to nmcli -install_data( - 'nmcli-completion', - install_dir: join_paths(nm_datadir, 'bash-completion', 'completions') -) - -sources = files( - 'agent.c', - 'common.c', - 'connections.c', - 'devices.c', - 'general.c', - 'nmcli.c', - 'polkit-agent.c', - 'settings.c', - 'utils.c' -) - -deps = [ - libnm_dep, - libnmc_base_dep, - libnmc_dep, - nm_core_dep, - readline_dep -] - -cflags = clients_cflags + [ - '-DG_LOG_DOMAIN="@0@"'.format(name), - '-DNMCLI_LOCALEDIR="@0@"'.format(nm_localedir) -] - -if enable_polkit_agent - sources += nm_polkit_listener - - deps += polkit_agent_dep -endif - -executable( - name, - sources, - dependencies: deps, - c_args: cflags, - link_args: ldflags_linker_script_binary, - link_depends: linker_script_binary, - install: true -) diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index ec23ff43..f5a66cdd 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -36,6 +36,8 @@ #include "nm-client-utils.h" +#include "nm-utils/nm-hash-utils.h" + #include "polkit-agent.h" #include "utils.h" #include "common.h" @@ -184,7 +186,6 @@ usage (void) g_printerr (_("Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n" "\n" "OPTIONS\n" - " -o[verview] overview mode (hide default values)\n" " -t[erse] terse output\n" " -p[retty] pretty output\n" " -m[ode] tabular|multiline output mode\n" @@ -296,10 +297,9 @@ process_command_line (NmCli *nmc, int argc, char **argv) break; if (argc == 1 && nmc->complete) { - nmc_complete_strings (argv[0], "--terse", "--pretty", "--mode", "--overview", - "--colors", "--escape", - "--fields", "--nocheck", "--get-values", - "--wait", "--version", "--help", NULL); + nmc_complete_strings (argv[0], "--terse", "--pretty", "--mode", "--colors", "--escape", + "--fields", "--nocheck", "--get-values", + "--wait", "--version", "--help", NULL); } if (argv[0][1] == '-' && argv[0][2] == '\0') { @@ -308,9 +308,7 @@ process_command_line (NmCli *nmc, int argc, char **argv) break; } - if (matches_arg (nmc, &argc, &argv, "-overview", NULL)) { - nmc->nmc_config_mutable.overview = TRUE; - } else if (matches_arg (nmc, &argc, &argv, "-terse", NULL)) { + if (matches_arg (nmc, &argc, &argv, "-terse", NULL)) { if (nmc->nmc_config.print_output == NMC_PRINT_TERSE) { g_string_printf (nmc->return_text, _("Error: Option '--terse' is specified the second time.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -419,10 +417,6 @@ process_command_line (NmCli *nmc, int argc, char **argv) next_arg (nmc, &argc, &argv, NULL); } - /* Ignore --overview when fields are set explicitly */ - if (nmc->required_fields) - nmc->nmc_config_mutable.overview = FALSE; - /* Now run the requested command */ nmc_do_cmd (nmc, nmcli_cmds, *argv, argc, argv); @@ -635,6 +629,8 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); #endif + nm_g_type_init (); + /* Save terminal settings */ tcgetattr (STDIN_FILENO, &termios_orig); diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 0f3d29cd..874bca21 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -20,10 +20,17 @@ #ifndef NMC_NMCLI_H #define NMC_NMCLI_H +#include "NetworkManager.h" #include "nm-secret-agent-old.h" + #include "nm-meta-setting-desc.h" -struct _NMPolkitListener; +#if WITH_POLKIT_AGENT +#include "nm-polkit-listener.h" +#else +/* polkit agent is not available; define fake NMPolkitListener */ +typedef gpointer NMPolkitListener; +#endif typedef char *(*NmcCompEntryFunc) (const char *, int); @@ -110,7 +117,6 @@ typedef struct _NmcConfig { bool escape_values; /* Whether to escape ':' and '\' in terse tabular mode */ bool in_editor; /* Whether running the editor - nmcli con edit' */ bool show_secrets; /* Whether to display secrets (both input and output): option '--show-secrets' */ - bool overview; /* Overview mode (hide default values) */ } NmcConfig; typedef struct _NmcOutputData { @@ -129,7 +135,7 @@ typedef struct _NmCli { NMSecretAgentOld *secret_agent; /* Secret agent */ GHashTable *pwds_hash; /* Hash table with passwords in passwd-file */ - struct _NMPolkitListener *pk_listener; /* polkit agent listener */ + NMPolkitListener *pk_listener ; /* polkit agent listener */ int should_wait; /* Semaphore indicating whether nmcli should not end or not yet */ gboolean nowait_flag; /* '--nowait' option; used for passing to callbacks */ diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 338f0b15..ecd58ba5 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -19,6 +19,8 @@ #include "nm-default.h" +#if WITH_POLKIT_AGENT + #include "polkit-agent.h" #include @@ -27,18 +29,17 @@ #include #include "nm-polkit-listener.h" + #include "common.h" -#if WITH_POLKIT_AGENT static char * -polkit_request (NMPolkitListener *listener, - const char *request, +polkit_request (const char *request, const char *action_id, const char *message, const char *icon_name, const char *user, gboolean echo_on, - gpointer user_data) + gpointer user_data) { char *response, *tmp, *p; @@ -61,42 +62,28 @@ polkit_request (NMPolkitListener *listener, } static void -polkit_show_info (NMPolkitListener *listener, - const char *text, - gpointer user_data) +polkit_show_info (const char *text) { g_print (_("Authentication message: %s\n"), text); } static void -polkit_show_error (NMPolkitListener *listener, - const char *text, - gpointer user_data) +polkit_show_error (const char *text) { g_print (_("Authentication error: %s\n"), text); } static void -polkit_completed (NMPolkitListener *listener, - gboolean gained_authorization, - gpointer user_data) +polkit_completed (gboolean gained_authorization) { /* We don't print anything here. The outcome will be evident from * the operation result anyway. */ } -#endif gboolean nmc_polkit_agent_init (NmCli* nmc, gboolean for_session, GError **error) { -#if WITH_POLKIT_AGENT - static const NMPolkitListenVtable vtable = { - .on_request = polkit_request, - .on_show_info = polkit_show_info, - .on_show_error = polkit_show_error, - .on_completed = polkit_completed, - }; - NMPolkitListener *listener; + PolkitAgentListener *listener; g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -104,28 +91,24 @@ nmc_polkit_agent_init (NmCli* nmc, gboolean for_session, GError **error) if (!listener) return FALSE; - nm_polkit_listener_set_vtable (listener, &vtable, nmc); + nm_polkit_listener_set_request_callback (NM_POLKIT_LISTENER (listener), polkit_request, nmc); + nm_polkit_listener_set_show_info_callback (NM_POLKIT_LISTENER (listener), polkit_show_info); + nm_polkit_listener_set_show_error_callback (NM_POLKIT_LISTENER (listener), polkit_show_error); + nm_polkit_listener_set_completed_callback (NM_POLKIT_LISTENER (listener), polkit_completed); - nmc->pk_listener = listener; -#endif + nmc->pk_listener = NM_POLKIT_LISTENER (listener); return TRUE; } void nmc_polkit_agent_fini (NmCli* nmc) { -#if WITH_POLKIT_AGENT - if (nmc->pk_listener) { - nm_polkit_listener_set_vtable (nmc->pk_listener, NULL, NULL); - g_clear_object (&nmc->pk_listener); - } -#endif + g_clear_object (&nmc->pk_listener); } gboolean nmc_start_polkit_agent_start_try (NmCli *nmc) { -#if WITH_POLKIT_AGENT GError *error = NULL; /* We don't register polkit agent at all when running non-interactively */ @@ -138,6 +121,30 @@ nmc_start_polkit_agent_start_try (NmCli *nmc) g_error_free (error); return FALSE; } -#endif return TRUE; } + +#else +/* polkit agent is not avalable; implement stub functions. */ + +#include "nmcli.h" +#include "polkit-agent.h" + +gboolean +nmc_polkit_agent_init (NmCli* nmc, gboolean for_session, GError **error) +{ + return TRUE; +} + +void +nmc_polkit_agent_fini (NmCli* nmc) +{ +} + +gboolean +nmc_start_polkit_agent_start_try (NmCli *nmc) +{ + return TRUE; +} + +#endif /* #if WITH_POLKIT_AGENT */ diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 5c3deead..69275aad 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -313,18 +313,16 @@ _set_fcn_precheck_connection_secondaries (const char *value, { const GPtrArray *connections; NMConnection *con; - gs_free const char **strv0 = NULL; gs_strfreev char **strv = NULL; char **iter; - gboolean modified = FALSE; + gboolean modified; - strv0 = nm_utils_strsplit_set (value, " \t,"); - if (!strv0) + strv = nmc_strsplit_set (value, " \t,", 0); + if (!strv) return TRUE; connections = nm_client_get_connections (nm_cli.client); - strv = g_strdupv ((char **) strv0); for (iter = strv; *iter; iter++) { if (nm_utils_is_uuid (*iter)) { con = nmc_find_connection (connections, "uuid", *iter, NULL, FALSE); @@ -474,7 +472,6 @@ get_property_val (NMSetting *setting, const char *prop, NMMetaAccessorGetType ge get_type, show_secrets ? NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS : 0, &out_flags, - NULL, (gpointer *) &to_free); nm_assert (!out_flags); return to_free ?: g_strdup (value); diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 71fdcf30..f20e24ce 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -75,7 +75,6 @@ _meta_type_nmc_generic_info_get_fcn (const NMMetaAbstractInfo *abstract_info, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free) { const NmcMetaGenericInfo *info = (const NmcMetaGenericInfo *) abstract_info; @@ -98,7 +97,6 @@ _meta_type_nmc_generic_info_get_fcn (const NMMetaAbstractInfo *abstract_info, get_type, get_flags, out_flags, - out_is_default, out_to_free); } @@ -526,7 +524,7 @@ nmc_count_color_escape_chars (const char *start, const char *end) inside = TRUE; if (inside) num++; - if (*start == 'm') + if (*start == 'm') inside = FALSE; start++; } @@ -605,14 +603,9 @@ int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, char ***argv, int *argc) { - gs_free const char **arr0 = NULL; char **arr; - arr0 = nm_utils_strsplit_set (line ?: "", delim ?: " \t"); - if (!arr0) - arr = g_new0 (char *, 1); - else - arr = g_strdupv ((char **) arr0); + arr = nmc_strsplit_set (line ? line : "", delim ? delim : " \t", 0); if (unquote) { int i = 0; @@ -620,7 +613,7 @@ nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, size_t l; const char *quotes = "\"'"; - while (arr[i]) { + while (arr && arr[i]) { s = arr[i]; l = strlen (s); if (l >= 2) { @@ -635,6 +628,7 @@ nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, *argv = arr; *argc = g_strv_length (arr); + return 0; } @@ -1004,7 +998,6 @@ typedef struct { const PrintDataCol *col; const char *title; bool title_to_free:1; - bool skip:1; int width; } PrintDataHeaderCell; @@ -1103,7 +1096,6 @@ _print_fill (const NmcConfig *nmc_config, header_cell->col_idx = col_idx; header_cell->col = col; - header_cell->skip = FALSE; header_cell->title = nm_meta_abstract_info_get_name (info, TRUE); if ( nmc_config->multiline_output @@ -1138,11 +1130,10 @@ _print_fill (const NmcConfig *nmc_config, for (i_col = 0; i_col < header_row->len; i_col++) { char *to_free = NULL; PrintDataCell *cell = &cells_line[i_col]; - PrintDataHeaderCell *header_cell; + const PrintDataHeaderCell *header_cell; const NMMetaAbstractInfo *info; NMMetaAccessorGetOutFlags text_out_flags, color_out_flags; gconstpointer value; - gboolean is_default; header_cell = &g_array_index (header_row, PrintDataHeaderCell, i_col); info = header_cell->col->selection_item->info; @@ -1157,11 +1148,7 @@ _print_fill (const NmcConfig *nmc_config, text_get_type, text_get_flags, &text_out_flags, - &is_default, (gpointer *) &to_free); - - header_cell->skip = nmc_config->overview && is_default; - if (NM_FLAGS_HAS (text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_STRV)) { if (value) { if (nmc_config->multiline_output) { @@ -1187,7 +1174,6 @@ _print_fill (const NmcConfig *nmc_config, NM_META_ACCESSOR_GET_TYPE_TERMFORMAT, NM_META_ACCESSOR_GET_FLAGS_NONE, &color_out_flags, - NULL, NULL), &cell->term_color, &cell->term_format); @@ -1245,9 +1231,6 @@ _print_skip_column (const NmcConfig *nmc_config, selection_item = header_cell->col->selection_item; info = selection_item->info; - if (header_cell->skip) - return TRUE; - if (nmc_config->multiline_output) { if (info->meta_type == &nm_meta_type_setting_info_editor) { /* we skip the "name" entry for the setting in multiline output. */ diff --git a/clients/cli/utils.h b/clients/cli/utils.h index c92c4e2e..ffc5b6f3 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -53,6 +53,7 @@ int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquo char ***argv, int *argc); const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); char * nmc_util_strv_for_display (const char *const*strv, gboolean brackets); +char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens); int nmc_string_screen_width (const char *start, const char *end); void set_val_str (NmcOutputField fields_array[], guint32 index, char *value); void set_val_strc (NmcOutputField fields_array[], guint32 index, const char *value); @@ -150,7 +151,6 @@ struct _NmcMetaGenericInfo { NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free); }; diff --git a/clients/common/meson.build b/clients/common/meson.build deleted file mode 100644 index ea26bccf..00000000 --- a/clients/common/meson.build +++ /dev/null @@ -1,81 +0,0 @@ -common_inc = include_directories('.') - -nm_polkit_listener = files('nm-polkit-listener.c') - -deps = [ - libnm_dep, - nm_core_dep -] - -cflags = clients_cflags + [ - '-DG_LOG_DOMAIN="libnmc"', -] - -sources = shared_utils + files( - 'nm-client-utils.c', - 'nm-secret-agent-simple.c', - 'nm-vpn-helpers.c' -) - -libnmc_base = static_library( - 'nmc-base', - sources: sources, - dependencies: deps, - c_args: cflags -) - -libnmc_base_dep = declare_dependency( - include_directories: common_inc, - link_with: libnmc_base -) - -sources = shared_meta_setting + files( - 'nm-meta-setting-access.c', - 'nm-meta-setting-desc.c' -) - -settings_docs = 'settings-docs.h' - -if enable_introspection - settings_docs_source = custom_target( - settings_docs, - input: nm_property_docs, - output: settings_docs, - command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'] - ) - - # FIXME: if enabled the check happens even if the settings_docs_source is not set - ''' - if get_option('check_settings_docs') - res = run_command(find_program('cmp'), '-s', settings_docs + '.in', settings_docs_source.full_path()) - if res.returncode() != 0 - message('The generated file ' + settings_docs_source.full_path() + ' differs from the source file ' + settings_docs + '.in' + '. You probably should copy the generated file over to the source file. You can skip this test by setting -Dcheck_settings_docs=false') - endif - endif - ''' -else - settings_docs_source = configure_file( - input: settings_docs + '.in', - output: settings_docs, - configuration: configuration_data() - ) -endif -sources += settings_docs_source - -libnmc = static_library( - 'nmc', - sources: sources, - dependencies: deps, - c_args: cflags, - link_with: libnmc_base, - link_depends: settings_docs_source -) - -libnmc_dep = declare_dependency( - include_directories: common_inc, - link_with: libnmc -) - -if (enable_introspection or enable_nmtui) and enable_tests - subdir('tests') -endif diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index b4b4c1b9..b6ec92de 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -20,7 +20,6 @@ #include "nm-default.h" #include "nm-client-utils.h" -#include "nm-utils.h" #include "nm-device-bond.h" #include "nm-device-bridge.h" @@ -70,7 +69,7 @@ nmc_string_to_bool (const char *str, gboolean *val_bool, GError **error) if (g_strcmp0 (str, "o") == 0) { g_set_error (error, 1, 0, - /* TRANSLATORS: the first %s is the partial value entered by + /* Translators: the first %s is the partial value entered by * the user, the second %s a list of compatible values. */ _("'%s' is ambiguous (%s)"), str, "on x off"); @@ -101,7 +100,7 @@ nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError **error) if (g_strcmp0 (str, "o") == 0) { g_set_error (error, 1, 0, - /* TRANSLATORS: the first %s is the partial value entered by + /* Translators: the first %s is the partial value entered by * the user, the second %s a list of compatible values. */ _("'%s' is ambiguous (%s)"), str, "on x off"); @@ -134,7 +133,7 @@ nmc_string_is_valid (const char *input, const char **allowed, GError **error) { const char **p; size_t input_ln, p_len; - gboolean prev_match = FALSE, ambiguous = FALSE; + gboolean prev_match = FALSE; const char *ret = NULL; g_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -148,21 +147,19 @@ nmc_string_is_valid (const char *input, const char **allowed, GError **error) if (g_ascii_strncasecmp (input, *p, input_ln) == 0) { if (input_ln == p_len) { ret = *p; - ambiguous = FALSE; break; } - if (!prev_match) { + if (!prev_match) ret = *p; - prev_match = TRUE; - } else - ambiguous = TRUE; + else { + g_set_error (error, 1, 1, _("'%s' is ambiguous (%s x %s)"), + input, ret, *p); + return NULL; + } + prev_match = TRUE; } } - if (ambiguous) { - g_set_error (error, 1, 1, _("'%s' is ambiguous (%s x %s)"), - input, ret, *p); - return NULL; - } + finish: if (ret == NULL) { char *valid_vals = g_strjoinv (", ", (char **) allowed); @@ -176,6 +173,18 @@ finish: return ret; } +/* + * Wrapper function for g_strsplit_set() that removes empty strings + * from the vector as they are not useful in most cases. + */ +char ** +nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens) +{ + /* remove empty strings */ + return _nm_utils_strv_cleanup (g_strsplit_set (str, delimiter, max_tokens), + FALSE, TRUE, FALSE); +} + gboolean matches (const char *cmd, const char *pattern) { @@ -509,72 +518,3 @@ nmc_activation_get_effective_state (NMActiveConnection *active, return ac_state; } - -static gboolean -can_show_graphics (void) -{ - static gboolean can_show_graphics_set = FALSE; - gboolean can_show_graphics = TRUE; - char *locale_str; - - if (G_LIKELY (can_show_graphics_set)) - return can_show_graphics; - - if (!g_get_charset (NULL)) { - /* Non-UTF-8 locale */ - locale_str = g_locale_from_utf8 ("\342\226\202\342\226\204\342\226\206\342\226\210", -1, NULL, NULL, NULL); - if (locale_str) - g_free (locale_str); - else - can_show_graphics = FALSE; - } - - /* The linux console font typically doesn't have characters we need */ - if (g_strcmp0 (g_getenv ("TERM"), "linux") == 0) - can_show_graphics = FALSE; - - return can_show_graphics; -} - -/** - * nmc_wifi_strength_bars: - * @strength: the access point strength, from 0 to 100 - * - * Converts @strength into a 4-character-wide graphical representation of - * strength suitable for printing to stdout. If the current locale and terminal - * support it, this will use unicode graphics characters to represent - * "bars". Otherwise it will use 0 to 4 asterisks. - * - * Returns: the graphical representation of the access point strength - */ -const char * -nmc_wifi_strength_bars (guint8 strength) -{ - if (!can_show_graphics ()) - return nm_utils_wifi_strength_bars (strength); - - if (strength > 80) - return /* ▂▄▆█ */ "\342\226\202\342\226\204\342\226\206\342\226\210"; - else if (strength > 55) - return /* ▂▄▆_ */ "\342\226\202\342\226\204\342\226\206_"; - else if (strength > 30) - return /* ▂▄__ */ "\342\226\202\342\226\204__"; - else if (strength > 5) - return /* ▂___ */ "\342\226\202___"; - else - return /* ____ */ "____"; -} - -/** - * nmc_utils_password_subst_char: - * - * Returns: the string substituted when hiding actual password glyphs - */ -const char * -nmc_password_subst_char (void) -{ - if (can_show_graphics ()) - return "\u2022"; /* Bullet */ - else - return "*"; -} diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h index cd662765..ac18fe94 100644 --- a/clients/common/nm-client-utils.h +++ b/clients/common/nm-client-utils.h @@ -32,6 +32,8 @@ typedef enum { const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); +char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens); + gboolean nmc_string_to_uint (const char *str, gboolean range_check, unsigned long int min, @@ -42,7 +44,7 @@ gboolean nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError gboolean matches (const char *cmd, const char *pattern); -/* FIXME: don't expose this function on its own, at least not from this file. */ +/* FIXME: don't expose this function on it's own, at least not from this file. */ const char *nmc_bond_validate_mode (const char *mode, GError **error); const char *nm_active_connection_state_reason_to_string (NMActiveConnectionStateReason reason); @@ -54,8 +56,4 @@ NMActiveConnectionState nmc_activation_get_effective_state (NMActiveConnection * NMDevice *device, const char **reason); -const char *nmc_wifi_strength_bars (guint8 strength); - -const char *nmc_password_subst_char (void); - #endif /* __NM_CLIENT_UTILS_H__ */ diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c index a1bfed47..cd7ef783 100644 --- a/clients/common/nm-meta-setting-access.c +++ b/clients/common/nm-meta-setting-access.c @@ -232,7 +232,6 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free) { nm_assert (abstract_info); @@ -241,7 +240,6 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, nm_assert (out_flags); *out_flags = NM_META_ACCESSOR_GET_OUT_FLAGS_NONE; - NM_SET_OUT (out_is_default, FALSE); if (!abstract_info->meta_type->get_fcn) g_return_val_if_reached (NULL); @@ -253,7 +251,6 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, get_type, get_flags, out_flags, - out_is_default, out_to_free); } diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h index 577cad78..54fc6c84 100644 --- a/clients/common/nm-meta-setting-access.h +++ b/clients/common/nm-meta-setting-access.h @@ -58,7 +58,6 @@ gconstpointer nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, - gboolean *out_is_default, gpointer *out_to_free); const char *const*nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abstract_info, diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index ede95a10..94404e90 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -25,8 +25,10 @@ #include #include "nm-common-macros.h" +#include "nm-utils/nm-hash-utils.h" #include "nm-utils/nm-enum-utils.h" +#include "NetworkManager.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" #include "nm-meta-setting-access.h" @@ -116,6 +118,7 @@ _parse_ip_route (int family, GError **error) { const int MAX_PREFIX = (family == AF_INET) ? 32 : 128; + char *plen = NULL; const char *next_hop = NULL; const char *canon_dest; int prefix; @@ -123,11 +126,9 @@ _parse_ip_route (int family, GError *local = NULL; gint64 metric = -1; guint i; - gs_free const char **routev = NULL; + gs_strfreev char **routev = NULL; gs_free char *str_clean = NULL; - gs_free char *dest_clone = NULL; - const char *dest; - const char *plen; + char *dest; gs_unref_hashtable GHashTable *attrs = NULL; GHashTable *tmp_attrs; #define ROUTE_SYNTAX _("The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]'") @@ -137,8 +138,8 @@ _parse_ip_route (int family, nm_assert (!error || !*error); str_clean = g_strstrip (g_strdup (str)); - routev = nm_utils_strsplit_set (str_clean, " \t"); - if (!routev) { + routev = nmc_strsplit_set (str_clean, " \t", 0); + if (!routev || !routev[0]) { g_set_error (error, 1, 0, "'%s' is not valid. %s", str, ROUTE_SYNTAX); @@ -147,13 +148,8 @@ _parse_ip_route (int family, dest = routev[0]; plen = strchr (dest, '/'); /* prefix delimiter */ - if (plen) { - dest_clone = g_strdup (dest); - plen = &dest_clone[plen - dest]; - dest = dest_clone; - *((char *) plen) = '\0'; - plen++; - } + if (plen) + *plen++ = '\0'; prefix = MAX_PREFIX; if (plen) { if ((prefix = _nm_utils_ascii_str_to_int64 (plen, 10, 1, MAX_PREFIX, -1)) == -1) { @@ -300,7 +296,7 @@ static NMTeamLinkWatcher * _parse_team_link_watcher (const char *str, GError **error) { - gs_free const char **watcherv = NULL; + gs_strfreev char **watcherv = NULL; gs_free char *str_clean = NULL; guint i; gs_free const char *name = NULL; @@ -313,17 +309,17 @@ _parse_team_link_watcher (const char *str, nm_assert (!error || !*error); str_clean = g_strstrip (g_strdup (str)); - watcherv = nm_utils_strsplit_set (str_clean, " \t"); - if (!watcherv) { + watcherv = nmc_strsplit_set (str_clean, " \t", 0); + if (!watcherv || !watcherv[0]) { g_set_error (error, 1, 0, "'%s' is not valid", str); return NULL; } for (i = 0; watcherv[i]; i++) { - gs_free const char **pair = NULL; + gs_strfreev char **pair = NULL; - pair = nm_utils_strsplit_set (watcherv[i], "="); - if (!pair) { + pair = nmc_strsplit_set (watcherv[i], "=", 0); + if (!pair[0]) { g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i], "properties should be specified as 'key=value'"); return NULL; @@ -640,7 +636,7 @@ _env_warn_fcn (const NMMetaEnvironment *environment, const NMMetaPropertyInfo *property_info, char **out_to_free #define ARGS_GET_FCN \ - const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, gboolean *out_is_default, gpointer *out_to_free + const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, gpointer *out_to_free #define ARGS_SET_FCN \ const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, const char *value, GError **error @@ -673,33 +669,6 @@ _env_warn_fcn (const NMMetaEnvironment *environment, return ((*(out_to_free)) = _val); \ } G_STMT_END -static gboolean -property_is_default (NMSetting *setting, const char *prop_name) -{ - nm_auto_unset_gvalue GValue v = G_VALUE_INIT; - GParamSpec *pspec; - GHashTable *ht; - char **strv; - - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), - prop_name); - if (!G_IS_PARAM_SPEC (pspec)) - g_return_val_if_reached (FALSE); - - g_value_init (&v, pspec->value_type); - g_object_get_property (G_OBJECT (setting), prop_name, &v); - - if (pspec->value_type == G_TYPE_STRV) { - strv = g_value_get_boxed (&v); - return !strv || !strv[0]; - } else if (pspec->value_type == G_TYPE_HASH_TABLE) { - ht = g_value_get_boxed (&v); - return !ht || !g_hash_table_size (ht); - } - - return g_param_value_defaults (pspec, &v); -} - static gconstpointer _get_fcn_nmc_with_default (ARGS_GET_FCN) { @@ -708,7 +677,6 @@ _get_fcn_nmc_with_default (ARGS_GET_FCN) GValue val = G_VALUE_INIT; RETURN_UNSUPPORTED_GET_TYPE (); - NM_SET_OUT (out_is_default, property_is_default (setting, property_info->property_name)); if (property_info->property_typ_data->subtype.get_with_default.fcn (setting)) { if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) @@ -724,7 +692,6 @@ _get_fcn_nmc_with_default (ARGS_GET_FCN) else s_full = g_strdup (s && *s ? s : " "); g_value_unset (&val); - RETURN_STR_TO_FREE (s_full); } @@ -732,7 +699,6 @@ static gconstpointer _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, NMSetting *setting, NMMetaAccessorGetType get_type, - gboolean *out_is_default, gpointer *out_to_free) { char *s; @@ -741,7 +707,6 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, nm_auto_unset_gvalue GValue val = G_VALUE_INIT; RETURN_UNSUPPORTED_GET_TYPE (); - NM_SET_OUT (out_is_default, property_is_default (setting, property_info->property_name)); gtype_prop = _gobject_property_get_gtype (G_OBJECT (setting), property_info->property_name); @@ -767,13 +732,13 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, static gconstpointer _get_fcn_gobject (ARGS_GET_FCN) { - return _get_fcn_gobject_impl (property_info, setting, get_type, out_is_default, out_to_free); + return _get_fcn_gobject_impl (property_info, setting, get_type, out_to_free); } static gconstpointer _get_fcn_gobject_int (ARGS_GET_FCN) { - GParamSpec *pspec; + const GParamSpec *pspec; nm_auto_unset_gvalue GValue gval = G_VALUE_INIT; gint64 v; const NMMetaUtilsIntValueInfo *value_infos; @@ -786,7 +751,6 @@ _get_fcn_gobject_int (ARGS_GET_FCN) g_value_init (&gval, pspec->value_type); g_object_get_property (G_OBJECT (setting), property_info->property_name, &gval); - NM_SET_OUT (out_is_default, g_param_value_defaults (pspec, &gval)); switch (pspec->value_type) { case G_TYPE_INT: v = g_value_get_int (&gval); @@ -826,11 +790,10 @@ _get_fcn_gobject_mtu (ARGS_GET_FCN) if ( !property_info->property_typ_data || !property_info->property_typ_data->subtype.mtu.get_fcn) - return _get_fcn_gobject_impl (property_info, setting, get_type, out_is_default, out_to_free); + return _get_fcn_gobject_impl (property_info, setting, get_type, out_to_free); mtu = property_info->property_typ_data->subtype.mtu.get_fcn (setting); if (mtu == 0) { - NM_SET_OUT (out_is_default, TRUE); if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) return _("auto"); return "auto"; @@ -857,9 +820,9 @@ static gconstpointer _get_fcn_gobject_enum (ARGS_GET_FCN) { GType gtype = 0; + GType gtype_prop; nm_auto_unref_gtypeclass GTypeClass *gtype_class = NULL; nm_auto_unref_gtypeclass GTypeClass *gtype_prop_class = NULL; - const struct _NMUtilsEnumValueInfo *value_infos = NULL; gboolean has_gtype = FALSE; nm_auto_unset_gvalue GValue gval = G_VALUE_INIT; gint64 v; @@ -870,7 +833,6 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) gboolean format_text_l10n = FALSE; gs_free char *s = NULL; char s_numeric[64]; - GParamSpec *pspec; RETURN_UNSUPPORTED_GET_TYPE (); @@ -913,26 +875,25 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) nm_assert (format_text || format_numeric); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property_info->property_name); - g_return_val_if_fail (pspec, NULL); + gtype_prop = _gobject_property_get_gtype (G_OBJECT (setting), property_info->property_name); + + g_value_init (&gval, gtype_prop); - g_value_init (&gval, pspec->value_type); g_object_get_property (G_OBJECT (setting), property_info->property_name, &gval); - NM_SET_OUT (out_is_default, g_param_value_defaults (pspec, &gval)); - if ( pspec->value_type == G_TYPE_INT - || ( G_TYPE_IS_CLASSED (pspec->value_type) - && G_IS_ENUM_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (pspec->value_type)))))) { - if (pspec->value_type == G_TYPE_INT) { + if ( gtype_prop == G_TYPE_INT + || ( G_TYPE_IS_CLASSED (gtype_prop) + && G_IS_ENUM_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (gtype_prop)))))) { + if (gtype_prop == G_TYPE_INT) { if (!has_gtype) g_return_val_if_reached (NULL); v = g_value_get_int (&gval); } else v = g_value_get_enum (&gval); - } else if ( pspec->value_type == G_TYPE_UINT - || ( G_TYPE_IS_CLASSED (pspec->value_type) - && G_IS_FLAGS_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (pspec->value_type)))))) { - if (pspec->value_type == G_TYPE_UINT) { + } else if ( gtype_prop == G_TYPE_UINT + || ( G_TYPE_IS_CLASSED (gtype_prop) + && G_IS_FLAGS_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (gtype_prop)))))) { + if (gtype_prop == G_TYPE_UINT) { if (!has_gtype) g_return_val_if_reached (NULL); v = g_value_get_uint (&gval); @@ -942,7 +903,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) g_return_val_if_reached (NULL); if (!has_gtype) { - gtype = pspec->value_type; + gtype = gtype_prop; gtype_class = g_steal_pointer (>ype_prop_class); } @@ -966,9 +927,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) /* the gobject_enum.value_infos are currently ignored for the getter. They * only declare additional aliases for the setter. */ - if (property_info->property_typ_data) - value_infos = property_info->property_typ_data->subtype.gobject_enum.value_infos_get; - s = _nm_utils_enum_to_str_full (gtype, (int) v, ", ", value_infos); + s = nm_utils_enum_to_str (gtype, (int) v); if (!format_numeric) RETURN_STR_TO_FREE (g_steal_pointer (&s)); @@ -1209,6 +1168,39 @@ _set_fcn_gobject_mac (ARGS_SET_FCN) return TRUE; } +static gboolean +_set_fcn_gobject_secret_flags (ARGS_SET_FCN) +{ + char **strv = NULL, **iter; + unsigned long flags = 0, val_int; + + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + strv = nmc_strsplit_set (value, " \t,", 0); + for (iter = strv; iter && *iter; iter++) { + if (!nmc_string_to_uint (*iter, TRUE, 0, ALL_SECRET_FLAGS, &val_int)) { + g_set_error (error, 1, 0, _("'%s' is not a valid flag number; use <0-%d>"), + *iter, ALL_SECRET_FLAGS); + g_strfreev (strv); + return FALSE; + } + flags += val_int; + } + g_strfreev (strv); + + /* Validate the flags number */ + if (flags > ALL_SECRET_FLAGS) { + flags = ALL_SECRET_FLAGS; + _env_warn_fcn (environment, environment_user_data, + NM_META_ENV_WARN_LEVEL_WARN, + N_("'%s' sum is higher than all flags => all flags set"), + value); + } + + g_object_set (setting, property_info->property_name, (guint) flags, NULL); + return TRUE; +} + static gboolean _set_fcn_gobject_enum (ARGS_SET_FCN) { @@ -1328,7 +1320,7 @@ _values_fcn_gobject_enum (ARGS_VALUES_FCN) gboolean has_minmax = FALSE; int min = G_MININT; int max = G_MAXINT; - char **v; + char **v, **w; if (property_info->property_typ_data) { if ( property_info->property_typ_data->subtype.gobject_enum.min @@ -1362,7 +1354,11 @@ _values_fcn_gobject_enum (ARGS_VALUES_FCN) /* the gobject_enum.value_infos are currently ignored for the list of * values. They only declare additional (hidden) aliases for the setter. */ - v = nm_utils_strv_make_deep_copied (nm_utils_enum_get_values (gtype, min, max)); + v = (char **) nm_utils_enum_get_values (gtype, min, max); + if (v) { + for (w = v; *w; w++) + *w = g_strdup (*w); + } return (const char *const*) (*out_to_free = v); } @@ -1509,6 +1505,24 @@ vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map) return g_string_free (priorities, FALSE); } +static char * +ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy, NMMetaAccessorGetType get_type) +{ + if (get_type != NM_META_ACCESSOR_GET_TYPE_PRETTY) + return g_strdup_printf ("%d", ip6_privacy); + + switch (ip6_privacy) { + case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: + return g_strdup_printf (_("%d (disabled)"), ip6_privacy); + case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: + return g_strdup_printf (_("%d (enabled, prefer public IP)"), ip6_privacy); + case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: + return g_strdup_printf (_("%d (enabled, prefer temporary IP)"), ip6_privacy); + default: + return g_strdup_printf (_("%d (unknown)"), ip6_privacy); + } +} + static char * secret_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type) { @@ -1559,19 +1573,18 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) const char **valid_strv, \ GError **error) \ { \ - gs_free const char **strv = NULL; \ - gsize i; \ + char **strv = NULL, **iter; \ const char *item; \ - nm_assert (!error || !*error); \ - strv = nm_utils_strsplit_set (value, " \t,"); \ - if (strv) { \ - for (i = 0; strv[i]; i++) { \ - if (!(item = nmc_string_is_valid (strv[i], valid_strv, error))) { \ - return FALSE; \ - } \ - set_func (s_macro (setting), item); \ + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \ + strv = nmc_strsplit_set (value, " \t,", 0); \ + for (iter = strv; iter && *iter; iter++) { \ + if (!(item = nmc_string_is_valid (g_strstrip (*iter), valid_strv, error))) { \ + g_strfreev (strv); \ + return FALSE; \ } \ + set_func (s_macro (setting), item); \ } \ + g_strfreev (strv); \ return TRUE; \ } @@ -1579,42 +1592,43 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) static gboolean \ def_func (ARGS_SET_FCN) \ { \ - gs_free const char **strv = NULL; \ - const char **iter; \ + char **strv = NULL, **iter; \ const char **(*valid_func1_p) (s_type *) = valid_func1; \ const char * (*valid_func2_p) (const char *, const char *, GError **) = valid_func2; \ const char *opt_name, *opt_val; \ \ - nm_assert (!error || !*error); \ + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \ \ - strv = nm_utils_strsplit_set (value, ","); \ + strv = nmc_strsplit_set (value, ",", 0); \ for (iter = strv; iter && *iter; iter++) { \ - gs_free char *left_clone = g_strstrip (g_strdup (*iter)); \ - char *left = left_clone; \ + char *left = g_strstrip (*iter); \ char *right = strchr (left, '='); \ if (!right) { \ g_set_error (error, 1, 0, _("'%s' is not valid; use