diff options
| author | Michael Biebl <biebl@debian.org> | 2019-07-31 10:51:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-07-31 10:51:42 +0200 |
| commit | 2e5fa45ddfbb5cffa1e78221f1cea706e2f298af (patch) | |
| tree | 86f69d36c56de3074280456eddc854a780b8e04b /Makefile.am | |
| parent | 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c (diff) | |
New upstream version 1.19.90 upstream/1.19.90
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1514 |
1 files changed, 458 insertions, 1056 deletions
diff --git a/Makefile.am b/Makefile.am index d78bfded..9a6b3104 100644 --- a/Makefile.am +++ b/Makefile.am @@ -97,50 +97,26 @@ SUBDIRS += \ docs/libnm \ docs/api -if WITH_LEGACY_LIBRARIES -SUBDIRS += \ - docs/libnm-util \ - docs/libnm-glib -endif - endif dflt_cppflags = -std=gnu11 ############################################################################### -# 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 +include config-extra.h.mk DISTCLEANFILES += config-extra.h -libnm-core/.dirstamp: config-extra.h +$(libnm_core_lib_h_pub_mkenums): config-extra.h +libnm-core/.dirstamp: config-extra.h +shared/.dirstamp: config-extra.h +shared/nm-glib-aux/.dirstamp: config-extra.h +shared/nm-std-aux/.dirstamp: config-extra.h +shared/nm-udev-aux/.dirstamp: config-extra.h +shared/systemd/.dirstamp: config-extra.h +shared/systemd/src/basic/.dirstamp: config-extra.h +shared/systemd/src/shared/.dirstamp: config-extra.h +src/dhcp/.dirstamp: config-extra.h ############################################################################### @@ -160,26 +136,21 @@ check_so_symbols = \ DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests=yes \ --with-valgrind=no \ - --with-libnm-glib=yes \ --enable-gtk-doc \ --enable-more-warnings=error \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --enable-config-plugin-ibft \ --disable-dependency-tracking \ $(NULL) dist-configure-check: - @echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***" + @echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection'. ***" @false if !BUILD_DOCS dist_configure_check += dist-configure-check endif -if !WITH_LEGACY_LIBRARIES -dist_configure_check += dist-configure-check -endif dist: $(dist_configure_check) $(dist_dependencies) @@ -187,12 +158,6 @@ DISTCLEANFILES += intltool-extract intltool-merge intltool-update ############################################################################### -if WITH_LEGACY_LIBRARIES -pkgconfig_DATA += NetworkManager.pc -endif - -############################################################################### - polkit_policydir = $(datadir)/polkit-1/actions dist_polkit_policy_in_in_files = \ @@ -206,15 +171,28 @@ DISTCLEANFILES += $(polkit_policy_DATA) ############################################################################### +EXTRA_DIST += \ + shared/c-stdaux/src/c-stdaux.h \ + $(NULL) + +############################################################################### + noinst_LTLIBRARIES += shared/libcsiphash.la +shared_libcsiphash_la_CFLAGS = \ + $(AM_CFLAGS) \ + -std=c11 \ + -I$(srcdir)/shared/c-stdaux/src \ + $(NULL) + shared_libcsiphash_la_CPPFLAGS = \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) shared_libcsiphash_la_LDFLAGS = \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) shared_libcsiphash_la_SOURCES = \ shared/c-siphash/src/c-siphash.c \ @@ -228,6 +206,7 @@ noinst_LTLIBRARIES += shared/libcrbtree.la shared_libcrbtree_la_CFLAGS = \ $(AM_CFLAGS) \ -std=c11 \ + -I$(srcdir)/shared/c-stdaux/src \ $(NULL) shared_libcrbtree_la_CPPFLAGS = \ @@ -236,7 +215,8 @@ shared_libcrbtree_la_CPPFLAGS = \ $(NULL) shared_libcrbtree_la_LDFLAGS = \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) shared_libcrbtree_la_SOURCES = \ shared/c-rbtree/src/c-rbtree.c \ @@ -260,13 +240,15 @@ shared_libnacd_la_CPPFLAGS = \ -DSO_ATTACH_BPF=50 \ $(CODE_COVERAGE_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ + -I$(srcdir)/shared/c-stdaux/src \ -I$(srcdir)/shared/c-list/src \ -I$(srcdir)/shared/c-siphash/src \ -I$(srcdir)/shared/c-rbtree/src \ $(NULL) shared_libnacd_la_LDFLAGS = \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) shared_libnacd_la_SOURCES = \ shared/n-acd/src/n-acd.c \ @@ -283,8 +265,43 @@ else shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf-fallback.c endif -shared_libnacd_la_LIBADD = \ - shared/libcrbtree.la \ +############################################################################### + +noinst_LTLIBRARIES += shared/libndhcp4.la + +shared_libndhcp4_la_CFLAGS = \ + $(AM_CFLAGS) \ + -std=c11 \ + -Wno-error=declaration-after-statement \ + -Wno-pointer-arith \ + $(NULL) + +shared_libndhcp4_la_CPPFLAGS = \ + -D_GNU_SOURCE \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -I$(srcdir)/shared/c-stdaux/src \ + -I$(srcdir)/shared/c-list/src \ + -I$(srcdir)/shared/c-siphash/src \ + $(NULL) + +shared_libndhcp4_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) + +shared_libndhcp4_la_SOURCES = \ + shared/n-dhcp4/src/n-dhcp4-c-connection.c \ + shared/n-dhcp4/src/n-dhcp4-c-lease.c \ + shared/n-dhcp4/src/n-dhcp4-c-probe.c \ + shared/n-dhcp4/src/n-dhcp4-client.c \ + shared/n-dhcp4/src/n-dhcp4-incoming.c \ + shared/n-dhcp4/src/n-dhcp4-outgoing.c \ + shared/n-dhcp4/src/n-dhcp4-private.h \ + shared/n-dhcp4/src/n-dhcp4-socket.c \ + shared/n-dhcp4/src/n-dhcp4.h \ + shared/n-dhcp4/src/util/packet.c \ + shared/n-dhcp4/src/util/packet.h \ + shared/n-dhcp4/src/util/socket.c \ + shared/n-dhcp4/src/util/socket.h \ $(NULL) ############################################################################### @@ -313,10 +330,6 @@ shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_std_aux_libnm_std_aux_la_LIBADD = \ - shared/libcsiphash.la \ - $(NULL) - ############################################################################### shared_nm_glib_aux_cppflags = \ @@ -337,6 +350,8 @@ shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \ shared/nm-glib-aux/nm-c-list.h \ + shared/nm-glib-aux/nm-dbus-aux.c \ + shared/nm-glib-aux/nm-dbus-aux.h \ shared/nm-glib-aux/nm-dedup-multi.c \ shared/nm-glib-aux/nm-dedup-multi.h \ shared/nm-glib-aux/nm-enum-utils.c \ @@ -349,6 +364,10 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \ shared/nm-glib-aux/nm-io-utils.c \ shared/nm-glib-aux/nm-io-utils.h \ shared/nm-glib-aux/nm-jansson.h \ + shared/nm-glib-aux/nm-json-aux.c \ + shared/nm-glib-aux/nm-json-aux.h \ + shared/nm-glib-aux/nm-keyfile-aux.c \ + shared/nm-glib-aux/nm-keyfile-aux.h \ shared/nm-glib-aux/nm-logging-fwd.h \ shared/nm-glib-aux/nm-macros-internal.h \ shared/nm-glib-aux/nm-obj.h \ @@ -360,6 +379,7 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \ shared/nm-glib-aux/nm-shared-utils.h \ shared/nm-glib-aux/nm-time-utils.c \ shared/nm-glib-aux/nm-time-utils.h \ + shared/nm-glib-aux/nm-value-type.h \ $(NULL) shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \ @@ -368,7 +388,6 @@ shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \ $(NULL) shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \ - shared/nm-std-aux/libnm-std-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -451,6 +470,8 @@ shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \ shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \ shared/nm-libnm-core-aux/nm-dispatcher-api.h \ + shared/nm-libnm-core-aux/nm-libnm-core-aux.c \ + shared/nm-libnm-core-aux/nm-libnm-core-aux.h \ $(NULL) shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \ @@ -485,13 +506,15 @@ shared_nm_utils_tests_test_shared_general_LDFLAGS = \ shared_nm_utils_tests_test_shared_general_LDADD = \ shared/nm-glib-aux/libnm-glib-aux.la \ + shared/systemd/libnm-systemd-logging-stub.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(NULL) ############################################################################### -noinst_LTLIBRARIES += \ - introspection/libnmdbus.la +noinst_LTLIBRARIES += introspection/libnmdbus.la introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS) @@ -760,6 +783,7 @@ libnm_core_lib_h_pub_real = \ 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-dpdk.h \ libnm-core/nm-setting-ovs-interface.h \ libnm-core/nm-setting-ovs-patch.h \ libnm-core/nm-setting-ovs-port.h \ @@ -789,21 +813,25 @@ libnm_core_lib_h_pub_real = \ libnm-core/nm-version.h \ libnm-core/nm-vpn-dbus-interface.h \ libnm-core/nm-vpn-editor-plugin.h \ - libnm-core/nm-vpn-plugin-info.h + libnm-core/nm-vpn-plugin-info.h \ + $(NULL) libnm_core_lib_h_pub_mkenums = \ - libnm-core/nm-core-enum-types.h + libnm-core/nm-core-enum-types.h \ + $(NULL) libnm_core_lib_h_priv = \ shared/nm-meta-setting.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 \ + libnm-core/nm-crypto-impl.h \ + libnm-core/nm-crypto.h \ 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-team-utils.h \ + libnm-core/nm-utils-private.h \ + $(NULL) libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-6lowpan.c \ libnm-core/nm-setting-8021x.c \ @@ -829,6 +857,7 @@ libnm_core_lib_c_settings_real = \ 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-dpdk.c \ libnm-core/nm-setting-ovs-interface.c \ libnm-core/nm-setting-ovs-patch.c \ libnm-core/nm-setting-ovs-port.c \ @@ -851,22 +880,25 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-wireguard.c \ libnm-core/nm-setting-wireless-security.c \ libnm-core/nm-setting-wireless.c \ - libnm-core/nm-setting-wpan.c + libnm-core/nm-setting-wpan.c \ + $(NULL) libnm_core_lib_c_real = \ $(libnm_core_lib_c_settings_real) \ shared/nm-meta-setting.c \ - libnm-core/nm-crypto.c \ libnm-core/nm-connection.c \ + libnm-core/nm-crypto.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-keyfile.c \ libnm-core/nm-property-compare.c \ libnm-core/nm-setting.c \ libnm-core/nm-simple-connection.c \ + libnm-core/nm-team-utils.c \ libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ - libnm-core/nm-vpn-plugin-info.c + libnm-core/nm-vpn-plugin-info.c \ + $(NULL) if WITH_JSON_VALIDATION libnm_core_lib_h_priv += \ @@ -949,14 +981,16 @@ libnm_core_libnm_core_la_LIBADD = \ libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) EXTRA_DIST += \ 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 + libnm-core/meson.build \ + $(NULL) libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl @$(MKDIR_P) libnm-core/ @@ -990,7 +1024,7 @@ libnm_core_libnm_crypto_gnutls_la_CPPFLAGS = \ 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) \ + $(GLIB_LIBS) \ $(GNUTLS_LIBS) endif @@ -1008,7 +1042,7 @@ libnm_core_libnm_crypto_nss_la_CPPFLAGS = \ 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) \ + $(GLIB_LIBS) \ $(NSS_LIBS) endif @@ -1070,6 +1104,8 @@ libnm_core_tests_ldadd = \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -1129,6 +1165,7 @@ EXTRA_DIST += \ 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/certs/test-tpm2wrapped-key.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 @@ -1239,6 +1276,7 @@ libnm_lib_c_real = \ libnm/nm-ip-config.c \ libnm/nm-ip4-config.c \ libnm/nm-ip6-config.c \ + libnm/nm-libnm-utils.c \ libnm/nm-manager.c \ libnm/nm-object.c \ libnm/nm-remote-connection.c \ @@ -1249,7 +1287,8 @@ libnm_lib_c_real = \ libnm/nm-vpn-plugin-old.c \ libnm/nm-vpn-service-plugin.c \ libnm/nm-wifi-p2p-peer.c \ - libnm/nm-wimax-nsp.c + libnm/nm-wimax-nsp.c \ + $(NULL) libnm_lib_c_mkenums = \ libnm/nm-enum-types.c @@ -1269,26 +1308,37 @@ nodist_libnminclude_HEADERS += \ ############################################################################### -noinst_LTLIBRARIES += libnm/libnm-utils.la +noinst_LTLIBRARIES += libnm/liblibnm.la -libnm_libnm_utils_la_CPPFLAGS = \ +libnm_liblibnm_la_CPPFLAGS = \ $(INTROSPECTION_CFLAGS) \ - $(libnm_lib_cppflags) + $(libnm_lib_cppflags) \ + $(NULL) -libnm_libnm_utils_la_SOURCES = \ - libnm/nm-libnm-utils.c +libnm_liblibnm_la_SOURCES = \ + $(libnm_lib_c_real) \ + $(NULL) -libnm_libnm_utils_la_LIBADD = \ +libnm_liblibnm_la_LIBADD = \ shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ introspection/libnmdbus.la \ shared/nm-glib-aux/libnm-glib-aux.la \ + shared/systemd/libnm-systemd-shared.la \ + shared/systemd/libnm-systemd-logging-stub.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ + $(DL_LIBS) \ + $(UUID_LIBS) \ + $(LIBUDEV_LIBS) \ $(NULL) -$(libnm_libnm_utils_la_OBJECTS) : $(libnm_lib_h_pub_mkenums) +$(libnm_liblibnm_la_OBJECTS) : $(libnm_lib_h_pub_mkenums) +$(libnm_liblibnm_la_OBJECTS) : $(libnm_core_lib_h_pub_mkenums) ############################################################################### @@ -1311,28 +1361,24 @@ $(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) + $(SANITIZER_LIB_CFLAGS) \ + $(NULL) libnm_libnm_la_SOURCES = \ $(libnm_lib_h_pub_real) \ $(libnm_lib_h_priv) \ - $(libnm_lib_c_real) + $(NULL) nodist_libnm_libnm_la_SOURCES = \ $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_c_mkenums) + $(libnm_lib_c_mkenums) \ + $(NULL) EXTRA_libnm_libnm_la_DEPENDENCIES = \ libnm/libnm.ver libnm_libnm_la_LIBADD = \ - libnm/libnm-utils.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-udev-aux/libnm-udev-aux.la \ - $(DL_LIBS) \ - $(GLIB_LIBS) \ - $(UUID_LIBS) \ + libnm/liblibnm.la \ $(NULL) libnm_libnm_la_LDFLAGS = \ @@ -1382,36 +1428,6 @@ libnm/libnm.typelib: libnm/libnm.gir 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 = \ libnm/nm-property-docs.xml \ libnm/nm-settings-docs-overrides.xml \ @@ -1468,10 +1484,7 @@ EXTRA_DIST += \ ############################################################################### -libnm_tests_programs = \ - libnm/tests/test-general - -check_programs += $(libnm_tests_programs) +check_programs += libnm/tests/test-libnm libnm_tests_programs_req_introspection = \ libnm/tests/test-nm-client \ @@ -1494,22 +1507,22 @@ libnm_tests_cppflags = \ $(NULL) libnm_tests_ldadd = \ - libnm/libnm.la \ - shared/systemd/libnm-systemd-shared.la \ - shared/systemd/libnm-systemd-logging-stub.la \ - $(GLIB_LIBS) + libnm/liblibnm.la \ + $(GLIB_LIBS) \ + $(NULL) libnm_tests_ldflags = \ $(SANITIZER_EXEC_LDFLAGS) -libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags) +libnm_tests_test_libnm_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 = \ +libnm_tests_test_libnm_SOURCES = \ shared/nm-utils/nm-compat.c \ - libnm/tests/test-general.c + libnm/tests/test-libnm.c \ + $(NULL) libnm_tests_test_nm_client_SOURCES = \ shared/nm-test-utils-impl.c \ @@ -1526,20 +1539,17 @@ libnm_tests_test_secret_agent_SOURCES = \ shared/nm-test-libnm-utils.h \ libnm/tests/test-secret-agent.c -libnm_tests_test_general_LDADD = \ - libnm/libnm-utils.la \ - $(libnm_tests_ldadd) - +libnm_tests_test_libnm_LDADD = $(libnm_tests_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_libnm_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_libnm_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) $(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1558,7 +1568,8 @@ check_ltlibraries += libnm/tests/libnm-vpn-plugin-utils-test.la libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ shared/nm-utils/nm-vpn-plugin-utils.c \ - shared/nm-utils/nm-vpn-plugin-utils.h + shared/nm-utils/nm-vpn-plugin-utils.h \ + $(NULL) libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ $(dflt_cppflags) \ @@ -1571,10 +1582,12 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + $(NULL) libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(NULL) EXTRA_DIST += \ libnm/tests/meson.build @@ -1648,16 +1661,12 @@ libsystemd_cppflags = \ -I$(srcdir)/shared/systemd/ \ -I$(srcdir)/shared/systemd/sd-adapt-shared \ -I$(srcdir)/shared/systemd/src/basic \ + -I$(srcdir)/shared/systemd/src/shared \ $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \ $(NULL) -libsystemd_libadd = \ - $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(NULL) - noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \ @@ -1671,7 +1680,8 @@ shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \ $(NULL) shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \ - $(libsystemd_libadd) \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) \ $(NULL) noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la @@ -1694,7 +1704,6 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/sd-adapt-shared/device-nodes.h \ shared/systemd/sd-adapt-shared/dirent-util.h \ shared/systemd/sd-adapt-shared/errno-list.h \ - shared/systemd/sd-adapt-shared/format-util.h \ shared/systemd/sd-adapt-shared/glob-util.h \ shared/systemd/sd-adapt-shared/gunicode.h \ shared/systemd/sd-adapt-shared/ioprio.h \ @@ -1711,7 +1720,6 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/sd-adapt-shared/procfs-util.h \ shared/systemd/sd-adapt-shared/raw-clone.h \ shared/systemd/sd-adapt-shared/rlimit-util.h \ - shared/systemd/sd-adapt-shared/strxcpyx.h \ shared/systemd/sd-adapt-shared/terminal-util.h \ shared/systemd/sd-adapt-shared/unaligned.h \ shared/systemd/sd-adapt-shared/user-util.h \ @@ -1734,6 +1742,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/fd-util.h \ shared/systemd/src/basic/fileio.c \ shared/systemd/src/basic/fileio.h \ + shared/systemd/src/basic/format-util.c \ + shared/systemd/src/basic/format-util.h \ shared/systemd/src/basic/fs-util.c \ shared/systemd/src/basic/fs-util.h \ shared/systemd/src/basic/hash-funcs.c \ @@ -1785,6 +1795,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/string-util.h \ shared/systemd/src/basic/strv.c \ shared/systemd/src/basic/strv.h \ + shared/systemd/src/basic/strxcpyx.c \ + shared/systemd/src/basic/strxcpyx.h \ shared/systemd/src/basic/time-util.c \ shared/systemd/src/basic/time-util.h \ shared/systemd/src/basic/tmpfile-util.c \ @@ -1794,10 +1806,13 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/utf8.h \ shared/systemd/src/basic/util.c \ shared/systemd/src/basic/util.h \ + shared/systemd/src/shared/dns-domain.c \ + shared/systemd/src/shared/dns-domain.h \ $(NULL) shared_systemd_libnm_systemd_shared_la_LIBADD = \ - $(libsystemd_libadd) \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) \ $(NULL) ############################################################################### @@ -1809,14 +1824,14 @@ src_libnm_systemd_core_la_cppflags = \ -I$(srcdir)/src \ -I$(srcdir)/src/systemd/sd-adapt-core \ -I$(srcdir)/src/systemd/src/systemd \ - -I$(srcdir)/src/systemd/src/shared \ -I$(srcdir)/src/systemd/src/libsystemd-network \ -I$(srcdir)/src/systemd/src/libsystemd/sd-event \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ $(NULL) src_libnm_systemd_core_la_libadd = \ - $(libsystemd_libadd) \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) \ $(NULL) src_libnm_systemd_core_la_SOURCES = \ @@ -1824,6 +1839,8 @@ src_libnm_systemd_core_la_SOURCES = \ src/systemd/nm-sd-utils-core.h \ src/systemd/nm-sd.c \ src/systemd/nm-sd.h \ + src/systemd/nm-sd-utils-dhcp.h \ + src/systemd/nm-sd-utils-dhcp.c \ src/systemd/sd-adapt-core/condition.h \ src/systemd/sd-adapt-core/conf-parser.h \ src/systemd/sd-adapt-core/device-util.h \ @@ -1869,8 +1886,6 @@ src_libnm_systemd_core_la_SOURCES = \ src/systemd/src/libsystemd/sd-id128/id128-util.c \ src/systemd/src/libsystemd/sd-id128/id128-util.h \ src/systemd/src/libsystemd/sd-id128/sd-id128.c \ - src/systemd/src/shared/dns-domain.c \ - src/systemd/src/shared/dns-domain.h \ src/systemd/src/systemd/_sd-common.h \ src/systemd/src/systemd/sd-dhcp-client.h \ src/systemd/src/systemd/sd-dhcp-lease.h \ @@ -1884,7 +1899,10 @@ src_libnm_systemd_core_la_SOURCES = \ src/systemd/src/systemd/sd-ndisc.h src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags) -src_libnm_systemd_core_la_LIBADD = $(src_libnm_systemd_core_la_libadd) +src_libnm_systemd_core_la_LIBADD = \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) \ + $(NULL) $(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ @@ -1892,7 +1910,9 @@ EXTRA_DIST += \ ############################################################################### -src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags) +src_libNetworkManagerBase_la_CPPFLAGS = \ + $(libsystemd_cppflags) \ + $(src_cppflags) src_libNetworkManagerBase_la_SOURCES = \ \ @@ -1946,8 +1966,11 @@ src_libNetworkManagerBase_la_SOURCES = \ src/dhcp/nm-dhcp-client.c \ src/dhcp/nm-dhcp-client.h \ src/dhcp/nm-dhcp-client-logging.h \ + src/dhcp/nm-dhcp-nettools.c \ src/dhcp/nm-dhcp-utils.c \ src/dhcp/nm-dhcp-utils.h \ + src/dhcp/nm-dhcp-options.c \ + src/dhcp/nm-dhcp-options.h \ src/dhcp/nm-dhcp-systemd.c \ src/dhcp/nm-dhcp-manager.c \ src/dhcp/nm-dhcp-manager.h \ @@ -1964,12 +1987,6 @@ src_libNetworkManagerBase_la_SOURCES += \ endif src_libNetworkManagerBase_la_LIBADD = \ - shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - libnm-core/libnm-core.la \ - $(libnm_crypto_lib) \ - shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ - shared/nm-udev-aux/libnm-udev-aux.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -2078,13 +2095,17 @@ src_libNetworkManager_la_SOURCES = \ src/settings/nm-secret-agent.h \ src/settings/nm-settings-connection.c \ src/settings/nm-settings-connection.h \ + src/settings/nm-settings-storage.c \ + src/settings/nm-settings-storage.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/nm-settings-utils.c \ + src/settings/nm-settings-utils.h \ \ - src/settings/plugins/keyfile/nms-keyfile-connection.c \ - src/settings/plugins/keyfile/nms-keyfile-connection.h \ + src/settings/plugins/keyfile/nms-keyfile-storage.c \ + src/settings/plugins/keyfile/nms-keyfile-storage.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 \ @@ -2163,9 +2184,19 @@ src_libNetworkManager_la_SOURCES = \ src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + libnm-core/libnm-core.la \ + $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ src/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ shared/libnacd.la \ + shared/libndhcp4.la \ + shared/libcrbtree.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ @@ -2174,7 +2205,8 @@ src_libNetworkManager_la_LIBADD = \ $(SELINUX_LIBS) \ $(LIBAUDIT_LIBS) \ $(LIBPSL_LIBS) \ - $(LIBCURL_LIBS) + $(LIBCURL_LIBS) \ + $(NULL) $(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -2193,13 +2225,15 @@ src_libNetworkManagerTest_la_SOURCES = \ src/platform/nm-fake-platform.c \ src/platform/nm-fake-platform.h \ src/platform/tests/test-common.c \ - src/platform/tests/test-common.h + src/platform/tests/test-common.h \ + $(NULL) src_libNetworkManagerTest_la_LIBADD = \ src/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(NULL) $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -2219,7 +2253,9 @@ src_NetworkManager_SOURCES = \ src/main.c src_NetworkManager_LDADD = \ - src/libNetworkManager.la + src/libNetworkManager.la \ + $(GLIB_LIBS) \ + $(NULL) src_NetworkManager_LDFLAGS = \ -rdynamic \ @@ -2237,12 +2273,22 @@ src_nm_iface_helper_SOURCES = \ src_nm_iface_helper_LDADD = \ src/libNetworkManagerBase.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + libnm-core/libnm-core.la \ + $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ src/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ + shared/libndhcp4.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(LIBNDP_LIBS) \ - $(DL_LIBS) + $(DL_LIBS) \ + $(NULL) src_nm_iface_helper_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ @@ -2274,8 +2320,18 @@ src_initrd_nm_initrd_generator_SOURCES = \ src_initrd_nm_initrd_generator_LDADD = \ src/initrd/libnmi-core.la \ src/libNetworkManagerBase.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + libnm-core/libnm-core.la \ + $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ shared/systemd/libnm-systemd-shared.la \ shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libndhcp4.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -2298,6 +2354,8 @@ src_initrd_tests_test_ibft_reader_LDADD = \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -2513,6 +2571,8 @@ src_initrd_tests_test_cmdline_reader_LDADD = \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(NULL) @@ -2615,7 +2675,8 @@ src_ppp_nm_pppd_plugin_la_LDFLAGS = \ src_ppp_nm_pppd_plugin_la_LIBADD = \ $(GLIB_LIBS) \ - $(DL_LIBS) + $(DL_LIBS) \ + $(NULL) $(src_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -2624,19 +2685,23 @@ src_ppp_libnm_ppp_plugin_la_SOURCES = \ src/ppp/nm-ppp-manager.c \ src/ppp/nm-ppp-manager.h \ src/ppp/nm-ppp-plugin-api.h \ - src/ppp/nm-ppp-status.h + src/ppp/nm-ppp-status.h \ + $(NULL) EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \ - src/ppp/nm-ppp-plugin.ver + src/ppp/nm-ppp-plugin.ver \ + $(NULL) src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base) src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ -module -avoid-version \ - -Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" + -Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" \ + $(NULL) src_ppp_libnm_ppp_plugin_la_LIBADD = \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(NULL) $(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -2649,19 +2714,19 @@ EXTRA_DIST += \ # src/settings/plugins/keyfile/tests ############################################################################### -check_programs += src/settings/plugins/keyfile/tests/test-keyfile +check_programs += src/settings/plugins/keyfile/tests/test-keyfile-settings -src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test) +src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test) -src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ +src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \ $(GLIB_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_EXEC_LDFLAGS) -src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ +src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \ src/libNetworkManagerTest.la -$(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ @@ -2706,76 +2771,6 @@ EXTRA_DIST += \ src/settings/plugins/keyfile/tests/meson.build ############################################################################### -# src/settings/plugins/ibft -############################################################################### - -if CONFIG_PLUGIN_IBFT - -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_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 \ - src/settings/plugins/ibft/nms-ibft-reader.h - -$(src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES = \ - src/settings/plugins/ibft/nms-ibft-plugin.c \ - src/settings/plugins/ibft/nms-ibft-plugin.h \ - 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_cppflags_base) - -src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(srcdir)/linker-script-settings.ver" - -src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LIBADD = \ - src/settings/plugins/ibft/libnms-ibft-core.la - -$(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -check_programs += src/settings/plugins/ibft/tests/test-ibft - -src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = $(src_cppflags_base_test) - -src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ - $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(SANITIZER_EXEC_LDFLAGS) - -src_settings_plugins_ibft_tests_test_ibft_LDADD = \ - src/settings/plugins/ibft/libnms-ibft-core.la \ - src/libNetworkManagerTest.la - -$(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) - -check_local += check-local-symbols-settings-ibft - -endif - -EXTRA_DIST += \ - src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ - src/settings/plugins/ibft/tests/iscsiadm-test-static \ - src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \ - src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway \ - src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1 \ - src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \ - src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \ - src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ - src/settings/plugins/ibft/tests/iscsiadm-test-vlan \ - src/settings/plugins/ibft/meson.build \ - src/settings/plugins/ibft/tests/meson.build - -############################################################################### # src/settings/plugins/ifcfg-rh ############################################################################### @@ -2814,14 +2809,13 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \ src/settings/plugins/ifcfg-rh/shvar.c \ src/settings/plugins/ifcfg-rh/shvar.h \ - src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \ - src/settings/plugins/ifcfg-rh/nm-inotify-helper.h \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \ 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/nms-ifcfg-rh-writer.h \ + $(NULL) src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base) @@ -2830,10 +2824,11 @@ $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_l ############################################################################### src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c \ - src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h \ + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \ + src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \ 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/nms-ifcfg-rh-plugin.h \ + $(NULL) src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base) @@ -2940,6 +2935,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \ @@ -3014,6 +3010,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \ @@ -3083,6 +3080,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \ src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \ src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \ $(NULL) # make target dependencies can't have colons in their names, which ends up @@ -3133,28 +3131,31 @@ 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/nms-ifupdown-parser.h \ + $(NULL) src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base) src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(NULL) src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \ - src/settings/plugins/ifupdown/nms-ifupdown-connection.c \ - src/settings/plugins/ifupdown/nms-ifupdown-connection.h \ src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \ - src/settings/plugins/ifupdown/nms-ifupdown-plugin.h + src/settings/plugins/ifupdown/nms-ifupdown-plugin.h \ + $(NULL) 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 \ - -Wl,--version-script="$(srcdir)/linker-script-settings.ver" + -Wl,--version-script="$(srcdir)/linker-script-settings.ver" \ + $(NULL) src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(NULL) $(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) @@ -3427,21 +3428,21 @@ check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la check_local += check-local-devices-wifi -check_programs += src/devices/wifi/tests/test-general +check_programs += src/devices/wifi/tests/test-devices-wifi -src_devices_wifi_tests_test_general_SOURCES = \ - src/devices/wifi/tests/test-general.c \ +src_devices_wifi_tests_test_devices_wifi_SOURCES = \ + src/devices/wifi/tests/test-devices-wifi.c \ 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_tests_test_general_CPPFLAGS = $(src_cppflags_base_test) +src_devices_wifi_tests_test_devices_wifi_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) +src_devices_wifi_tests_test_devices_wifi_LDADD = src/libNetworkManagerTest.la +src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) -$(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif @@ -3460,7 +3461,8 @@ core_plugins += src/devices/team/libnm-device-plugin-team.la src_devices_team_libnm_device_plugin_team_la_SOURCES = \ src/devices/team/nm-team-factory.c \ src/devices/team/nm-device-team.c \ - src/devices/team/nm-device-team.h + src/devices/team/nm-device-team.h \ + $(NULL) src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ $(src_cppflags_device_plugin) \ @@ -3470,12 +3472,14 @@ src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ -module -avoid-version \ - -Wl,--version-script="$(srcdir)/linker-script-devices.ver" + -Wl,--version-script="$(srcdir)/linker-script-devices.ver" \ + $(NULL) src_devices_team_libnm_device_plugin_team_la_LIBADD = \ $(LIBTEAMDCTL_LIBS) \ $(JANSSON_LIBS) \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(NULL) check-local-devices-team: src/devices/team/libnm-device-plugin-team.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver" @@ -3513,7 +3517,8 @@ src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \ src/devices/ovs/nm-device-ovs-port.c \ src/devices/ovs/nm-device-ovs-port.h \ src/devices/ovs/nm-device-ovs-bridge.c \ - src/devices/ovs/nm-device-ovs-bridge.h + src/devices/ovs/nm-device-ovs-bridge.h \ + $(NULL) src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \ $(src_cppflags_device_plugin) \ @@ -3522,11 +3527,13 @@ src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \ src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \ -module -avoid-version \ - -Wl,--version-script="$(srcdir)/linker-script-devices.ver" + -Wl,--version-script="$(srcdir)/linker-script-devices.ver" \ + $(NULL) src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \ $(JANSSON_LIBS) \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(NULL) check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver" @@ -3574,31 +3581,22 @@ check_programs_norun += \ src/platform/tests/monitor check_programs += \ - src/platform/tests/test-link-fake \ - src/platform/tests/test-link-linux \ src/platform/tests/test-address-fake \ src/platform/tests/test-address-linux \ - src/platform/tests/test-general \ + src/platform/tests/test-cleanup-fake \ + src/platform/tests/test-cleanup-linux \ + src/platform/tests/test-link-fake \ + src/platform/tests/test-link-linux \ src/platform/tests/test-nmp-object \ + src/platform/tests/test-platform-general \ src/platform/tests/test-route-fake \ src/platform/tests/test-route-linux \ - src/platform/tests/test-cleanup-fake \ - src/platform/tests/test-cleanup-linux + $(NULL) 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) -src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c -src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake) -src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd) - -src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c -src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux) -src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd) - src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake) src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags) @@ -3609,16 +3607,6 @@ src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux) src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags) src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd) -src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c -src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake) -src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd) - -src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c -src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux) -src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd) - src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake) src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags) @@ -3629,28 +3617,49 @@ 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_link_fake_SOURCES = src/platform/tests/test-link.c +src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake) +src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd) + +src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c +src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux) +src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd) + 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_cppflags_test) -src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags) -src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la - -$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(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) +src_platform_tests_test_platform_general_CPPFLAGS = $(src_cppflags_test) +src_platform_tests_test_platform_general_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_platform_general_LDADD = src/libNetworkManagerTest.la + +src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c +src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake) +src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd) + +src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c +src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux) +src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd) + +$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_link_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_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/platform/tests/meson.build + src/platform/tests/meson.build \ + $(NULL) ############################################################################### # src/devices/tests @@ -3775,8 +3784,8 @@ src_tests_ldadd = \ src/libNetworkManagerTest.la check_programs += \ - src/tests/test-general \ - src/tests/test-general-with-expect \ + src/tests/test-core \ + src/tests/test-core-with-expect \ src/tests/test-ip4-config \ src/tests/test-ip6-config \ src/tests/test-dcb \ @@ -3796,13 +3805,13 @@ 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_cppflags_test) -src_tests_test_general_LDFLAGS = $(src_tests_ldflags) -src_tests_test_general_LDADD = $(src_tests_ldadd) +src_tests_test_core_CPPFLAGS = $(src_cppflags_test) +src_tests_test_core_LDFLAGS = $(src_tests_ldflags) +src_tests_test_core_LDADD = $(src_tests_ldadd) -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_core_with_expect_CPPFLAGS = $(src_cppflags_test) +src_tests_test_core_with_expect_LDFLAGS = $(src_tests_ldflags) +src_tests_test_core_with_expect_LDADD = $(src_tests_ldadd) src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test) src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags) @@ -3815,23 +3824,26 @@ 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_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_tests_test_core_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_libnm_systemd_core_la_cppflags) \ - -DNETWORKMANAGER_COMPILATION_TEST + -DNETWORKMANAGER_COMPILATION_TEST \ + $(NULL) src_tests_test_systemd_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) src_tests_test_systemd_LDADD = \ src/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ shared/libcsiphash.la \ - $(src_libnm_systemd_core_la_libadd) \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) \ $(NULL) $(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -3844,6 +3856,25 @@ EXTRA_DIST += \ # dispatcher ############################################################################### +dispatcher_nmdbus_dispatcher_sources = \ + dispatcher/nmdbus-dispatcher.h \ + dispatcher/nmdbus-dispatcher.c \ + $(NULL) + +dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml + @$(MKDIR_P) dispatcher/ + $(AM_V_GEN) gdbus-codegen \ + --generate-c-code $(basename $@) \ + --c-namespace NMDBus \ + --interface-prefix org.freedesktop \ + $< + +dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h + +CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources) + +############################################################################### + libexec_PROGRAMS += dispatcher/nm-dispatcher noinst_LTLIBRARIES += \ @@ -3864,25 +3895,6 @@ dispatcher_cppflags = \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(NULL) - -dispatcher_nmdbus_dispatcher_sources = \ - dispatcher/nmdbus-dispatcher.h \ - dispatcher/nmdbus-dispatcher.c - -dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml - @$(MKDIR_P) dispatcher/ - $(AM_V_GEN) gdbus-codegen \ - --generate-c-code $(basename $@) \ - --c-namespace NMDBus \ - --interface-prefix org.freedesktop \ - $< - -dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h - -$(dispatcher_nm_dispatcher_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) - -CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources) - dispatcher_libnm_dispatcher_core_la_SOURCES = \ dispatcher/nm-dispatcher-utils.c \ dispatcher/nm-dispatcher-utils.h \ @@ -3898,16 +3910,14 @@ dispatcher_nm_dispatcher_SOURCES = \ dispatcher/nm-dispatcher.c \ $(NULL) -nodist_dispatcher_nm_dispatcher_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) - dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags) dispatcher_nm_dispatcher_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" dispatcher_nm_dispatcher_LDADD = \ - libnm/libnm.la \ dispatcher/libnm-dispatcher-core.la \ + libnm/libnm.la \ $(GLIB_LIBS) dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in @@ -3921,14 +3931,15 @@ dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freed dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service - -dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d - install-data-hook-dispatcher: - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir) - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-down.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-up.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/no-wait.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-down.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-up.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d install_data_hook += install-data-hook-dispatcher @@ -3956,20 +3967,33 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ + -I$(builddir)/dispatcher \ -DNETWORKMANAGER_COMPILATION_TEST \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ $(NULL) +dispatcher_tests_test_dispatcher_envp_SOURCES = \ + dispatcher/tests/test-dispatcher-envp.c \ + $(NULL) + +nodist_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) + +$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) + dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ - $(SANITIZER_EXEC_LDFLAGS) + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) dispatcher_tests_test_dispatcher_envp_LDADD = \ dispatcher/libnm-dispatcher-core.la \ - libnm/libnm.la \ shared/nm-glib-aux/libnm-glib-aux.la \ - $(GLIB_LIBS) + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ + libnm/libnm.la \ + $(GLIB_LIBS) \ + $(NULL) $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -3981,7 +4005,8 @@ EXTRA_DIST += \ dispatcher/tests/dispatcher-up \ dispatcher/tests/dispatcher-vpn-down \ dispatcher/tests/dispatcher-vpn-up \ - dispatcher/tests/meson.build + dispatcher/tests/meson.build \ + $(NULL) ############################################################################### # clients @@ -4028,7 +4053,6 @@ clients_cppflags = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -I$(srcdir)/clients/common \ - -I$(builddir)/clients/common \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(GLIB_CFLAGS) \ $(SANITIZER_EXEC_CFLAGS) \ @@ -4042,7 +4066,8 @@ clients_common_libnmc_base_la_SOURCES = \ clients/common/nm-vpn-helpers.c \ clients/common/nm-vpn-helpers.h \ clients/common/nm-client-utils.c \ - clients/common/nm-client-utils.h + clients/common/nm-client-utils.h \ + $(NULL) clients_common_libnmc_base_la_CPPFLAGS = \ $(clients_cppflags) \ @@ -4051,7 +4076,6 @@ clients_common_libnmc_base_la_CPPFLAGS = \ clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -4094,44 +4118,50 @@ clients_common_libnmc_la_SOURCES = \ clients_common_libnmc_la_CPPFLAGS = \ $(clients_cppflags) \ + -I$(builddir)/clients/common \ -DG_LOG_DOMAIN=\""libnmc"\" \ $(NULL) clients_common_libnmc_la_LIBADD = \ - clients/common/libnmc-base.la \ libnm/libnm.la \ - shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(NULL) $(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/.dirstamp if HAVE_INTROSPECTION -check_programs += clients/common/tests/test-general +check_programs += clients/common/tests/test-clients-common else if BUILD_NMCLI -check_programs += clients/common/tests/test-general +check_programs += clients/common/tests/test-clients-common endif endif -clients_common_tests_test_general_CPPFLAGS = \ +clients_common_tests_test_clients_common_CPPFLAGS = \ -I$(srcdir)/clients/common/tests \ $(clients_cppflags) \ -DNETWORKMANAGER_COMPILATION_TEST \ $(NULL) -clients_common_tests_test_general_LDFLAGS = \ +clients_common_tests_test_clients_common_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) -clients_common_tests_test_general_LDADD = \ - libnm/libnm.la \ - clients/common/libnmc-base.la \ +clients_common_tests_test_clients_common_LDADD = \ clients/common/libnmc.la \ + clients/common/libnmc-base.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ + libnm/libnm.la \ $(GLIB_LIBS) -$(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_common_tests_test_clients_common_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +############################################################################### EXTRA_DIST += \ clients/common/tests/wg-test0.conf \ @@ -4141,6 +4171,42 @@ EXTRA_DIST += \ $(NULL) ############################################################################### + +check_programs += clients/common/tests/test-libnm-core-aux + +clients_common_tests_test_libnm_core_aux_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(builddir)/shared \ + -I$(srcdir)/shared \ + -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm \ + -I$(srcdir)/libnm \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + $(NULL) + +clients_common_tests_test_libnm_core_aux_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) + +clients_common_tests_test_libnm_core_aux_LDADD = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ + libnm/libnm.la \ + $(GLIB_LIBS) \ + $(NULL) + +$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_lib_h_pub_mkenums) + +############################################################################### # clients/cli ############################################################################### @@ -4176,9 +4242,14 @@ clients_cli_nmcli_CPPFLAGS = \ $(NULL) clients_cli_nmcli_LDADD = \ - libnm/libnm.la \ - clients/common/libnmc-base.la \ clients/common/libnmc.la \ + clients/common/libnmc-base.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ + libnm/libnm.la \ $(GLIB_LIBS) \ $(READLINE_LIBS) @@ -4377,10 +4448,15 @@ clients_tui_nmtui_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) clients_tui_nmtui_LDADD = \ - libnm/libnm.la \ clients/tui/newt/libnmt-newt.a \ - clients/common/libnmc-base.la \ clients/common/libnmc.la \ + clients/common/libnmc-base.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-std-aux/libnm-std-aux.la \ + shared/libcsiphash.la \ + libnm/libnm.la \ $(GLIB_LIBS) \ $(NEWT_LIBS) \ $(NULL) @@ -4511,660 +4587,6 @@ CLEANFILES += \ data/server.conf ############################################################################### -# libnm-util -############################################################################### - -if WITH_LEGACY_LIBRARIES - -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 \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UUID_CFLAGS) - -libnm_util_lib_h_pub_real = \ - shared/nm-version-macros.h \ - libnm-util/NetworkManager.h \ - libnm-util/NetworkManagerVPN.h \ - libnm-util/nm-connection.h \ - libnm-util/nm-setting.h \ - libnm-util/nm-setting-8021x.h \ - libnm-util/nm-setting-adsl.h \ - libnm-util/nm-setting-bluetooth.h \ - libnm-util/nm-setting-bond.h \ - libnm-util/nm-setting-team.h \ - libnm-util/nm-setting-team-port.h \ - libnm-util/nm-setting-bridge.h \ - libnm-util/nm-setting-bridge-port.h \ - libnm-util/nm-setting-connection.h \ - libnm-util/nm-setting-dcb.h \ - libnm-util/nm-setting-infiniband.h \ - libnm-util/nm-setting-ip4-config.h \ - libnm-util/nm-setting-vlan.h \ - libnm-util/nm-setting-ip6-config.h \ - libnm-util/nm-setting-ppp.h \ - libnm-util/nm-setting-pppoe.h \ - libnm-util/nm-setting-serial.h \ - libnm-util/nm-setting-generic.h \ - libnm-util/nm-setting-gsm.h \ - libnm-util/nm-setting-cdma.h \ - libnm-util/nm-setting-olpc-mesh.h \ - libnm-util/nm-setting-wimax.h \ - libnm-util/nm-setting-wired.h \ - libnm-util/nm-setting-wireless.h \ - libnm-util/nm-setting-wireless-security.h \ - libnm-util/nm-setting-vpn.h \ - libnm-util/nm-utils.h \ - libnm-util/nm-version.h -libnm_util_lib_h_pub_mkenums = \ - libnm-util/nm-utils-enum-types.h -libnm_util_lib_h_priv = \ - libnm-util/crypto.h \ - libnm-util/nm-dbus-glib-types.h \ - 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 - -libnm_util_libnm_util_include_HEADERS = \ - $(libnm_util_lib_h_pub_real) - -nodist_libnm_util_libnm_util_include_HEADERS = \ - $(libnm_util_lib_h_pub_mkenums) - -libnm_util_lib_c_real = \ - libnm-util/crypto.c \ - libnm-util/nm-connection.c \ - libnm-util/nm-param-spec-specialized.c \ - libnm-util/nm-setting.c \ - libnm-util/nm-setting-8021x.c \ - libnm-util/nm-setting-adsl.c \ - libnm-util/nm-setting-bluetooth.c \ - libnm-util/nm-setting-bond.c \ - libnm-util/nm-setting-team.c \ - libnm-util/nm-setting-team-port.c \ - libnm-util/nm-setting-bridge.c \ - libnm-util/nm-setting-bridge-port.c \ - libnm-util/nm-setting-connection.c \ - libnm-util/nm-setting-dcb.c \ - libnm-util/nm-setting-infiniband.c \ - libnm-util/nm-setting-ip4-config.c \ - libnm-util/nm-setting-vlan.c \ - libnm-util/nm-setting-ip6-config.c \ - libnm-util/nm-setting-ppp.c \ - libnm-util/nm-setting-pppoe.c \ - libnm-util/nm-setting-serial.c \ - libnm-util/nm-setting-generic.c \ - libnm-util/nm-setting-gsm.c \ - libnm-util/nm-setting-cdma.c \ - libnm-util/nm-setting-olpc-mesh.c \ - libnm-util/nm-setting-wimax.c \ - libnm-util/nm-setting-wired.c \ - libnm-util/nm-setting-wireless.c \ - libnm-util/nm-setting-wireless-security.c \ - libnm-util/nm-setting-vpn.c \ - libnm-util/nm-utils.c \ - libnm-util/nm-value-transforms.c -libnm_util_lib_c_mkenums = \ - libnm-util/nm-utils-enum-types.c - -libnm_util_libnm_util_la_SOURCES = \ - $(libnm_util_lib_c_real) \ - $(libnm_util_lib_h_pub_real) \ - $(libnm_util_lib_h_priv) - -nodist_libnm_util_libnm_util_la_SOURCES = \ - $(libnm_util_lib_h_pub_mkenums) \ - $(libnm_util_lib_c_mkenums) - -$(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) - -libnm_util_libnm_util_la_CPPFLAGS = $(libnm_util_cppflags) - - -GLIB_GENERATED += \ - $(libnm_util_lib_h_pub_mkenums) \ - $(libnm_util_lib_c_mkenums) -nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real)) - -$(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) - -libnm_util_libnm_util_la_LIBADD = \ - shared/nm-glib-aux/libnm-glib-aux.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(UUID_LIBS) - -libnm_util_libnm_util_la_LDFLAGS = \ - -Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \ - -version-info "9:0:7" - -if WITH_GNUTLS -libnm_util_cppflags += $(GNUTLS_CFLAGS) -libnm_util_lib_c_real += libnm-util/crypto_gnutls.c -libnm_util_libnm_util_la_LIBADD += $(GNUTLS_LIBS) -endif - -if WITH_NSS -libnm_util_cppflags += $(NSS_CFLAGS) -libnm_util_lib_c_real += libnm-util/crypto_nss.c -libnm_util_libnm_util_la_LIBADD += $(NSS_LIBS) -endif - -EXTRA_DIST += \ - libnm-util/crypto_gnutls.c \ - libnm-util/crypto_nss.c - -check_ltlibraries += libnm-util/libtest-crypto.la - -libnm_util_libtest_crypto_la_SOURCES = \ - libnm-util/crypto.c -libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags) -libnm_util_libtest_crypto_la_LIBADD = \ - $(GLIB_LIBS) - -if WITH_GNUTLS -libnm_util_libtest_crypto_la_SOURCES += libnm-util/crypto_gnutls.c -libnm_util_libtest_crypto_la_LIBADD += $(GNUTLS_LIBS) -endif - -if WITH_NSS -libnm_util_libtest_crypto_la_SOURCES += libnm-util/crypto_nss.c -libnm_util_libtest_crypto_la_LIBADD += $(NSS_LIBS) -endif - -pkgconfig_DATA += libnm-util/libnm-util.pc - -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 - -if HAVE_INTROSPECTION -libnm-util/NetworkManager-1.0.gir: libnm-util/libnm-util.la -libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 -libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 -libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util -libnm_util_NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libnm-util -libnm_util_NetworkManager_1_0_gir_LIBS = libnm-util/libnm-util.la -libnm_util_NetworkManager_1_0_gir_FILES = \ - $(libnm_util_lib_h_pub_mkenums) \ - $(libnm_util_lib_h_pub_real) \ - $(libnm_util_lib_c_mkenums) \ - $(libnm_util_lib_c_real) -libnm_util_NetworkManager_1_0_gir_SCANNERFLAGS = \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-util \ - -I$(builddir)/libnm-util \ - --warn-all --identifier-prefix=NM --symbol-prefix=nm - -libnm-util/NetworkManager-1.0.typelib: libnm-util/NetworkManager-1.0.gir - $(INTROSPECTION_COMPILER) "--includedir=$(srcdir)/libnm-util" "--includedir=$(builddir)/libnm-util" $< -o $@ - -INTROSPECTION_GIRS += libnm-util/NetworkManager-1.0.gir -endif - -check-local-exports-libnm-util: libnm-util/libnm-util.la - $(srcdir)/tools/check-exports.sh "$(builddir)/libnm-util/.libs/libnm-util.so" "$(srcdir)/libnm-util/libnm-util.ver" - -check_local += check-local-exports-libnm-util - -dist_dependencies += libnm-util/libnm-util.la - -############################################################################### -# libnm-util/tests -############################################################################### - -libnm_util_tests_cppflags = \ - $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-util \ - -I$(builddir)/libnm-util \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ - $(SANITIZER_EXEC_CFLAGS) \ - $(NULL) - -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 \ - libnm-util/tests/test-secrets \ - libnm-util/tests/test-general \ - libnm-util/tests/test-setting-8021x \ - libnm-util/tests/test-setting-dcb - -check_programs_norun += \ - libnm-util/tests/test-libnm-linking - -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) -$(libnm_util_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(libnm_util_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(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 -############################################################################### - -libnm_glib_cppflags = \ - $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-util \ - -I$(builddir)/libnm-util \ - -I$(srcdir)/libnm-glib \ - -I$(builddir)/libnm-glib \ - -DG_LOG_DOMAIN=\""libnm-glib"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) - - -noinst_LTLIBRARIES += libnm-glib/libdeprecated-nm-glib.la - -libnm_glib_libdeprecated_nm_glib_la_SOURCES = \ - libnm-glib/libnm_glib.h \ - libnm-glib/libnm_glib.c - -libnm_glib_libdeprecated_nm_glib_la_CPPFLAGS = \ - $(libnm_glib_cppflags) \ - -Wno-deprecated-declarations \ - -Wno-deprecated - -libnm_glib_libdeprecated_nm_glib_la_LIBADD = \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -libdeprecateddir = $(includedir)/libnm-glib -libdeprecated_HEADERS = \ - libnm-glib/libnm_glib.h - - -lib_LTLIBRARIES += libnm-glib/libnm-glib.la - -libnm_glib_libnmincludedir = $(includedir)/libnm-glib -libnm_glib_libnmvpndir = $(includedir)/libnm-glib - -libnm_glib_lib_h_pub_real = \ - libnm-glib/nm-object.h \ - libnm-glib/nm-client.h \ - libnm-glib/nm-device.h \ - libnm-glib/nm-device-ethernet.h \ - libnm-glib/nm-device-infiniband.h \ - libnm-glib/nm-device-adsl.h \ - libnm-glib/nm-device-wifi.h \ - libnm-glib/nm-device-bt.h \ - libnm-glib/nm-device-olpc-mesh.h \ - libnm-glib/nm-device-bond.h \ - libnm-glib/nm-device-team.h \ - libnm-glib/nm-device-bridge.h \ - libnm-glib/nm-device-vlan.h \ - libnm-glib/nm-device-generic.h \ - libnm-glib/nm-access-point.h \ - libnm-glib/nm-ip4-config.h \ - libnm-glib/nm-device-modem.h \ - libnm-glib/nm-vpn-connection.h \ - libnm-glib/nm-types.h \ - libnm-glib/nm-active-connection.h \ - libnm-glib/nm-dhcp4-config.h \ - libnm-glib/nm-ip6-config.h \ - libnm-glib/nm-dhcp6-config.h \ - libnm-glib/nm-remote-connection.h \ - libnm-glib/nm-remote-settings.h \ - libnm-glib/nm-secret-agent.h \ - libnm-glib/nm-device-wimax.h \ - libnm-glib/nm-wimax-nsp.h -libnm_glib_lib_h_pub_mkenums = \ - libnm-glib/nm-glib-enum-types.h -libnm_glib_lib_h_priv = \ - libnm-glib/nm-object-private.h \ - libnm-glib/nm-device-private.h \ - libnm-glib/nm-types-private.h \ - libnm-glib/nm-object-cache.h \ - libnm-glib/nm-remote-connection-private.h \ - libnm-glib/nm-dbus-helpers-private.h - -libnm_glib_libnminclude_HEADERS = \ - $(libnm_glib_lib_h_pub_real) -nodist_libnm_glib_libnminclude_HEADERS = \ - $(libnm_glib_lib_h_pub_mkenums) - -libnm_glib_vpn_h_real = \ - libnm-glib/nm-vpn-plugin.h \ - libnm-glib/nm-vpn-plugin-ui-interface.h \ - libnm-glib/nm-vpn-plugin-utils.h -libnm_glib_vpn_h_mkenums = \ - libnm-glib/nm-vpn-enum-types.h - -libnm_glib_libnmvpn_HEADERS = \ - $(libnm_glib_vpn_h_real) - -nodist_libnm_glib_libnmvpn_HEADERS = \ - $(libnm_glib_vpn_h_mkenums) - -libnm_glib_lib_c_real = \ - libnm-glib/nm-object.c \ - libnm-glib/nm-dbus-helpers.c \ - libnm-glib/nm-client.c \ - libnm-glib/nm-device.c \ - libnm-glib/nm-device-ethernet.c \ - libnm-glib/nm-device-infiniband.c \ - libnm-glib/nm-device-adsl.c \ - libnm-glib/nm-device-wifi.c \ - libnm-glib/nm-device-bt.c \ - libnm-glib/nm-device-olpc-mesh.c \ - libnm-glib/nm-device-bond.c \ - libnm-glib/nm-device-team.c \ - libnm-glib/nm-device-bridge.c \ - libnm-glib/nm-device-vlan.c \ - libnm-glib/nm-device-generic.c \ - libnm-glib/nm-access-point.c \ - libnm-glib/nm-ip4-config.c \ - libnm-glib/nm-device-modem.c \ - libnm-glib/nm-vpn-connection.c \ - libnm-glib/nm-types.c \ - libnm-glib/nm-object-cache.c \ - libnm-glib/nm-active-connection.c \ - libnm-glib/nm-dhcp4-config.c \ - libnm-glib/nm-ip6-config.c \ - libnm-glib/nm-dhcp6-config.c \ - libnm-glib/nm-remote-connection.c \ - libnm-glib/nm-remote-settings.c \ - libnm-glib/nm-secret-agent.c \ - libnm-glib/nm-device-wimax.c \ - libnm-glib/nm-wimax-nsp.c -libnm_glib_lib_c_mkenums = \ - libnm-glib/nm-glib-enum-types.c - -libnm_glib_libnm_glib_la_SOURCES = \ - $(libnm_glib_lib_c_real) \ - $(libnm_glib_lib_h_pub_real) \ - $(libnm_glib_lib_h_priv) - -nodist_libnm_glib_libnm_glib_la_SOURCES = \ - $(libnm_glib_lib_c_mkenums) \ - $(libnm_glib_lib_h_pub_mkenums) - -libnm_glib_libnm_glib_la_CPPFLAGS = \ - $(libnm_glib_cppflags) \ - $(LIBUDEV_CFLAGS) \ - $(NULL) - -libnm_glib_libnm_glib_la_LDFLAGS = \ - -Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \ - -version-info "13:0:9" - -libnm_glib_libnm_glib_la_LIBADD = \ - libnm-util/libnm-util.la \ - libnm-glib/libdeprecated-nm-glib.la \ - shared/nm-udev-aux/libnm-udev-aux.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(LIBUDEV_LIBS) \ - $(NULL) - -$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -GLIB_GENERATED += \ - $(libnm_glib_lib_h_pub_mkenums) \ - $(libnm_glib_lib_c_mkenums) -nm_glib_enum_types_sources = $(libnm_glib_lib_h_pub_real) - -$(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_glib_lib_h_pub_mkenums) - -check_programs_norun += libnm-glib/libnm-glib-test - -libnm_glib_libnm_glib_test_CFLAGS = $(libnm_glib_cppflags) -libnm_glib_libnm_glib_test_LDADD = \ - libnm-glib/libnm-glib.la \ - libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) -$(libnm_glib_libnm_glib_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -lib_LTLIBRARIES += libnm-glib/libnm-glib-vpn.la - -libnm_glib_vpn_c_real = \ - libnm-glib/nm-vpn-plugin.c \ - libnm-glib/nm-vpn-plugin-ui-interface.c \ - libnm-glib/nm-vpn-plugin-utils.c -libnm_glib_vpn_c_mkenums = \ - libnm-glib/nm-vpn-enum-types.c -libnm_glib_libnm_glib_vpn_la_SOURCES = \ - $(libnm_glib_vpn_c_real) -nodist_libnm_glib_libnm_glib_vpn_la_SOURCES = \ - $(libnm_glib_vpn_c_mkenums) -libnm_glib_libnm_glib_vpn_la_CPPFLAGS = $(libnm_glib_cppflags) -libnm_glib_libnm_glib_vpn_la_LIBADD = \ - libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) -libnm_glib_libnm_glib_vpn_la_LDFLAGS = \ - -Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib-vpn.ver \ - -version-info "3:0:2" -$(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - - -GLIB_GENERATED += \ - $(libnm_glib_vpn_h_mkenums) \ - $(libnm_glib_vpn_c_mkenums) -nm_vpn_enum_types_sources = $(libnm_glib_vpn_h_real) - -$(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_glib_vpn_h_mkenums) - -libnm-glib/nm-vpn-plugin-glue.h: introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $< - -libnm-glib/nm-secret-agent-glue.h: introspection/org.freedesktop.NetworkManager.SecretAgent.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $< - -CLEANFILES += \ - libnm-glib/nm-vpn-plugin-glue.h \ - libnm-glib/nm-secret-agent-glue.h - -$(libnm_glib_libnm_glib_vpn_la_OBJECTS): libnm-glib/nm-vpn-plugin-glue.h -$(libnm_glib_libnm_glib_la_OBJECTS): libnm-glib/nm-secret-agent-glue.h - - -pkgconfig_DATA += \ - libnm-glib/libnm-glib.pc \ - libnm-glib/libnm-glib-vpn.pc - -DISTCLEANFILES += \ - libnm-glib/libnm-glib.pc \ - libnm-glib/libnm-glib.pc - -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 - -if HAVE_INTROSPECTION -libnm-glib/NMClient-1.0.gir: libnm-glib/libnm-glib.la $(builddir)/libnm-util/NetworkManager-1.0.gir -libnm_glib_NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0 -libnm_glib_NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 -libnm_glib_NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn -libnm_glib_NMClient_1_0_gir_CFLAGS = $(libnm_glib_cppflags) -libnm_glib_NMClient_1_0_gir_LIBS = \ - libnm-glib/libnm-glib.la \ - libnm-util/libnm-util.la -libnm_glib_NMClient_1_0_gir_FILES = \ - $(libnm_glib_lib_h_pub_mkenums) \ - $(libnm_glib_lib_h_pub_real) \ - $(libnm_glib_lib_c_mkenums) \ - $(libnm_glib_lib_c_real) -libnm_glib_NMClient_1_0_gir_SCANNERFLAGS = \ - -I$(srcdir)/libnm-util \ - -I$(builddir)/libnm-util \ - -I$(srcdir)/libnm-glib \ - -I$(builddir)/libnm-glib \ - --warn-all --identifier-prefix=NM --symbol-prefix=nm \ - --include-uninstalled=$(builddir)/libnm-util/NetworkManager-1.0.gir - -libnm-glib/NMClient-1.0.typelib: libnm-glib/NMClient-1.0.gir - $(INTROSPECTION_COMPILER) "--includedir=$(srcdir)/libnm-util" "--includedir=$(builddir)/libnm-util" $< -o $@ - -INTROSPECTION_GIRS += libnm-glib/NMClient-1.0.gir -endif - -check-local-exports-libnm-glib: - $(srcdir)/tools/check-exports.sh $(builddir)/libnm-glib/.libs/libnm-glib.so $(srcdir)/libnm-glib/libnm-glib.ver - -check_local += check-local-exports-libnm-glib - -dist_dependencies += \ - libnm-glib/libnm-glib.la \ - libnm-glib/libnm-glib-vpn.la - -############################################################################### -# libnm-glib/tests -############################################################################### - -libnm_glib_tests_cppflags = \ - $(dflt_cppflags) \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-util \ - -I$(builddir)/libnm-util \ - -I$(srcdir)/libnm-glib \ - -DNETWORKMANAGER_COMPILATION_TEST \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(NULL) - -if HAVE_INTROSPECTION -check-local-libnm-glib-nm-client: libnm-glib/tests/test-nm-client - ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ - ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ - ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ - ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ - ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ - false - -check_local += check-local-libnm-glib-nm-client -endif -check_programs_norun += libnm-glib/tests/test-nm-client - -if HAVE_INTROSPECTION -check_programs += libnm-glib/tests/test-remote-settings-client -else -check_programs_norun += libnm-glib/tests/test-remote-settings-client -endif - -libnm_glib_tests_test_nm_client_CPPFLAGS = $(libnm_glib_tests_cppflags) - -libnm_glib_tests_test_nm_client_SOURCES = \ - shared/nm-test-utils-impl.c \ - shared/nm-test-libnm-utils.h \ - libnm-glib/tests/test-nm-client.c - -libnm_glib_tests_test_nm_client_LDADD = \ - libnm-util/libnm-util.la \ - libnm-glib/libnm-glib.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - - -libnm_glib_tests_test_remote_settings_client_CPPFLAGS = $(libnm_glib_tests_cppflags) - -libnm_glib_tests_test_remote_settings_client_SOURCES = \ - shared/nm-test-utils-impl.c \ - shared/nm-test-libnm-utils.h \ - libnm-glib/tests/test-remote-settings-client.c - -libnm_glib_tests_test_remote_settings_client_LDADD = \ - libnm-util/libnm-util.la \ - libnm-glib/libnm-glib.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) - -# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it -# is built first. -$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib) -$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib) - -endif - -EXTRA_DIST += \ - libnm-glib/tests/meson.build - -############################################################################### # man ############################################################################### @@ -5288,29 +4710,12 @@ if ENABLE_VAPIGEN VAPIGEN_VAPIS += \ vapi/libnm.vapi -if WITH_LEGACY_LIBRARIES -VAPIGEN_VAPIS += \ - vapi/libnm-util.vapi \ - vapi/libnm-glib.vapi -endif - vapi/libnm.vapi: $(builddir)/libnm/NM-1.0.gir vapi/libnm.deps vapi/NM-1.0.metadata -vapi/libnm-util.vapi: $(builddir)/libnm-util/NetworkManager-1.0.gir vapi/libnm-util.deps vapi/NetworkManager-1.0.metadata -vapi/libnm-glib.vapi: $(builddir)/libnm-glib/NMClient-1.0.gir vapi/libnm-glib.deps vapi/NMClient-1.0.metadata vapi/libnm-util.vapi vapi_libnm_vapi_METADATADIRS = $(srcdir)/vapi vapi_libnm_vapi_FILES = $(builddir)/libnm/NM-1.0.gir vapi_libnm_vapi_DEPS = gio-2.0 -vapi_libnm_util_vapi_METADATADIRS = $(srcdir)/vapi -vapi_libnm_util_vapi_FILES = $(builddir)/libnm-util/NetworkManager-1.0.gir - -vapi_libnm_glib_vapi_METADATADIRS = $(srcdir)/vapi -vapi_libnm_glib_vapi_FILES = $(builddir)/libnm-glib/NMClient-1.0.gir -vapi_libnm_glib_vapi_VAPIDIRS = $(builddir)/vapi -vapi_libnm_glib_vapi_GIRDIRS = $(builddir)/libnm-util -vapi_libnm_glib_vapi_DEPS = gio-2.0 dbus-glib-1 libnm-util - vapi_DATA += \ $(VAPIGEN_VAPIS) \ $(VAPIGEN_VAPIS:.vapi=.deps) @@ -5321,11 +4726,7 @@ endif EXTRA_DIST += \ 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 ############################################################################### @@ -5437,6 +4838,7 @@ install-data-hook: $(install_data_hook) $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dnsmasq-shared.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/system-connections $(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir) $(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir) @@ -5445,7 +4847,7 @@ uninstall-hook: $(uninstall_hook) ############################################################################### cscope: - cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients; + cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -sclients; ############################################################################### |