diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 847 |
1 files changed, 534 insertions, 313 deletions
diff --git a/Makefile.am b/Makefile.am index 0b8becd8..1e100f60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,12 +105,44 @@ endif endif +dflt_cppflags = -std=gnu99 + ############################################################################### -nm_build_cflags = \ - -DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \ - -DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \ - $(NULL) +# with autotools, it is not easily possible to generate these defines +# from configure.ac. +# +# See https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html +# +# With meson-only, they could just be set via config.h.meson +config-extra.h: Makefile + $(AM_V_GEN) \ + echo "/* Generated by Makefile.am */" >$@ && \ + echo "#define BINDIR \"$(bindir)\"" >>$@ && \ + echo "#define DATADIR \"$(datadir)\"" >>$@ && \ + echo "#define LIBEXECDIR \"$(libexecdir)\"" >>$@ && \ + echo "#define LOCALSTATEDIR \"$(localstatedir)\"" >>$@ && \ + echo "#define NMCONFDIR \"$(nmconfdir)\"" >>$@ && \ + echo "#define NMLIBDIR \"$(nmlibdir)\"" >>$@ && \ + echo "#define NMLOCALEDIR \"$(nmlocaledir)\"" >>$@ && \ + echo "#define NMPLUGINDIR \"$(plugindir)\"" >>$@ && \ + echo "#define NMRUNDIR \"$(nmrundir)\"" >>$@ && \ + echo "#define NMSTATEDIR \"$(nmstatedir)\"" >>$@ && \ + echo "#define NMVPNDIR \"$(pkglibdir)\"" >>$@ && \ + echo "#define NM_BUILD_BUILDDIR \"$(abs_builddir)\"" >>$@ && \ + echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@ && \ + echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \ + echo "#define PREFIX \"$(prefix)\"" >>$@ && \ + echo "#define RUNDIR \"$(rundir)\"" >>$@ && \ + echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@ && \ + echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@ && \ + true + +DISTCLEANFILES += config-extra.h + +libnm-core/.dirstamp: config-extra.h + +############################################################################### set_sanitizer_env = \ [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ @@ -204,6 +236,8 @@ introspection_sources = \ introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \ + introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \ + introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \ introspection/org.freedesktop.NetworkManager.Device.Macsec.c \ introspection/org.freedesktop.NetworkManager.Device.Macsec.h \ introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \ @@ -232,10 +266,14 @@ introspection_sources = \ introspection/org.freedesktop.NetworkManager.Device.Vlan.h \ introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \ introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \ + introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \ + introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \ introspection/org.freedesktop.NetworkManager.Device.Wireless.c \ introspection/org.freedesktop.NetworkManager.Device.Wireless.h \ introspection/org.freedesktop.NetworkManager.Device.WiMax.c \ introspection/org.freedesktop.NetworkManager.Device.WiMax.h \ + introspection/org.freedesktop.NetworkManager.Device.Wpan.c \ + introspection/org.freedesktop.NetworkManager.Device.Wpan.h \ introspection/org.freedesktop.NetworkManager.Device.c \ introspection/org.freedesktop.NetworkManager.Device.h \ introspection/org.freedesktop.NetworkManager.DHCP4Config.c \ @@ -289,6 +327,7 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \ docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \ @@ -305,9 +344,11 @@ DBUS_INTERFACE_DOCS = \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \ docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \ docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \ - docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml + docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \ + docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml introspection/%.c: introspection/%.xml @$(MKDIR_P) introspection/ @@ -340,6 +381,7 @@ dbusinterfaces_DATA = \ introspection/org.freedesktop.NetworkManager.Device.Generic.xml \ introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \ introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \ + introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \ introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \ introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \ introspection/org.freedesktop.NetworkManager.Device.Modem.xml \ @@ -354,8 +396,10 @@ dbusinterfaces_DATA = \ introspection/org.freedesktop.NetworkManager.Device.Veth.xml \ introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \ introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \ + introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \ introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \ introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \ + introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \ introspection/org.freedesktop.NetworkManager.Device.xml \ introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \ introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \ @@ -395,6 +439,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-core-types.h \ libnm-core/nm-dbus-interface.h \ libnm-core/nm-errors.h \ + libnm-core/nm-setting-6lowpan.h \ libnm-core/nm-setting-8021x.h \ libnm-core/nm-setting-adsl.h \ libnm-core/nm-setting-bluetooth.h \ @@ -405,6 +450,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-connection.h \ libnm-core/nm-setting-dcb.h \ libnm-core/nm-setting-dummy.h \ + libnm-core/nm-setting-ethtool.h \ libnm-core/nm-setting-generic.h \ libnm-core/nm-setting-gsm.h \ libnm-core/nm-setting-infiniband.h \ @@ -414,6 +460,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-ip6-config.h \ libnm-core/nm-setting-macsec.h \ libnm-core/nm-setting-macvlan.h \ + libnm-core/nm-setting-match.h \ libnm-core/nm-setting-olpc-mesh.h \ libnm-core/nm-setting-ovs-bridge.h \ libnm-core/nm-setting-ovs-interface.h \ @@ -423,6 +470,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-pppoe.h \ libnm-core/nm-setting-proxy.h \ libnm-core/nm-setting-serial.h \ + libnm-core/nm-setting-sriov.h \ libnm-core/nm-setting-tc-config.h \ libnm-core/nm-setting-team-port.h \ libnm-core/nm-setting-team.h \ @@ -435,6 +483,7 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-setting-wired.h \ libnm-core/nm-setting-wireless-security.h \ libnm-core/nm-setting-wireless.h \ + libnm-core/nm-setting-wpan.h \ libnm-core/nm-setting.h \ libnm-core/nm-simple-connection.h \ libnm-core/nm-utils.h \ @@ -449,11 +498,15 @@ libnm_core_lib_h_priv = \ shared/nm-utils/nm-dedup-multi.h \ shared/nm-utils/nm-enum-utils.h \ shared/nm-utils/nm-hash-utils.h \ + shared/nm-utils/nm-io-utils.h \ + shared/nm-utils/nm-secret-utils.h \ shared/nm-utils/nm-shared-utils.h \ shared/nm-utils/nm-random-utils.h \ shared/nm-utils/nm-udev-utils.h \ + shared/nm-ethtool-utils.h \ shared/nm-meta-setting.h \ - libnm-core/crypto.h \ + libnm-core/nm-crypto.h \ + libnm-core/nm-crypto-impl.h \ libnm-core/nm-connection-private.h \ libnm-core/nm-core-internal.h \ libnm-core/nm-core-types-internal.h \ @@ -463,6 +516,7 @@ libnm_core_lib_h_priv = \ libnm-core/nm-setting-private.h \ libnm-core/nm-utils-private.h libnm_core_lib_c_settings_real = \ + libnm-core/nm-setting-6lowpan.c \ libnm-core/nm-setting-8021x.c \ libnm-core/nm-setting-adsl.c \ libnm-core/nm-setting-bluetooth.c \ @@ -473,6 +527,7 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-connection.c \ libnm-core/nm-setting-dcb.c \ libnm-core/nm-setting-dummy.c \ + libnm-core/nm-setting-ethtool.c \ libnm-core/nm-setting-generic.c \ libnm-core/nm-setting-gsm.c \ libnm-core/nm-setting-infiniband.c \ @@ -482,6 +537,7 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-ip6-config.c \ libnm-core/nm-setting-macsec.c \ libnm-core/nm-setting-macvlan.c \ + libnm-core/nm-setting-match.c \ libnm-core/nm-setting-olpc-mesh.c \ libnm-core/nm-setting-ovs-bridge.c \ libnm-core/nm-setting-ovs-interface.c \ @@ -491,6 +547,7 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-pppoe.c \ libnm-core/nm-setting-proxy.c \ libnm-core/nm-setting-serial.c \ + libnm-core/nm-setting-sriov.c \ libnm-core/nm-setting-tc-config.c \ libnm-core/nm-setting-team-port.c \ libnm-core/nm-setting-team.c \ @@ -502,18 +559,22 @@ 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/nm-setting-wireless.c \ + libnm-core/nm-setting-wpan.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-io-utils.c \ + shared/nm-utils/nm-secret-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-ethtool-utils.c \ shared/nm-meta-setting.c \ - libnm-core/crypto.c \ + libnm-core/nm-crypto.c \ libnm-core/nm-connection.c \ libnm-core/nm-dbus-utils.c \ libnm-core/nm-errors.c \ @@ -545,6 +606,7 @@ nodist_libnminclude_HEADERS += \ ############################################################################### dflt_cppflags_libnm_core = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -552,15 +614,8 @@ dflt_cppflags_libnm_core = \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) \ - $(SANITIZER_LIB_CFLAGS) - -if WITH_GNUTLS -dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS) -endif - -if WITH_NSS -dflt_cppflags_libnm_core += $(NSS_CFLAGS) -endif + $(SANITIZER_LIB_CFLAGS) \ + $(NULL) noinst_LTLIBRARIES += libnm-core/libnm-core.la @@ -585,17 +640,12 @@ $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(li $(src_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) libnm_core_libnm_core_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ - -DNMLOCALEDIR=\"$(nmlocaledir)\" \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLIBDIR=\"$(nmlibdir)\" \ - -DNMVPNDIR=\"$(pkglibdir)\" \ - -DNMPLUGINDIR=\"$(plugindir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ $(NULL) if WITH_JSON_VALIDATION @@ -612,7 +662,6 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_c_mkenums) libnm_core_libnm_core_la_LIBADD = \ - shared/libcsiphash.la \ $(GLIB_LIBS) \ $(UUID_LIBS) \ $(LIBUDEV_LIBS) \ @@ -622,19 +671,9 @@ libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) -if WITH_GNUTLS -libnm_core_lib_c_real += libnm-core/crypto_gnutls.c -libnm_core_libnm_core_la_LIBADD += $(GNUTLS_LIBS) -endif - -if WITH_NSS -libnm_core_lib_c_real += libnm-core/crypto_nss.c -libnm_core_libnm_core_la_LIBADD += $(NSS_LIBS) -endif - EXTRA_DIST += \ - libnm-core/crypto_gnutls.c \ - libnm-core/crypto_nss.c \ + libnm-core/nm-crypto-gnutls.c \ + libnm-core/nm-crypto-nss.c \ libnm-core/nm-core-enum-types.c.template \ libnm-core/nm-core-enum-types.h.template \ libnm-core/meson.build @@ -657,6 +696,46 @@ dist_dependencies += \ ############################################################################### +if HAVE_CRYPTO_GNUTLS +if WITH_GNUTLS +libnm_crypto_lib = libnm-core/libnm-crypto-gnutls.la +else +check_ltlibraries += libnm-core/libnm-crypto-gnutls.la +endif + +libnm_core_libnm_crypto_gnutls_la_SOURCES = libnm-core/nm-crypto-gnutls.c +libnm_core_libnm_crypto_gnutls_la_CPPFLAGS = \ + $(libnm_core_libnm_core_la_CPPFLAGS) \ + $(GNUTLS_CFLAGS) +libnm_core_libnm_crypto_gnutls_la_LDFLAGS = \ + $(libnm_core_libnm_core_la_LDFLAGS) +libnm_core_libnm_crypto_gnutls_la_LIBADD = \ + $(libnm_core_libnm_core_la_LIBADD) \ + $(GNUTLS_LIBS) +endif + +if HAVE_CRYPTO_NSS +if WITH_NSS +libnm_crypto_lib = libnm-core/libnm-crypto-nss.la +else +check_ltlibraries += libnm-core/libnm-crypto-nss.la +endif + +libnm_core_libnm_crypto_nss_la_SOURCES = libnm-core/nm-crypto-nss.c +libnm_core_libnm_crypto_nss_la_CPPFLAGS = \ + $(libnm_core_libnm_core_la_CPPFLAGS) \ + $(NSS_CFLAGS) +libnm_core_libnm_crypto_nss_la_LDFLAGS = \ + $(libnm_core_libnm_core_la_LDFLAGS) +libnm_core_libnm_crypto_nss_la_LIBADD = \ + $(libnm_core_libnm_core_la_LIBADD) \ + $(NSS_LIBS) +endif + +noinst_LTLIBRARIES += $(libnm_crypto_lib) + +############################################################################### + check_programs += \ libnm-core/tests/test-compare \ libnm-core/tests/test-crypto \ @@ -677,12 +756,12 @@ libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp $(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h libnm_core_tests_cppflags = \ - $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \ - $(nm_build_cflags) \ + $(dflt_cppflags_libnm_core) \ -DNETWORKMANAGER_COMPILATION_TEST \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + $(SANITIZER_EXEC_CFLAGS) \ $(NULL) libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) @@ -703,6 +782,8 @@ nodist_libnm_core_tests_test_general_SOURCES = \ libnm_core_tests_ldadd = \ libnm-core/libnm-core.la \ + shared/libcsiphash.la \ + $(libnm_crypto_lib) \ $(GLIB_LIBS) libnm_core_tests_ldflags = \ @@ -774,6 +855,7 @@ libnm_lib_h_pub_real = \ libnm/nm-autoptr.h \ libnm/nm-checkpoint.h \ libnm/nm-client.h \ + libnm/nm-device-6lowpan.h \ libnm/nm-device-adsl.h \ libnm/nm-device-bond.h \ libnm/nm-device-bridge.h \ @@ -797,6 +879,8 @@ libnm_lib_h_pub_real = \ libnm/nm-device-vxlan.h \ libnm/nm-device-wifi.h \ libnm/nm-device-wimax.h \ + libnm/nm-device-wireguard.h \ + libnm/nm-device-wpan.h \ libnm/nm-device.h \ libnm/nm-dhcp-config.h \ libnm/nm-ip-config.h \ @@ -830,6 +914,7 @@ libnm_lib_c_real = \ libnm/nm-checkpoint.c \ libnm/nm-client.c \ libnm/nm-dbus-helpers.c \ + libnm/nm-device-6lowpan.c \ libnm/nm-device-adsl.c \ libnm/nm-device-bond.c \ libnm/nm-device-bridge.c \ @@ -853,6 +938,8 @@ libnm_lib_c_real = \ libnm/nm-device-vxlan.c \ libnm/nm-device-wifi.c \ libnm/nm-device-wimax.c \ + libnm/nm-device-wireguard.c \ + libnm/nm-device-wpan.c \ libnm/nm-device.c \ libnm/nm-dhcp-config.c \ libnm/nm-dhcp4-config.c \ @@ -875,9 +962,9 @@ libnm_lib_c_mkenums = \ libnm/nm-enum-types.c libnm_lib_cppflags = \ - $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ + $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ $(NULL) @@ -901,6 +988,8 @@ libnm_libnm_utils_la_SOURCES = \ libnm_libnm_utils_la_LIBADD = \ libnm-core/libnm-core.la \ + shared/libcsiphash.la \ + $(libnm_crypto_lib) \ introspection/libnmdbus.la \ $(GLIB_LIBS) @@ -998,7 +1087,7 @@ 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 $@ + $(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 $@ @@ -1098,12 +1187,12 @@ check_programs_norun += $(libnm_tests_programs_req_introspection) endif libnm_tests_cppflags = \ - $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - $(nm_build_cflags) \ + $(dflt_cppflags_libnm_core) \ -DNETWORKMANAGER_COMPILATION_TEST \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + $(SANITIZER_EXEC_CFLAGS) \ $(NULL) libnm_tests_ldadd = \ @@ -1171,6 +1260,7 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ shared/nm-utils/nm-vpn-plugin-utils.h libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -1192,35 +1282,24 @@ EXTRA_DIST += \ # src/ ############################################################################### -src_cppflags = \ - $(dflt_cppflags_libnm_core) \ +src_cppflags_base = \ -I$(srcdir)/src \ - -I$(builddir)/src \ - \ - -DPREFIX=\"$(prefix)\" \ + $(dflt_cppflags_libnm_core) \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + $(SANITIZER_EXEC_CFLAGS) \ + $(NULL) + +src_cppflags_base_test = \ + $(src_cppflags_base) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + $(NULL) + +src_cppflags_device_plugin = \ + $(src_cppflags_base) + +src_cppflags = \ + $(src_cppflags_base) \ \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -DRUNSTATEDIR=\"$(runstatedir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DRUNDIR=\"$(rundir)\" \ - \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLOCALEDIR=\"$(nmlocaledir)\" \ - -DNMPLUGINDIR=\"$(plugindir)\" \ - -DNMRUNDIR=\"$(nmrundir)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" \ - -DNMLIBDIR=\"$(nmlibdir)\" \ - \ - -DDHCPCANON_PATH=\"$(DHCPCANON_PATH)\" \ - -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ - -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ - \ - $(LIBUDEV_CFLAGS) \ $(LIBNDP_CFLAGS) \ $(LIBPSL_CFLAGS) \ $(LIBCURL_CFLAGS) \ @@ -1228,10 +1307,18 @@ src_cppflags = \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ \ $(NULL) +src_cppflags_test = \ + $(src_cppflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + $(NULL) + +if REQUIRE_ROOT_TESTS +src_cppflags_test += -DREQUIRE_ROOT_TESTS=1 +endif + src_ldflags = $(CODE_COVERAGE_LDFLAGS) sbin_PROGRAMS += \ @@ -1280,6 +1367,7 @@ EXTRA_DIST += shared/c-list/src/c-list.h ############################################################################### src_libsystemd_nm_la_cppflags = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -1314,14 +1402,12 @@ src_libsystemd_nm_la_SOURCES = \ 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 \ @@ -1329,16 +1415,17 @@ src_libsystemd_nm_la_SOURCES = \ 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/sd-device.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/unaligned.h \ src/systemd/sd-adapt/user-util.h \ src/systemd/sd-adapt/virt.h \ src/systemd/src/basic/alloc-util.c \ src/systemd/src/basic/alloc-util.h \ src/systemd/src/basic/async.h \ + src/systemd/src/basic/env-util.c \ + src/systemd/src/basic/env-util.h \ src/systemd/src/basic/escape.c \ src/systemd/src/basic/escape.h \ src/systemd/src/basic/ether-addr-util.c \ @@ -1483,11 +1570,13 @@ src_libNetworkManagerBase_la_SOURCES = \ src/platform/nm-platform-private.h \ src/platform/nm-linux-platform.c \ src/platform/nm-linux-platform.h \ - src/platform/wifi/wifi-utils-nl80211.c \ - src/platform/wifi/wifi-utils-nl80211.h \ - src/platform/wifi/wifi-utils-private.h \ - src/platform/wifi/wifi-utils.c \ - src/platform/wifi/wifi-utils.h \ + src/platform/wifi/nm-wifi-utils-nl80211.c \ + src/platform/wifi/nm-wifi-utils-nl80211.h \ + src/platform/wifi/nm-wifi-utils-private.h \ + src/platform/wifi/nm-wifi-utils.c \ + src/platform/wifi/nm-wifi-utils.h \ + src/platform/wpan/nm-wpan-utils.c \ + src/platform/wpan/nm-wpan-utils.h \ \ src/ndisc/nm-lndp-ndisc.c \ src/ndisc/nm-lndp-ndisc.h \ @@ -1520,12 +1609,14 @@ src_libNetworkManagerBase_la_SOURCES = \ if WITH_WEXT src_libNetworkManagerBase_la_SOURCES += \ - src/platform/wifi/wifi-utils-wext.c \ - src/platform/wifi/wifi-utils-wext.h + src/platform/wifi/nm-wifi-utils-wext.c \ + src/platform/wifi/nm-wifi-utils-wext.h endif src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ + shared/libcsiphash.la \ + $(libnm_crypto_lib) \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -1533,6 +1624,9 @@ src_libNetworkManagerBase_la_LIBADD = \ $(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + src/platform/linux/nl802154.h + ############################################################################### src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) @@ -1559,6 +1653,8 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-logging.h \ src/devices/nm-device-private.h \ \ + src/devices/nm-device-6lowpan.c \ + src/devices/nm-device-6lowpan.h \ src/devices/nm-device-bond.c \ src/devices/nm-device-bond.h \ src/devices/nm-device-bridge.c \ @@ -1585,6 +1681,10 @@ src_libNetworkManager_la_SOURCES = \ src/devices/nm-device-vlan.h \ src/devices/nm-device-vxlan.c \ src/devices/nm-device-vxlan.h \ + src/devices/nm-device-wireguard.c \ + src/devices/nm-device-wireguard.h \ + src/devices/nm-device-wpan.c \ + src/devices/nm-device-wpan.h \ \ src/dhcp/nm-dhcp-dhcpcanon.c \ src/dhcp/nm-dhcp-dhclient.c \ @@ -1726,19 +1826,10 @@ $(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 - -if REQUIRE_ROOT_TESTS -src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1 -endif - -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_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup +src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup -src_libNetworkManagerTest_la_CPPFLAGS = $(src_tests_cppflags) +src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test) src_libNetworkManagerTest_la_SOURCES = \ src/ndisc/nm-fake-ndisc.c \ @@ -1759,7 +1850,7 @@ $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins) - $(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-make "$(srcdir)" + $(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)" CLEANFILES += src/NetworkManager.ver @@ -1804,6 +1895,271 @@ $(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### +noinst_LTLIBRARIES += src/initrd/libnmi-core.la + +src_initrd_libnmi_core_la_CPPFLAGS = \ + $(src_cppflags) + +src_initrd_libnmi_core_la_SOURCES = \ + src/initrd/nm-initrd-generator.h \ + src/initrd/nmi-cmdline-reader.c \ + src/initrd/nmi-ibft-reader.c \ + $(NULL) + +libexec_PROGRAMS += src/initrd/nm-initrd-generator + +src_initrd_nm_initrd_generator_CPPFLAGS = \ + $(src_cppflags) + +src_initrd_nm_initrd_generator_SOURCES = \ + src/initrd/nm-initrd-generator.c + +src_initrd_nm_initrd_generator_LDADD = \ + libnm-core/libnm-core.la \ + src/initrd/libnmi-core.la \ + src/libNetworkManagerBase.la \ + $(GLIB_LIBS) + +src_initrd_nm_initrd_generator_LDFLAGS = \ + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ + $(SANITIZER_EXEC_LDFLAGS) + +check_programs += src/initrd/tests/test-ibft-reader + +src_initrd_tests_test_ibft_reader_CPPFLAGS = \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \ + $(src_cppflags) + +src_initrd_tests_test_ibft_reader_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) + +src_initrd_tests_test_ibft_reader_LDADD = \ + libnm-core/libnm-core.la \ + src/initrd/libnmi-core.la \ + src/libNetworkManagerTest.la \ + $(GLIB_LIBS) + +EXTRA_DIST += \ + src/initrd/tests/sysfs/class/net/eth0/address \ + src/initrd/tests/sysfs/class/net/eth2/address \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \ + src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \ + src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \ + src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \ + src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \ + src/initrd/tests/sysfs/firmware/ibft/initiator/index \ + src/initrd/tests/sysfs/firmware/ibft/initiator/flags \ + src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \ + src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs/firmware/ibft/target0/chap-type \ + src/initrd/tests/sysfs/firmware/ibft/target0/index \ + src/initrd/tests/sysfs/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs/firmware/ibft/target0/flags \ + src/initrd/tests/sysfs/firmware/ibft/target0/port \ + src/initrd/tests/sysfs/firmware/ibft/target2/target-name \ + src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \ + src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \ + src/initrd/tests/sysfs/firmware/ibft/target2/chap-type \ + src/initrd/tests/sysfs/firmware/ibft/target2/index \ + src/initrd/tests/sysfs/firmware/ibft/target2/lun \ + src/initrd/tests/sysfs/firmware/ibft/target2/flags \ + src/initrd/tests/sysfs/firmware/ibft/target2/port \ + src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \ + src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \ + src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/index \ + src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \ + src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \ + src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \ + src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \ + src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \ + src/initrd/tests/sysfs-dhcp/class/net/eth0/address \ + src/initrd/tests/sysfs-dhcp/class/net/eth1/address \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \ + src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \ + src/initrd/tests/sysfs-static/class/net/eth0/address \ + src/initrd/tests/sysfs-static/class/net/eth1/address \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \ + src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs-static/firmware/ibft/target0/index \ + src/initrd/tests/sysfs-static/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs-static/firmware/ibft/target0/port \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \ + src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \ + src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \ + src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \ + src/initrd/tests/sysfs-static/firmware/ibft/target1/index \ + src/initrd/tests/sysfs-static/firmware/ibft/target1/lun \ + src/initrd/tests/sysfs-static/firmware/ibft/target1/port \ + src/initrd/tests/sysfs-vlan/class/net/eth0/address \ + src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \ + src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \ + src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \ + src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \ + src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \ + src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \ + src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \ + src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \ + src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \ + src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \ + src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \ + src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \ + src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \ + $(NULL) + +check_programs += src/initrd/tests/test-cmdline-reader + +src_initrd_tests_test_cmdline_reader_CPPFLAGS = \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \ + $(src_cppflags) + +src_initrd_tests_test_cmdline_reader_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) + +src_initrd_tests_test_cmdline_reader_LDADD = \ + libnm-core/libnm-core.la \ + src/initrd/libnmi-core.la \ + src/libNetworkManagerTest.la \ + $(GLIB_LIBS) + +$(src_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +############################################################################### + EXTRA_DIST += \ src/org.freedesktop.NetworkManager.conf \ src/nm-test-utils-core.h \ @@ -1816,12 +2172,13 @@ EXTRA_DIST += \ libexec_PROGRAMS += src/dhcp/nm-dhcp-helper src_dhcp_nm_dhcp_helper_CPPFLAGS = \ - $(GLIB_CFLAGS) \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ - -DNMRUNDIR=\"$(nmrundir)\" + $(GLIB_CFLAGS) \ + $(NULL) src_dhcp_nm_dhcp_helper_SOURCES = \ src/dhcp/nm-dhcp-helper.c \ @@ -1840,10 +2197,7 @@ EXTRA_DIST += \ # src/dhcp/tests ############################################################################### -src_dhcp_tests_cppflags = \ - $(src_tests_cppflags) \ - $(nm_build_cflags) \ - $(NULL) +src_dhcp_tests_cppflags = $(src_cppflags_test) src_dhcp_tests_ldadd = \ src/libNetworkManagerTest.la @@ -1880,6 +2234,7 @@ core_plugins += src/ppp/libnm-ppp-plugin.la pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -1911,16 +2266,7 @@ src_ppp_libnm_ppp_plugin_la_SOURCES = \ EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \ src/ppp/nm-ppp-plugin.ver -src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm-core \ - -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(GLIB_CFLAGS) +src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base) src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ -module -avoid-version \ @@ -1942,10 +2288,7 @@ EXTRA_DIST += \ check_programs += src/settings/plugins/keyfile/tests/test-keyfile -src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ - $(src_tests_cppflags) \ - $(nm_build_cflags) \ - $(NULL) +src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test) src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ $(GLIB_LIBS) \ @@ -2009,18 +2352,7 @@ core_plugins += src/settings/plugins/ibft/libnm-settings-plugin-ibft.la noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la -src_settings_plugins_ibft_cppflags = \ - -I$(srcdir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - $(GLIB_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DSBINDIR=\"$(sbindir)\" - -src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags) +src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_cppflags_base) src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES = \ src/settings/plugins/ibft/nms-ibft-reader.c \ @@ -2034,7 +2366,7 @@ src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES = \ src/settings/plugins/ibft/nms-ibft-connection.c \ src/settings/plugins/ibft/nms-ibft-connection.h -src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags) +src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_cppflags_base) src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \ -module -avoid-version \ @@ -2047,18 +2379,7 @@ $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core check_programs += src/settings/plugins/ibft/tests/test-ibft -src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/src \ - $(nm_build_cflags) \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(NULL) +src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = $(src_cppflags_base_test) src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ $(GLIB_LIBS) \ @@ -2105,27 +2426,13 @@ noinst_LTLIBRARIES += \ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la -src_settings_plugins_ifcfg_rh_cppflags = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - $(GLIB_CFLAGS) \ - $(NSS_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DSBINDIR=\"$(sbindir)\" - ############################################################################### nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \ src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \ src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h -src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_settings_plugins_ifcfg_rh_cppflags)) +src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base)) CLEANFILES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) @@ -2155,9 +2462,9 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h -src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags) +src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base) -$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) ############################################################################### @@ -2167,7 +2474,7 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h -src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags) +src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base) src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ -module -avoid-version \ @@ -2194,10 +2501,7 @@ check_programs += src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c -src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \ - $(src_tests_cppflags) \ - $(nm_build_cflags) \ - $(NULL) +src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test) src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ $(GLIB_LIBS) \ @@ -2244,6 +2548,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \ @@ -2282,6 +2587,8 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \ 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 \ @@ -2384,6 +2691,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \ src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \ @@ -2457,25 +2765,13 @@ core_plugins += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la -src_settings_plugins_ifupdown_cppflags = \ - -I$(srcdir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(GLIB_CFLAGS) \ - $(LIBUDEV_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" - - src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \ src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \ src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \ src/settings/plugins/ifupdown/nms-ifupdown-parser.c \ src/settings/plugins/ifupdown/nms-ifupdown-parser.h -src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags) +src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base) src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \ $(LIBUDEV_LIBS) @@ -2486,7 +2782,7 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \ src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \ src/settings/plugins/ifupdown/nms-ifupdown-plugin.h -src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags) +src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base) src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \ -module -avoid-version \ @@ -2497,6 +2793,7 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ $(LIBUDEV_LIBS) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la $(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so) @@ -2507,17 +2804,7 @@ check_local += check-local-symbols-settings-ifupdown check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown -src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/src \ - $(GLIB_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(nm_build_cflags) \ - $(NULL) +src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test) src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ $(GLIB_LDFLAGS) \ @@ -2577,16 +2864,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \ src/devices/adsl/nm-device-adsl.c \ src/devices/adsl/nm-device-adsl.h -src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(GLIB_CFLAGS) \ - $(LIBUDEV_CFLAGS) +src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin) src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -module -avoid-version \ @@ -2611,16 +2889,9 @@ EXTRA_DIST += \ if WITH_MODEM_MANAGER_1 src_devices_wwan_cppflags = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(GLIB_CFLAGS) \ - $(LIBSYSTEMD_CFLAGS) \ - $(MM_GLIB_CFLAGS) + $(src_cppflags_device_plugin) \ + $(MM_GLIB_CFLAGS) \ + $(NULL) core_plugins += src/devices/wwan/libnm-wwan.la @@ -2710,15 +2981,7 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \ src/devices/bluetooth/nm-device-bt.c \ src/devices/bluetooth/nm-device-bt.h -src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(GLIB_CFLAGS) +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin) src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ -module -avoid-version \ @@ -2778,15 +3041,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES += \ src/devices/wifi/nm-iwd-manager.h endif -src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(GLIB_CFLAGS) +src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin) src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ -module -avoid-version \ @@ -2810,16 +3065,7 @@ src_devices_wifi_tests_test_general_SOURCES = \ src/devices/wifi/nm-wifi-utils.c \ src/devices/wifi/nm-wifi-utils.h -src_devices_wifi_tests_test_general_CPPFLAGS = \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - $(GLIB_CFLAGS) +src_devices_wifi_tests_test_general_CPPFLAGS = $(src_cppflags_base_test) src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) @@ -2846,16 +3092,10 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \ src/devices/team/nm-device-team.h src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + $(src_cppflags_device_plugin) \ $(LIBTEAMDCTL_CFLAGS) \ $(JANSSON_CFLAGS) \ - $(GLIB_CFLAGS) + $(NULL) src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ -module -avoid-version \ @@ -2905,18 +3145,9 @@ src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \ src/devices/ovs/nm-device-ovs-bridge.h src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \ - -I$(srcdir)/src \ - -I$(builddir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm-core \ - \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ - -DRUNSTATEDIR=\"$(runstatedir)\" \ - \ + $(src_cppflags_device_plugin) \ $(JANSSON_CFLAGS) \ - $(GLIB_CFLAGS) + $(NULL) src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \ -module -avoid-version \ @@ -2942,9 +3173,7 @@ EXTRA_DIST += \ check_programs += src/dnsmasq/tests/test-dnsmasq-utils -src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \ - $(src_tests_cppflags) \ - $(NULL) +src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test) src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ src/libNetworkManagerTest.la @@ -2985,7 +3214,7 @@ check_programs += \ src/platform/tests/test-cleanup-fake \ src/platform/tests/test-cleanup-linux -src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags) +src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test) src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd) @@ -3029,11 +3258,11 @@ src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd) -src_platform_tests_test_nmp_object_CPPFLAGS = $(src_tests_cppflags) +src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test) src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la -src_platform_tests_test_general_CPPFLAGS = $(src_tests_cppflags) +src_platform_tests_test_general_CPPFLAGS = $(src_cppflags_test) src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la @@ -3064,12 +3293,12 @@ check_programs += \ src/devices/tests/test-lldp \ src/devices/tests/test-acd -src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags) +src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test) 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_CPPFLAGS = $(src_cppflags_test) src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_acd_LDADD = \ src/libNetworkManagerTest.la @@ -3095,11 +3324,11 @@ src_ndisc_tests_ldadd = \ 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_CPPFLAGS = $(src_cppflags_test) src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags) 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_CPPFLAGS = $(src_cppflags_test) src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags) src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) @@ -3115,10 +3344,7 @@ EXTRA_DIST += \ check_programs += src/supplicant/tests/test-supplicant-config -src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ - $(src_tests_cppflags) \ - $(nm_build_cflags) \ - $(NULL) +src_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_cppflags_test) src_supplicant_tests_test_supplicant_config_LDADD = \ src/libNetworkManagerTest.la @@ -3144,10 +3370,7 @@ src_tests_config_test_config_SOURCES = \ src/tests/config/nm-test-device.h \ src/tests/config/test-config.c -src_tests_config_test_config_CPPFLAGS = \ - $(src_tests_cppflags) \ - $(nm_build_cflags) \ - $(NULL) +src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test) src_tests_config_test_config_LDADD = \ src/libNetworkManagerTest.la @@ -3189,31 +3412,31 @@ check_programs += \ src/tests/test-wired-defname \ src/tests/test-utils -src_tests_test_ip4_config_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test) src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags) src_tests_test_ip4_config_LDADD = $(src_tests_ldadd) -src_tests_test_ip6_config_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test) src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags) src_tests_test_ip6_config_LDADD = $(src_tests_ldadd) -src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test) src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags) src_tests_test_dcb_LDADD = $(src_tests_ldadd) -src_tests_test_general_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_general_CPPFLAGS = $(src_cppflags_test) src_tests_test_general_LDFLAGS = $(src_tests_ldflags) src_tests_test_general_LDADD = $(src_tests_ldadd) -src_tests_test_general_with_expect_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_general_with_expect_CPPFLAGS = $(src_cppflags_test) src_tests_test_general_with_expect_LDFLAGS = $(src_tests_ldflags) src_tests_test_general_with_expect_LDADD = $(src_tests_ldadd) -src_tests_test_wired_defname_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test) src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags) src_tests_test_wired_defname_LDADD = $(src_tests_ldadd) -src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_utils_CPPFLAGS = $(src_cppflags_test) src_tests_test_utils_LDFLAGS = $(src_tests_ldflags) src_tests_test_utils_LDADD = $(src_tests_ldadd) @@ -3252,6 +3475,7 @@ noinst_LTLIBRARIES += \ dispatcher/libnm-dispatcher-core.la dispatcher_cppflags = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -3263,9 +3487,7 @@ dispatcher_cppflags = \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nm-dispatcher"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" + $(NULL) dispatcher_nmdbus_dispatcher_sources = \ @@ -3351,6 +3573,7 @@ EXTRA_DIST += \ check_programs += dispatcher/tests/test-dispatcher-envp dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -3358,8 +3581,6 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ - -I$(builddir)/dispatcher \ - $(nm_build_cflags) \ -DNETWORKMANAGER_COMPILATION_TEST \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(GLIB_CFLAGS) \ @@ -3393,6 +3614,7 @@ EXTRA_DIST += \ bin_PROGRAMS += clients/nm-online clients_nm_online_CPPFLAGS = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -3402,7 +3624,7 @@ clients_nm_online_CPPFLAGS = \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nm-online"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - -DNMLOCALEDIR=\"$(nmlocaledir)\" + $(NULL) clients_nm_online_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @@ -3421,6 +3643,7 @@ EXTRA_DIST += \ ############################################################################### clients_cppflags = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ @@ -3429,8 +3652,9 @@ clients_cppflags = \ -I$(builddir)/libnm \ -I$(srcdir)/clients/common \ -I$(builddir)/clients/common \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(GLIB_CFLAGS) \ - -DNMLOCALEDIR=\"$(nmlocaledir)\" \ + $(SANITIZER_EXEC_CFLAGS) \ $(NULL) check_ltlibraries += clients/common/libnmc-base.la @@ -3455,7 +3679,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 + $(NULL) clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ @@ -3503,6 +3727,9 @@ clients_common_libnmc_la_SOURCES = \ shared/nm-meta-setting.c \ shared/nm-meta-setting.h \ \ + shared/nm-ethtool-utils.c \ + shared/nm-ethtool-utils.h \ + \ clients/common/nm-meta-setting-desc.c \ clients/common/nm-meta-setting-desc.h \ clients/common/nm-meta-setting-access.c \ @@ -3512,7 +3739,7 @@ clients_common_libnmc_la_SOURCES = \ clients_common_libnmc_la_CPPFLAGS = \ $(clients_cppflags) \ -DG_LOG_DOMAIN=\""libnmc"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + $(NULL) clients_common_libnmc_la_LIBADD = \ libnm/libnm.la \ @@ -3535,8 +3762,7 @@ 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) + $(NULL) clients_common_tests_test_general_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) @@ -3581,11 +3807,8 @@ clients_cli_nmcli_SOURCES = \ clients_cli_nmcli_CPPFLAGS = \ -I$(srcdir)/clients/cli \ $(clients_cppflags) \ - $(SANITIZER_EXEC_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ -DG_LOG_DOMAIN=\""nmcli"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - -DNMLOCALEDIR=\"$(nmlocaledir)\" + $(NULL) clients_cli_nmcli_LDADD = \ libnm/libnm.la \ @@ -3683,17 +3906,9 @@ clients_tui_newt_libnmt_newt_a_SOURCES = \ $(NULL) clients_tui_newt_libnmt_newt_a_CPPFLAGS = \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/libnm \ - -I$(builddir)/libnm \ + $(clients_cppflags) \ -DG_LOG_DOMAIN=\""nmtui"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - $(GLIB_CFLAGS) \ $(NEWT_CFLAGS) \ - $(SANITIZER_EXEC_CFLAGS) \ $(NULL) $(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -3788,10 +4003,9 @@ clients_tui_nmtui_SOURCES = \ clients_tui_nmtui_CPPFLAGS = \ -I$(srcdir)/clients/tui/newt \ $(clients_cppflags) \ - $(NEWT_CFLAGS) \ -DG_LOG_DOMAIN=\""nmtui"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ - -DNMLOCALEDIR=\""$(nmlocaledir)"\" + $(NEWT_CFLAGS) \ + $(NULL) clients_tui_nmtui_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ @@ -3848,12 +4062,13 @@ check_local += check-local-clients-tests-test-client CLEANFILES += clients/tests/test-client.log -include clients/tests/test-client.check-on-disk/Makefile.am - EXTRA_DIST += \ clients/tests/test-client.py \ - clients/tests/test-client.check-on-disk/Makefile.am \ - $(clients_tests_expected_files) + clients/tests/test-client.check-on-disk/test_001.expected \ + clients/tests/test-client.check-on-disk/test_002.expected \ + clients/tests/test-client.check-on-disk/test_003.expected \ + clients/tests/test-client.check-on-disk/test_004.expected \ + $(NULL) ############################################################################### # data @@ -3946,13 +4161,13 @@ lib_LTLIBRARIES += libnm-util/libnm-util.la libnm_util_libnm_util_includedir=$(includedir)/NetworkManager libnm_util_cppflags = \ + $(dflt_cppflags) \ -I$(srcdir)/libnm-util \ -I$(builddir)/libnm-util \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -DG_LOG_DOMAIN=\""libnm-util"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ - -DNMLOCALEDIR=\"$(nmlocaledir)\" \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(UUID_CFLAGS) @@ -4158,13 +4373,13 @@ dist_dependencies += libnm-util/libnm-util.la ############################################################################### libnm_util_tests_cppflags = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-util \ -I$(builddir)/libnm-util \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - $(nm_build_cflags) \ -DNETWORKMANAGER_COMPILATION_TEST \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ $(SANITIZER_EXEC_CFLAGS) \ @@ -4238,6 +4453,7 @@ EXTRA_DIST += \ ############################################################################### libnm_glib_cppflags = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-util \ @@ -4516,12 +4732,12 @@ dist_dependencies += \ ############################################################################### libnm_glib_tests_cppflags = \ + $(dflt_cppflags) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-util \ -I$(builddir)/libnm-util \ -I$(srcdir)/libnm-glib \ - $(nm_build_cflags) \ -DNETWORKMANAGER_COMPILATION_TEST \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ $(GLIB_CFLAGS) \ @@ -4634,6 +4850,7 @@ man_pages += \ man/NetworkManager.8 \ man/NetworkManager.conf.5 \ man/nm-online.1 \ + man/nm-initrd-generator.8 \ man/nmcli-examples.7 \ man/nmcli.1 \ man/nmtui.1 @@ -4793,8 +5010,8 @@ EXTRA_DIST += \ valgrind.suppressions \ meson.build \ meson_options.txt \ - meson_post_install.py \ config.h.meson \ + config-extra.h.meson \ docs/meson.build \ \ po/meson.build \ @@ -4807,14 +5024,17 @@ EXTRA_DIST += \ shared/nm-test-utils-impl.c \ 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-io-utils.c \ + shared/nm-utils/nm-io-utils.h \ shared/nm-utils/nm-jansson.h \ shared/nm-utils/nm-obj.h \ shared/nm-utils/nm-macros-internal.h \ + shared/nm-utils/nm-secret-utils.c \ + shared/nm-utils/nm-secret-utils.h \ shared/nm-utils/nm-shared-utils.c \ shared/nm-utils/nm-shared-utils.h \ shared/nm-utils/nm-test-utils.h \ @@ -4830,6 +5050,7 @@ EXTRA_DIST += \ tools/check-exports.sh \ tools/create-exports-NetworkManager.sh \ tools/debug-helper.py \ + tools/meson-post-install.sh \ tools/run-nm-test.sh \ tools/test-networkmanager-service.py \ tools/test-sudo-wrapper.sh \ |