diff --git a/.gitignore b/.gitignore index ef0055f250..d016b14cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,8 @@ *.la *.gir *.typelib -*.stamp +**.stamp +.dirstamp *-enum-types.[ch] *-glue.h *.loT diff --git a/Makefile.am b/Makefile.am index 86d66b9553..28aaa6c2aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,32 +1,106 @@ include $(GLIB_MAKEFILE) +-include $(INTROSPECTION_MAKEFILE) +include Makefile.vapigen @GNOME_CODE_COVERAGE_RULES@ +@NM_LOG_COMPILER@ + ############################################################################### +AUTOMAKE_OPTIONS = subdir-objects + +noinst_LTLIBRARIES = +check_LTLIBRARIES = +noinst_PROGRAMS = +noinst_LIBRARIES = +check_PROGRAMS = +noinst_DATA = +sbin_PROGRAMS = +bin_PROGRAMS = +libexec_PROGRAMS = +lib_LTLIBRARIES = +pkglib_LTLIBRARIES = +service_DATA = +man_MANS = +examples_DATA = +CLEANFILES = +DISTCLEANFILES = +EXTRA_DIST = +dist_hook = +install_data_hook = +install_exec_hook = +install_exec_local = +uninstall_hook = +TESTS = +BUILT_SOURCES = +GLIB_GENERATED = +man_pages = +man_pages_autogen = +check_programs = +check_programs_norun = +check_ltlibraries = +check_local = +VAPIGEN_VAPIS = +dbusservice_DATA = +dbusactivation_DATA = + +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = +INTROSPECTION_COMPILER_ARGS = +# Pass SANITIZER_ENV where a command that uses built libraries is +# executed, to suppress possible errors +INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) + +libnmincludedir = $(includedir)/libnm +libnminclude_HEADERS = + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = + +pppd_plugindir = $(PPPD_PLUGIN_DIR) +pppd_plugin_LTLIBRARIES = + +vapidir = $(datadir)/vala/vapi +vapi_DATA = + +examplesdir = $(docdir)/examples + +rundir=$(runstatedir)/NetworkManager +statedir=$(localstatedir)/lib/NetworkManager + +dbusactivationdir = $(datadir)/dbus-1/system-services + +servicedir = $(datadir)/dbus-1/system-services + +completiondir = $(datadir)/bash-completion/completions + +GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM +GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM + SUBDIRS = \ . \ - introspection \ - libnm-core \ - libnm \ - src \ - dispatcher \ - clients \ - tools \ - data \ po \ - man \ - examples + docs/libnm \ + docs/api if WITH_LEGACY_LIBRARIES SUBDIRS += \ - libnm-util \ - libnm-glib + docs/libnm-util \ + docs/libnm-glib endif -SUBDIRS += \ - docs \ - vapi +############################################################################### + +set_sanitizer_env = \ + [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ + if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \ + export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ + fi + +check_so_symbols = \ + $(call set_sanitizer_env,$(1)); \ + LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(top_builddir)/src/NetworkManager --version >/dev/null ############################################################################### @@ -51,12 +125,11 @@ endif dist: dist-check-setting-docs -DISTCLEANFILES = intltool-extract intltool-merge intltool-update +DISTCLEANFILES += intltool-extract intltool-merge intltool-update ############################################################################### -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = NetworkManager.pc +pkgconfig_DATA += NetworkManager.pc ############################################################################### @@ -73,7 +146,4054 @@ DISTCLEANFILES += $(polkit_policy_DATA) ############################################################################### -EXTRA_DIST = \ +noinst_LTLIBRARIES += \ + introspection/libnmdbus.la + +# gdbus-codegen 2.38 will emit code that requires glib 2.38, which +# will then cause availability warnings if we define +# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32. +# +# This is fixed in GLib 2.40 (it emits code that takes +# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go +# away when we depend on that. +introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) + +nodist_introspection_libnmdbus_la_SOURCES = \ + introspection/nmdbus-access-point.c \ + introspection/nmdbus-access-point.h \ + introspection/nmdbus-active-connection.c \ + introspection/nmdbus-active-connection.h \ + introspection/nmdbus-agent-manager.c \ + introspection/nmdbus-agent-manager.h \ + introspection/nmdbus-checkpoint.c \ + introspection/nmdbus-checkpoint.h \ + introspection/nmdbus-device-adsl.c \ + introspection/nmdbus-device-adsl.h \ + introspection/nmdbus-device-bond.c \ + introspection/nmdbus-device-bond.h \ + introspection/nmdbus-device-bridge.c \ + introspection/nmdbus-device-bridge.h \ + introspection/nmdbus-device-bt.c \ + introspection/nmdbus-device-bt.h \ + introspection/nmdbus-device-ethernet.c \ + introspection/nmdbus-device-ethernet.h \ + introspection/nmdbus-device.c \ + introspection/nmdbus-device.h \ + introspection/nmdbus-device-generic.c \ + introspection/nmdbus-device-generic.h \ + introspection/nmdbus-device-infiniband.c \ + introspection/nmdbus-device-infiniband.h \ + introspection/nmdbus-device-ip-tunnel.c \ + introspection/nmdbus-device-ip-tunnel.h \ + introspection/nmdbus-device-macvlan.c \ + introspection/nmdbus-device-macvlan.h \ + introspection/nmdbus-device-modem.c \ + introspection/nmdbus-device-modem.h \ + introspection/nmdbus-device-olpc-mesh.c \ + introspection/nmdbus-device-olpc-mesh.h \ + introspection/nmdbus-device-statistics.c \ + introspection/nmdbus-device-statistics.h \ + introspection/nmdbus-device-team.c \ + introspection/nmdbus-device-team.h \ + introspection/nmdbus-device-tun.c \ + introspection/nmdbus-device-tun.h \ + introspection/nmdbus-device-veth.c \ + introspection/nmdbus-device-veth.h \ + introspection/nmdbus-device-vlan.c \ + introspection/nmdbus-device-vlan.h \ + introspection/nmdbus-device-vxlan.c \ + introspection/nmdbus-device-vxlan.h \ + introspection/nmdbus-device-wifi.c \ + introspection/nmdbus-device-wifi.h \ + introspection/nmdbus-device-wimax.c \ + introspection/nmdbus-device-wimax.h \ + introspection/nmdbus-dhcp4-config.c \ + introspection/nmdbus-dhcp4-config.h \ + introspection/nmdbus-dhcp6-config.c \ + introspection/nmdbus-dhcp6-config.h \ + introspection/nmdbus-ip4-config.c \ + introspection/nmdbus-ip4-config.h \ + introspection/nmdbus-ip6-config.c \ + introspection/nmdbus-ip6-config.h \ + introspection/nmdbus-manager.c \ + introspection/nmdbus-manager.h \ + introspection/nmdbus-ppp-manager.c \ + introspection/nmdbus-ppp-manager.h \ + introspection/nmdbus-secret-agent.c \ + introspection/nmdbus-secret-agent.h \ + introspection/nmdbus-settings-connection.c \ + introspection/nmdbus-settings-connection.h \ + introspection/nmdbus-settings.c \ + introspection/nmdbus-settings.h \ + introspection/nmdbus-vpn-connection.c \ + introspection/nmdbus-vpn-connection.h \ + introspection/nmdbus-vpn-plugin.c \ + introspection/nmdbus-vpn-plugin.h + +DBUS_INTERFACE_DOCS = \ + introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ + introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ + introspection/nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \ + introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \ + introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \ + introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \ + introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \ + introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \ + introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \ + introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \ + introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \ + introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \ + introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \ + introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \ + introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \ + introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \ + introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \ + introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \ + introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \ + introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \ + introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ + introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \ + introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \ + introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \ + introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \ + introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \ + introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \ + introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \ + introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \ + introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \ + introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ + introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ + introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml + +define _make_nmdbus_rule +$(1): $(patsubst introspection/nmdbus-%.c,introspection/nm-%.xml,$(1)) + $$(AM_V_GEN) gdbus-codegen \ + --generate-c-code $$(basename $$@) \ + --generate-docbook $$(basename $$@) \ + --c-namespace NMDBus \ + --interface-prefix org.freedesktop.NetworkManager \ + $$< + +$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1) + @true + +$(basename $(1)).h: $(1) + @true +endef + +$(foreach f,$(filter %.c,$(nodist_introspection_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f))) + +BUILT_SOURCES += $(nodist_introspection_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) + +EXTRA_DIST += \ + introspection/nm-access-point.xml \ + introspection/nm-active-connection.xml \ + introspection/nm-agent-manager.xml \ + introspection/nm-checkpoint.xml \ + introspection/nm-device-adsl.xml \ + introspection/nm-device-bond.xml \ + introspection/nm-device-bridge.xml \ + introspection/nm-device-bt.xml \ + introspection/nm-device-ethernet.xml \ + introspection/nm-device-generic.xml \ + introspection/nm-device-infiniband.xml \ + introspection/nm-device-ip-tunnel.xml \ + introspection/nm-device-macvlan.xml \ + introspection/nm-device-modem.xml \ + introspection/nm-device-olpc-mesh.xml \ + introspection/nm-device-statistics.xml \ + introspection/nm-device-team.xml \ + introspection/nm-device-tun.xml \ + introspection/nm-device-veth.xml \ + introspection/nm-device-vlan.xml \ + introspection/nm-device-vxlan.xml \ + introspection/nm-device-wifi.xml \ + introspection/nm-device-wimax.xml \ + introspection/nm-device.xml \ + introspection/nm-dhcp4-config.xml \ + introspection/nm-dhcp6-config.xml \ + introspection/nm-ip4-config.xml \ + introspection/nm-ip6-config.xml \ + introspection/nm-manager.xml \ + introspection/nm-ppp-manager.xml \ + introspection/nm-secret-agent.xml \ + introspection/nm-settings-connection.xml \ + introspection/nm-settings.xml \ + introspection/nm-vpn-connection.xml \ + introspection/nm-vpn-plugin.xml \ + introspection/nm-wimax-nsp.xml + +############################################################################### + +libnm_core_libnm_core_headers = \ + shared/nm-version-macros.h \ + libnm-core/nm-core-enum-types.h \ + libnm-core/nm-connection.h \ + libnm-core/nm-core-types.h \ + libnm-core/nm-dbus-interface.h \ + libnm-core/nm-errors.h \ + libnm-core/nm-setting-8021x.h \ + libnm-core/nm-setting-adsl.h \ + libnm-core/nm-setting-bluetooth.h \ + libnm-core/nm-setting-bond.h \ + libnm-core/nm-setting-bridge-port.h \ + libnm-core/nm-setting-bridge.h \ + libnm-core/nm-setting-cdma.h \ + libnm-core/nm-setting-connection.h \ + libnm-core/nm-setting-dcb.h \ + libnm-core/nm-setting-generic.h \ + libnm-core/nm-setting-gsm.h \ + libnm-core/nm-setting-infiniband.h \ + libnm-core/nm-setting-ip-config.h \ + libnm-core/nm-setting-ip-tunnel.h \ + libnm-core/nm-setting-ip4-config.h \ + libnm-core/nm-setting-ip6-config.h \ + libnm-core/nm-setting-macvlan.h \ + libnm-core/nm-setting-olpc-mesh.h \ + libnm-core/nm-setting-ppp.h \ + libnm-core/nm-setting-pppoe.h \ + libnm-core/nm-setting-proxy.h \ + libnm-core/nm-setting-serial.h \ + libnm-core/nm-setting-team-port.h \ + libnm-core/nm-setting-team.h \ + libnm-core/nm-setting-tun.h \ + libnm-core/nm-setting-vlan.h \ + libnm-core/nm-setting-vpn.h \ + libnm-core/nm-setting-vxlan.h \ + libnm-core/nm-setting-wimax.h \ + libnm-core/nm-setting-wired.h \ + libnm-core/nm-setting-wireless-security.h \ + libnm-core/nm-setting-wireless.h \ + libnm-core/nm-setting.h \ + libnm-core/nm-simple-connection.h \ + libnm-core/nm-utils.h \ + 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_libnm_core_private_headers = \ + shared/nm-utils/nm-shared-utils.h \ + libnm-core/crypto.h \ + libnm-core/nm-connection-private.h \ + libnm-core/nm-core-internal.h \ + libnm-core/nm-core-types-internal.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_libnm_core_sources = \ + shared/nm-utils/nm-shared-utils.c \ + libnm-core/nm-core-enum-types.c \ + libnm-core/crypto.c \ + libnm-core/nm-connection.c \ + libnm-core/nm-dbus-utils.c \ + libnm-core/nm-errors.c \ + libnm-core/nm-keyfile-reader.c \ + libnm-core/nm-keyfile-utils.c \ + libnm-core/nm-keyfile-writer.c \ + libnm-core/nm-property-compare.c \ + libnm-core/nm-setting-8021x.c \ + libnm-core/nm-setting-adsl.c \ + libnm-core/nm-setting-bluetooth.c \ + libnm-core/nm-setting-bond.c \ + libnm-core/nm-setting-bridge-port.c \ + libnm-core/nm-setting-bridge.c \ + libnm-core/nm-setting-cdma.c \ + libnm-core/nm-setting-connection.c \ + libnm-core/nm-setting-dcb.c \ + libnm-core/nm-setting-generic.c \ + libnm-core/nm-setting-gsm.c \ + libnm-core/nm-setting-infiniband.c \ + libnm-core/nm-setting-ip-config.c \ + libnm-core/nm-setting-ip-tunnel.c \ + libnm-core/nm-setting-ip4-config.c \ + libnm-core/nm-setting-ip6-config.c \ + libnm-core/nm-setting-macvlan.c \ + libnm-core/nm-setting-olpc-mesh.c \ + libnm-core/nm-setting-ppp.c \ + libnm-core/nm-setting-pppoe.c \ + libnm-core/nm-setting-proxy.c \ + libnm-core/nm-setting-serial.c \ + libnm-core/nm-setting-team-port.c \ + libnm-core/nm-setting-team.c \ + libnm-core/nm-setting-tun.c \ + libnm-core/nm-setting-vlan.c \ + libnm-core/nm-setting-vpn.c \ + libnm-core/nm-setting-vxlan.c \ + libnm-core/nm-setting-wimax.c \ + libnm-core/nm-setting-wired.c \ + libnm-core/nm-setting-wireless-security.c \ + libnm-core/nm-setting-wireless.c \ + libnm-core/nm-setting.c \ + libnm-core/nm-simple-connection.c \ + libnm-core/nm-utils.c \ + libnm-core/nm-vpn-editor-plugin.c \ + libnm-core/nm-vpn-plugin-info.c + +libnminclude_HEADERS += $(libnm_core_libnm_core_headers) + +############################################################################### + +noinst_LTLIBRARIES += libnm-core/libnm-core.la + +GLIB_GENERATED += \ + libnm-core/nm-core-enum-types.h \ + libnm-core/nm-core-enum-types.c + +nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnm_core_libnm_core_headers)) + +libnm_core_libnm_core_la_CPPFLAGS = \ + -I${srcdir}/shared \ + -I${builddir}/shared \ + -I${srcdir}/libnm-core \ + -I${builddir}/libnm-core \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DNMLIBDIR=\"$(nmlibdir)\" \ + -DNMPLUGINDIR=\"$(pkglibdir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + $(JANSSON_CFLAGS) + +libnm_core_libnm_core_la_SOURCES = \ + $(libnm_core_libnm_core_sources) \ + $(libnm_core_libnm_core_private_headers) + +libnm_core_libnm_core_la_LIBADD = \ + $(GLIB_LIBS) \ + $(UUID_LIBS) \ + $(JANSSON_LIBS) + +libnm_core_libnm_core_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) + +if WITH_GNUTLS +libnm_core_libnm_core_la_CPPFLAGS += $(GNUTLS_CFLAGS) +libnm_core_libnm_core_la_SOURCES += libnm-core/crypto_gnutls.c +libnm_core_libnm_core_la_LIBADD += $(GNUTLS_LIBS) +endif + +if WITH_NSS +libnm_core_libnm_core_la_CPPFLAGS += $(NSS_CFLAGS) +libnm_core_libnm_core_la_SOURCES += libnm-core/crypto_nss.c +libnm_core_libnm_core_la_LIBADD += $(NSS_LIBS) +endif + +libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ + +libnm-core/nm-dbus-types.xml: libnm-core/nm-dbus-interface.h tools/enums-to-docbook.pl + $(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ + +BUILT_SOURCES += \ + libnm-core/nm-vpn-dbus-types.xml \ + libnm-core/nm-dbus-types.xml + +############################################################################### + +libnm_core_tests_programs = \ + libnm-core/tests/test-compare \ + libnm-core/tests/test-crypto \ + libnm-core/tests/test-general \ + libnm-core/tests/test-keyfile \ + libnm-core/tests/test-secrets \ + libnm-core/tests/test-setting-8021x \ + libnm-core/tests/test-setting-bond \ + libnm-core/tests/test-setting-dcb \ + libnm-core/tests/test-settings-defaults + +check_programs += $(libnm_core_tests_programs) + +GLIB_GENERATED += \ + libnm-core/tests/nm-core-tests-enum-types.h \ + libnm-core/tests/nm-core-tests-enum-types.c + +nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h + +libnm_core_tests_cppflags = \ + -I${srcdir}/shared \ + -I${builddir}/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm-core/tests \ + -DNETWORKMANAGER_COMPILATION \ + $(GLIB_CFLAGS) \ + -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" + +libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_general_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_keyfile_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_secrets_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_setting_8021x_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_setting_bond_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_setting_dcb_CPPFLAGS = $(libnm_core_tests_cppflags) +libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags) + +libnm_core_tests_test_general_SOURCES = \ + libnm-core/tests/nm-core-tests-enum-types.c \ + libnm-core/tests/nm-core-tests-enum-types.h \ + libnm-core/tests/test-general-enums.h \ + libnm-core/tests/test-general.c + +libnm_core_tests_ldadd = \ + libnm-core/libnm-core.la \ + $(GLIB_LIBS) + +libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_setting_8021x_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_setting_bond_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_setting_dcb_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd) + +# test-cert.p12 created with: +# +# openssl pkcs12 -export \ +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 + +EXTRA_DIST += \ + libnm-core/tests/certs/ca-no-ending-newline.pem \ + libnm-core/tests/certs/pkcs8-decrypted.der \ + libnm-core/tests/certs/pkcs8-enc-key.pem \ + libnm-core/tests/certs/pkcs8-noenc-key.pem \ + libnm-core/tests/certs/test2_ca_cert.pem \ + libnm-core/tests/certs/test2-cert.p12 \ + libnm-core/tests/certs/test2_key_and_cert.pem \ + libnm-core/tests/certs/test-aes-key.pem \ + libnm-core/tests/certs/test_ca_cert.der \ + libnm-core/tests/certs/test_ca_cert.pem \ + libnm-core/tests/certs/test-ca-cert.pem \ + libnm-core/tests/certs/test-cert.p12 \ + libnm-core/tests/certs/test_key_and_cert.pem \ + libnm-core/tests/certs/test-key-and-cert.pem \ + libnm-core/tests/certs/test-key-only-decrypted.der \ + libnm-core/tests/certs/test-key-only-decrypted.pem \ + libnm-core/tests/certs/test-key-only.pem + +############################################################################### + +libnminclude_headers = \ + shared/nm-version-macros.h \ + libnm/NetworkManager.h \ + libnm/nm-access-point.h \ + libnm/nm-active-connection.h \ + libnm/nm-client.h \ + libnm/nm-device-adsl.h \ + libnm/nm-device-bond.h \ + libnm/nm-device-bridge.h \ + libnm/nm-device-bt.h \ + libnm/nm-device-ethernet.h \ + libnm/nm-device-generic.h \ + libnm/nm-device-infiniband.h \ + libnm/nm-device-ip-tunnel.h \ + libnm/nm-device-macvlan.h \ + libnm/nm-device-modem.h \ + libnm/nm-device-olpc-mesh.h \ + libnm/nm-device-team.h \ + libnm/nm-device-tun.h \ + libnm/nm-device-vlan.h \ + libnm/nm-device-vxlan.h \ + libnm/nm-device-wifi.h \ + libnm/nm-device-wimax.h \ + libnm/nm-device.h \ + libnm/nm-dhcp-config.h \ + libnm/nm-enum-types.h \ + libnm/nm-ip-config.h \ + libnm/nm-object.h \ + libnm/nm-remote-connection.h \ + libnm/nm-types.h \ + libnm/nm-vpn-connection.h \ + libnm/nm-vpn-editor.h \ + libnm/nm-wimax-nsp.h + +libnminclude_nointrospect_headers = \ + libnm/nm-secret-agent-old.h \ + libnm/nm-vpn-plugin-old.h \ + libnm/nm-vpn-service-plugin.h + +libnminclude_HEADERS += \ + $(libnminclude_headers) \ + $(libnminclude_nointrospect_headers) + +############################################################################### + +lib_LTLIBRARIES += libnm/libnm.la + +GLIB_GENERATED += \ + libnm/nm-enum-types.h \ + libnm/nm-enum-types.c + +nm_enum_types_sources = \ + $(libnminclude_headers) \ + $(libnminclude_nointrospect_headers) +nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' +nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' + +libnm_libnm_la_CPPFLAGS = \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(builddir)/introspection \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm \ + -I$(builddir)/libnm \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ + $(GLIB_CFLAGS) \ + $(GUDEV_CFLAGS) \ + -DNMRUNDIR=\"$(nmrundir)\" \ + $(CODE_COVERAGE_CFLAGS) + +libnm_libnm_la_private_headers = \ + libnm/nm-dbus-helpers.h \ + libnm/nm-device-private.h \ + libnm/nm-dhcp4-config.h \ + libnm/nm-dhcp6-config.h \ + libnm/nm-ip4-config.h \ + libnm/nm-ip6-config.h \ + libnm/nm-manager.h \ + libnm/nm-object-cache.h \ + libnm/nm-object-private.h \ + libnm/nm-remote-connection-private.h \ + libnm/nm-remote-settings.h + +libnm_libnm_la_sources = \ + libnm/nm-access-point.c \ + libnm/nm-active-connection.c \ + libnm/nm-client.c \ + libnm/nm-dbus-helpers.c \ + libnm/nm-device-adsl.c \ + libnm/nm-device-bond.c \ + libnm/nm-device-bridge.c \ + libnm/nm-device-bt.c \ + libnm/nm-device-ethernet.c \ + libnm/nm-device-generic.c \ + libnm/nm-device-infiniband.c \ + libnm/nm-device-ip-tunnel.c \ + libnm/nm-device-macvlan.c \ + libnm/nm-device-modem.c \ + libnm/nm-device-olpc-mesh.c \ + libnm/nm-device-team.c \ + libnm/nm-device-tun.c \ + libnm/nm-device-vlan.c \ + libnm/nm-device-vxlan.c \ + libnm/nm-device-wifi.c \ + libnm/nm-device-wimax.c \ + libnm/nm-device.c \ + libnm/nm-dhcp-config.c \ + libnm/nm-dhcp4-config.c \ + libnm/nm-dhcp6-config.c \ + libnm/nm-enum-types.c \ + libnm/nm-ip-config.c \ + libnm/nm-ip4-config.c \ + libnm/nm-ip6-config.c \ + libnm/nm-manager.c \ + libnm/nm-object-cache.c \ + libnm/nm-object.c \ + libnm/nm-remote-connection.c \ + libnm/nm-remote-settings.c \ + libnm/nm-secret-agent-old.c \ + libnm/nm-vpn-connection.c \ + libnm/nm-vpn-plugin-old.c \ + libnm/nm-vpn-editor.c \ + libnm/nm-vpn-service-plugin.c \ + libnm/nm-wimax-nsp.c + +libnm_libnm_la_SOURCES = \ + $(libnm_libnm_la_sources) \ + $(libnm_libnm_la_private_headers) + +EXTRA_libnm_libnm_la_DEPENDENCIES = \ + libnm/libnm.ver + +libnm_libnm_la_LIBADD = \ + libnm-core/libnm-core.la \ + introspection/libnmdbus.la \ + $(DL_LIBS) \ + $(GLIB_LIBS) \ + $(UUID_LIBS) \ + $(GUDEV_LIBS) + +libnm_libnm_la_LDFLAGS = \ + -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ + $(CODE_COVERAGE_LDFLAGS) \ + -version-info "1:0:1" + +check-local-exports-libnm: libnm/libnm.la + $(srcdir)/tools/check-exports.sh "$(builddir)/libnm/.libs/libnm.so" "$(srcdir)/libnm/libnm.ver" + +check_local += check-local-exports-libnm + +pkgconfig_DATA += libnm/libnm.pc + +DISTCLEANFILES += \ + libnm/libnm.pc + +EXTRA_DIST += \ + libnm/libnm.pc.in \ + libnm/libnm.ver + + +if HAVE_INTROSPECTION +libnm/NM-1.0.gir: libnm/libnm.la +libnm_NM_1_0_gir_INCLUDES = Gio-2.0 +libnm_NM_1_0_gir_PACKAGES = gio-2.0 gudev-1.0 +libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm +libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS) +libnm_NM_1_0_gir_LIBS = libnm/libnm.la +libnm_NM_1_0_gir_FILES = \ + $(libnm_core_libnm_core_headers) \ + $(libnminclude_headers) \ + $(libnm_core_libnm_core_sources) \ + $(libnm_libnm_la_sources) +libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm + +libnm/libnm.typelib: libnm/libnm.gir + $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ + +INTROSPECTION_GIRS += libnm/NM-1.0.gir +endif + +if BUILD_SETTING_DOCS + +libnm_noinst_data = \ + libnm/nm-property-docs.xml \ + libnm/nm-setting-docs-overrides.xml \ + libnm/nm-setting-docs.xml \ + libnm/nm-keyfile-docs.xml \ + libnm/nm-ifcfg-rh-docs.xml + +noinst_DATA += $(libnm_noinst_data) + +libnm_docs_sources = $(filter-out %/nm-core-enum-types.c,$(libnm_core_libnm_core_sources)) + +libnm/nm-setting-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) + $(srcdir)/libnm/generate-plugin-docs.pl dbus "$(top_srcdir)" $@ + +# When the python scripts loads libnm and the address sanitizers is +# enabled, we must LD_PRELOAD libasan otherwise it will complain that +# it was not loaded as initial library. +libnm/nm-property-docs.xml: libnm/generate-setting-docs.py $(libnm_docs_sources) | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la + export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + $(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \ + $(srcdir)/libnm/generate-setting-docs.py \ + --gir $(builddir)/libnm/NM-1.0.gir \ + --output $@ + +libnm/nm-setting-docs.xml: libnm/generate-setting-docs.py $(libnm_docs_sources) libnm/nm-setting-docs-overrides.xml | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la + export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + $(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \ + $(srcdir)/libnm/generate-setting-docs.py \ + --gir $(builddir)/libnm/NM-1.0.gir \ + --overrides $(builddir)/libnm/nm-setting-docs-overrides.xml \ + --output $@ + +libnm/nm-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) + $(srcdir)/libnm/generate-plugin-docs.pl keyfile "$(top_srcdir)" $@ +libnm/nm-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) + $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(top_srcdir)" $@ + +EXTRA_DIST += $(libnm_noinst_data) + +endif + +EXTRA_DIST += \ + libnm/generate-setting-docs.py \ + libnm/generate-plugin-docs.pl + +############################################################################### + +libnm_tests_programs = \ + libnm/tests/test-nm-client \ + libnm/tests/test-remote-settings-client \ + libnm/tests/test-secret-agent + +check_programs += $(libnm_tests_programs) + +libnm_tests_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm \ + -I$(top_builddir)/libnm \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ + -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ + $(GLIB_CFLAGS) + +libnm_tests_ldadd = \ + $(top_builddir)/libnm/libnm.la \ + $(GLIB_LIBS) + +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_nm_client_SOURCES = \ + shared/nm-test-utils-impl.c \ + shared/nm-test-libnm-utils.h \ + libnm/tests/test-nm-client.c + +libnm_tests_test_remote_settings_client_SOURCES = \ + shared/nm-test-utils-impl.c \ + shared/nm-test-libnm-utils.h \ + libnm/tests/test-remote-settings-client.c + +libnm_tests_test_secret_agent_SOURCES = \ + shared/nm-test-utils-impl.c \ + shared/nm-test-libnm-utils.h \ + libnm/tests/test-secret-agent.c + +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) + +############################################################################### + +# just test, that we can build "nm-vpn-plugin-utils.c" + +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 + +libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ + $(GLIB_CFLAGS) \ + -I$(srcdir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(srcdir)/libnm + +libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ + $(GLIB_LIBS) + +############################################################################### +# src/ +############################################################################### + +src_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_builddir)/introspection \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + \ + $(foreach d,$(sort $(dir $(src_libNetworkManager_la_SOURCES))),-I$(srcdir)/$d) \ + \ + -DPREFIX=\"$(prefix)\" \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + \ + -DBINDIR=\"$(bindir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DLOCALSTATEDIR=\"$(localstatedir)\" \ + -DRUNSTATEDIR=\"$(runstatedir)\" \ + -DSBINDIR=\"$(sbindir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DRUNDIR=\"$(rundir)\" \ + \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DNMLOCALEDIR=\"$(datadir)/locale\" \ + -DNMPLUGINDIR=\"$(pkglibdir)\" \ + -DNMRUNDIR=\"$(nmrundir)\" \ + -DNMSTATEDIR=\"$(nmstatedir)\" \ + -DNMLIBDIR=\"$(nmlibdir)\" \ + \ + -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ + -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ + -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ + \ + $(GLIB_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(LIBNDP_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(SELINUX_CFLAGS) \ + $(LIBAUDIT_CFLAGS) \ + $(SYSTEMD_LOGIN_CFLAGS) \ + $(SYSTEMD_JOURNAL_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + \ + $(NULL) + +src_ldflags = $(CODE_COVERAGE_LDFLAGS) + +sbin_PROGRAMS += \ + src/NetworkManager + +libexec_PROGRAMS += \ + src/nm-iface-helper + +noinst_LTLIBRARIES += \ + src/libNetworkManagerBase.la \ + src/libNetworkManager.la \ + src/libsystemd-nm.la + +check_ltlibraries += src/libNetworkManagerTest.la + +############################################################################### + +src_libsystemd_nm_la_cppflags = \ + -I$(top_srcdir)/shared/ \ + -I$(top_builddir)/shared/ \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(srcdir)/src \ + -I$(top_srcdir)/src/systemd/sd-adapt/ \ + -I$(top_srcdir)/src/systemd/src/systemd/ \ + -I$(top_srcdir)/src/systemd/src/basic/ \ + -I$(top_srcdir)/src/systemd/src/shared/ \ + -I$(top_srcdir)/src/systemd/src/libsystemd-network/ \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ + $(GLIB_CFLAGS) + +src_libsystemd_nm_la_libadd = \ + $(GLIB_LIBS) + +src_libsystemd_nm_la_SOURCES = \ + src/systemd/nm-sd.c \ + src/systemd/nm-sd.h \ + src/systemd/sd-adapt/nm-sd-adapt.c \ + src/systemd/sd-adapt/nm-sd-adapt.h \ + src/systemd/sd-adapt/build.h \ + src/systemd/sd-adapt/cgroup-util.h \ + src/systemd/sd-adapt/condition.h \ + src/systemd/sd-adapt/conf-parser.h \ + src/systemd/sd-adapt/def.h \ + src/systemd/sd-adapt/dirent-util.h \ + src/systemd/sd-adapt/formats-util.h \ + src/systemd/sd-adapt/gunicode.h \ + src/systemd/sd-adapt/libudev.h \ + src/systemd/sd-adapt/missing.h \ + src/systemd/sd-adapt/mkdir.h \ + src/systemd/sd-adapt/process-util.h \ + src/systemd/sd-adapt/sd-daemon.h \ + src/systemd/sd-adapt/stat-util.h \ + src/systemd/sd-adapt/udev-util.h \ + src/systemd/sd-adapt/udev.h \ + src/systemd/sd-adapt/user-util.h \ + src/systemd/sd-adapt/virt.h \ + src/systemd/src/basic/alloc-util.c \ + src/systemd/src/basic/alloc-util.h \ + src/systemd/src/basic/async.h \ + src/systemd/src/basic/escape.c \ + src/systemd/src/basic/escape.h \ + src/systemd/src/basic/ether-addr-util.c \ + src/systemd/src/basic/ether-addr-util.h \ + src/systemd/src/basic/extract-word.c \ + src/systemd/src/basic/extract-word.h \ + src/systemd/src/basic/fd-util.c \ + src/systemd/src/basic/fd-util.h \ + src/systemd/src/basic/fileio.c \ + src/systemd/src/basic/fileio.h \ + src/systemd/src/basic/fs-util.c \ + src/systemd/src/basic/fs-util.h \ + src/systemd/src/basic/hash-funcs.c \ + src/systemd/src/basic/hash-funcs.h \ + src/systemd/src/basic/hashmap.c \ + src/systemd/src/basic/hashmap.h \ + src/systemd/src/basic/hexdecoct.c \ + src/systemd/src/basic/hexdecoct.h \ + src/systemd/src/basic/hostname-util.c \ + src/systemd/src/basic/hostname-util.h \ + src/systemd/src/basic/in-addr-util.c \ + src/systemd/src/basic/in-addr-util.h \ + src/systemd/src/basic/io-util.c \ + src/systemd/src/basic/io-util.h \ + src/systemd/src/basic/list.h \ + src/systemd/src/basic/log.h \ + src/systemd/src/basic/macro.h \ + src/systemd/src/basic/mempool.c \ + src/systemd/src/basic/mempool.h \ + src/systemd/src/basic/parse-util.c \ + src/systemd/src/basic/parse-util.h \ + src/systemd/src/basic/path-util.c \ + src/systemd/src/basic/path-util.h \ + src/systemd/src/basic/prioq.c \ + src/systemd/src/basic/prioq.h \ + src/systemd/src/basic/random-util.c \ + src/systemd/src/basic/random-util.h \ + src/systemd/src/basic/refcnt.h \ + src/systemd/src/basic/set.h \ + src/systemd/src/basic/signal-util.h \ + src/systemd/src/basic/siphash24.c \ + src/systemd/src/basic/siphash24.h \ + src/systemd/src/basic/socket-util.c \ + src/systemd/src/basic/socket-util.h \ + src/systemd/src/basic/sparse-endian.h \ + src/systemd/src/basic/stdio-util.h \ + src/systemd/src/basic/string-table.c \ + src/systemd/src/basic/string-table.h \ + src/systemd/src/basic/string-util.c \ + src/systemd/src/basic/string-util.h \ + src/systemd/src/basic/strv.c \ + src/systemd/src/basic/strv.h \ + src/systemd/src/basic/time-util.c \ + src/systemd/src/basic/time-util.h \ + src/systemd/src/basic/umask-util.h \ + src/systemd/src/basic/unaligned.h \ + src/systemd/src/basic/utf8.c \ + src/systemd/src/basic/utf8.h \ + src/systemd/src/basic/util.c \ + src/systemd/src/basic/util.h \ + src/systemd/src/libsystemd-network/arp-util.c \ + src/systemd/src/libsystemd-network/arp-util.h \ + src/systemd/src/libsystemd-network/dhcp-identifier.c \ + src/systemd/src/libsystemd-network/dhcp-identifier.h \ + src/systemd/src/libsystemd-network/dhcp-internal.h \ + src/systemd/src/libsystemd-network/dhcp-lease-internal.h \ + src/systemd/src/libsystemd-network/dhcp-network.c \ + src/systemd/src/libsystemd-network/dhcp-option.c \ + src/systemd/src/libsystemd-network/dhcp-packet.c \ + src/systemd/src/libsystemd-network/dhcp-protocol.h \ + src/systemd/src/libsystemd-network/dhcp6-internal.h \ + src/systemd/src/libsystemd-network/dhcp6-lease-internal.h \ + src/systemd/src/libsystemd-network/dhcp6-network.c \ + src/systemd/src/libsystemd-network/dhcp6-option.c \ + src/systemd/src/libsystemd-network/dhcp6-protocol.h \ + src/systemd/src/libsystemd-network/lldp-internal.h \ + src/systemd/src/libsystemd-network/lldp-neighbor.c \ + src/systemd/src/libsystemd-network/lldp-neighbor.h \ + src/systemd/src/libsystemd-network/lldp-network.c \ + src/systemd/src/libsystemd-network/lldp-network.h \ + src/systemd/src/libsystemd-network/network-internal.c \ + src/systemd/src/libsystemd-network/network-internal.h \ + src/systemd/src/libsystemd-network/sd-dhcp-client.c \ + src/systemd/src/libsystemd-network/sd-dhcp-lease.c \ + src/systemd/src/libsystemd-network/sd-dhcp6-client.c \ + src/systemd/src/libsystemd-network/sd-dhcp6-lease.c \ + src/systemd/src/libsystemd-network/sd-ipv4acd.c \ + src/systemd/src/libsystemd-network/sd-ipv4ll.c \ + src/systemd/src/libsystemd-network/sd-lldp.c \ + src/systemd/src/libsystemd/sd-event/sd-event.c \ + 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 \ + src/systemd/src/systemd/sd-dhcp6-client.h \ + src/systemd/src/systemd/sd-dhcp6-lease.h \ + src/systemd/src/systemd/sd-event.h \ + src/systemd/src/systemd/sd-id128.h \ + src/systemd/src/systemd/sd-ipv4acd.h \ + src/systemd/src/systemd/sd-ipv4ll.h \ + src/systemd/src/systemd/sd-lldp.h \ + src/systemd/src/systemd/sd-ndisc.h + +src_libsystemd_nm_la_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) +src_libsystemd_nm_la_LIBADD = $(src_libsystemd_nm_la_libadd) + +############################################################################### + +src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags) + +src_libNetworkManagerBase_la_SOURCES = \ + src/nm-core-utils.c \ + src/nm-core-utils.h \ + src/nm-logging.c \ + src/nm-logging.h + +src_libNetworkManagerBase_la_LIBADD = \ + $(top_builddir)/libnm-core/libnm-core.la \ + $(GLIB_LIBS) \ + $(SYSTEMD_JOURNAL_LIBS) \ + $(NULL) + +############################################################################### + +src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) + +src_libNetworkManager_la_SOURCES = \ + \ + src/nm-checkpoint-manager.c \ + src/nm-checkpoint-manager.h \ + src/nm-checkpoint.c \ + src/nm-checkpoint.h \ + \ + src/devices/nm-device.c \ + src/devices/nm-device.h \ + src/devices/nm-lldp-listener.c \ + src/devices/nm-lldp-listener.h \ + src/devices/nm-arping-manager.c \ + src/devices/nm-arping-manager.h \ + src/devices/nm-device-ethernet-utils.c \ + src/devices/nm-device-ethernet-utils.h \ + src/devices/nm-device-factory.c \ + src/devices/nm-device-factory.h \ + src/devices/nm-device-generic.c \ + src/devices/nm-device-generic.h \ + src/devices/nm-device-logging.h \ + src/devices/nm-device-private.h \ + \ + src/devices/nm-device-bond.c \ + src/devices/nm-device-bond.h \ + src/devices/nm-device-bridge.c \ + src/devices/nm-device-bridge.h \ + src/devices/nm-device-ethernet.c \ + src/devices/nm-device-ethernet.h \ + src/devices/nm-device-infiniband.c \ + src/devices/nm-device-infiniband.h \ + src/devices/nm-device-ip-tunnel.c \ + src/devices/nm-device-ip-tunnel.h \ + src/devices/nm-device-macvlan.c \ + src/devices/nm-device-macvlan.h \ + src/devices/nm-device-tun.c \ + src/devices/nm-device-tun.h \ + src/devices/nm-device-veth.c \ + src/devices/nm-device-veth.h \ + src/devices/nm-device-vlan.c \ + src/devices/nm-device-vlan.h \ + src/devices/nm-device-vxlan.c \ + src/devices/nm-device-vxlan.h \ + \ + src/dhcp-manager/nm-dhcp-client.c \ + src/dhcp-manager/nm-dhcp-client.h \ + src/dhcp-manager/nm-dhcp-client-logging.h \ + src/dhcp-manager/nm-dhcp-utils.c \ + src/dhcp-manager/nm-dhcp-manager.c \ + src/dhcp-manager/nm-dhcp-manager.h \ + src/dhcp-manager/nm-dhcp-utils.h \ + src/dhcp-manager/nm-dhcp-dhclient.c \ + src/dhcp-manager/nm-dhcp-dhcpcd.c \ + src/dhcp-manager/nm-dhcp-systemd.c \ + src/dhcp-manager/nm-dhcp-helper-api.h \ + src/dhcp-manager/nm-dhcp-listener.c \ + src/dhcp-manager/nm-dhcp-listener.h \ + src/dhcp-manager/nm-dhcp-dhclient-utils.c \ + src/dhcp-manager/nm-dhcp-dhclient-utils.h \ + \ + src/dns-manager/nm-dns-dnsmasq.c \ + src/dns-manager/nm-dns-dnsmasq.h \ + src/dns-manager/nm-dns-systemd-resolved.c \ + src/dns-manager/nm-dns-systemd-resolved.h \ + src/dns-manager/nm-dns-unbound.c \ + src/dns-manager/nm-dns-unbound.h \ + src/dns-manager/nm-dns-manager.c \ + src/dns-manager/nm-dns-manager.h \ + src/dns-manager/nm-dns-plugin.c \ + src/dns-manager/nm-dns-plugin.h \ + \ + src/dnsmasq-manager/nm-dnsmasq-manager.c \ + src/dnsmasq-manager/nm-dnsmasq-manager.h \ + src/dnsmasq-manager/nm-dnsmasq-utils.c \ + src/dnsmasq-manager/nm-dnsmasq-utils.h \ + \ + src/platform/nmp-netns.c \ + src/platform/nmp-netns.h \ + src/platform/nmp-object.c \ + src/platform/nmp-object.h \ + src/platform/nm-platform-utils.c \ + src/platform/nm-platform-utils.h \ + src/platform/nm-platform.c \ + src/platform/nm-platform.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/rdisc/nm-lndp-rdisc.c \ + src/rdisc/nm-lndp-rdisc.h \ + src/rdisc/nm-rdisc.c \ + src/rdisc/nm-rdisc.h \ + src/rdisc/nm-rdisc-private.h \ + \ + src/ppp-manager/nm-ppp-manager.c \ + src/ppp-manager/nm-ppp-manager.h \ + src/ppp-manager/nm-ppp-status.h \ + \ + src/settings/nm-agent-manager.c \ + src/settings/nm-agent-manager.h \ + src/settings/nm-inotify-helper.c \ + src/settings/nm-inotify-helper.h \ + src/settings/nm-secret-agent.c \ + src/settings/nm-secret-agent.h \ + src/settings/nm-settings-connection.c \ + src/settings/nm-settings-connection.h \ + src/settings/nm-settings-plugin.c \ + src/settings/nm-settings-plugin.h \ + src/settings/nm-settings.c \ + src/settings/nm-settings.h \ + \ + src/settings/plugins/keyfile/nms-keyfile-connection.c \ + src/settings/plugins/keyfile/nms-keyfile-connection.h \ + src/settings/plugins/keyfile/nms-keyfile-plugin.c \ + src/settings/plugins/keyfile/nms-keyfile-plugin.h \ + src/settings/plugins/keyfile/nms-keyfile-reader.c \ + src/settings/plugins/keyfile/nms-keyfile-reader.h \ + src/settings/plugins/keyfile/nms-keyfile-utils.c \ + src/settings/plugins/keyfile/nms-keyfile-utils.h \ + src/settings/plugins/keyfile/nms-keyfile-writer.c \ + src/settings/plugins/keyfile/nms-keyfile-writer.h \ + \ + src/supplicant-manager/nm-supplicant-config.c \ + src/supplicant-manager/nm-supplicant-config.h \ + src/supplicant-manager/nm-supplicant-interface.c \ + src/supplicant-manager/nm-supplicant-interface.h \ + src/supplicant-manager/nm-supplicant-manager.c \ + src/supplicant-manager/nm-supplicant-manager.h \ + src/supplicant-manager/nm-supplicant-settings-verify.c \ + src/supplicant-manager/nm-supplicant-settings-verify.h \ + src/supplicant-manager/nm-supplicant-types.h \ + \ + src/vpn-manager/nm-vpn-connection.c \ + src/vpn-manager/nm-vpn-connection.h \ + src/vpn-manager/nm-vpn-manager.c \ + src/vpn-manager/nm-vpn-manager.h \ + \ + src/nm-act-request.c \ + src/nm-act-request.h \ + src/nm-active-connection.c \ + src/nm-active-connection.h \ + src/nm-audit-manager.c \ + src/nm-audit-manager.h \ + src/nm-bus-manager.c \ + src/nm-bus-manager.h \ + src/nm-config.c \ + src/nm-config.h \ + src/nm-config-data.c \ + src/nm-config-data.h \ + src/nm-connectivity.c \ + src/nm-connectivity.h \ + src/nm-dcb.c \ + src/nm-dcb.h \ + src/nm-route-manager.c \ + src/nm-route-manager.h \ + src/nm-default-route-manager.c \ + src/nm-default-route-manager.h \ + src/nm-dhcp4-config.c \ + src/nm-dhcp4-config.h \ + src/nm-dhcp6-config.c \ + src/nm-dhcp6-config.h \ + src/nm-dispatcher.c \ + src/nm-dispatcher.h \ + src/nm-src-enum-types.c \ + src/nm-src-enum-types.h \ + src/nm-exported-object.c \ + src/nm-exported-object.h \ + src/nm-firewall-manager.c \ + src/nm-firewall-manager.h \ + src/nm-proxy-config.c \ + src/nm-proxy-config.h \ + src/nm-ip4-config.c \ + src/nm-ip4-config.h \ + src/nm-ip6-config.c \ + src/nm-ip6-config.h \ + src/nm-auth-manager.c \ + src/nm-auth-manager.h \ + src/nm-auth-subject.c \ + src/nm-auth-subject.h \ + src/nm-auth-utils.c \ + src/nm-auth-utils.h \ + src/nm-manager.c \ + src/nm-manager.h \ + src/nm-multi-index.c \ + src/nm-multi-index.h \ + src/nm-pacrunner-manager.c \ + src/nm-pacrunner-manager.h \ + src/nm-policy.c \ + src/nm-policy.h \ + src/nm-rfkill-manager.c \ + src/nm-rfkill-manager.h \ + src/nm-session-monitor.h \ + src/nm-session-monitor.c \ + src/nm-sleep-monitor.c \ + src/nm-sleep-monitor.h \ + src/nm-types.h \ + src/NetworkManagerUtils.c \ + src/NetworkManagerUtils.h \ + $(NULL) + +if WITH_WEXT +src_libNetworkManager_la_SOURCES += \ + src/platform/wifi/wifi-utils-wext.c \ + src/platform/wifi/wifi-utils-wext.h +endif + + +src_libNetworkManager_la_LIBADD = \ + libnm-core/libnm-core.la \ + introspection/libnmdbus.la \ + src/libNetworkManagerBase.la \ + src/libsystemd-nm.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) \ + $(SYSTEMD_LOGIN_LIBS) \ + $(LIBNDP_LIBS) \ + $(DL_LIBS) \ + $(LIBM) \ + $(SELINUX_LIBS) \ + $(LIBAUDIT_LIBS) + +if WITH_LIBSOUP +src_libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) +endif + +############################################################################### + +src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags) + +src_libNetworkManagerTest_la_SOURCES = \ + src/rdisc/nm-fake-rdisc.c \ + src/rdisc/nm-fake-rdisc.h \ + src/platform/nm-fake-platform.c \ + src/platform/nm-fake-platform.h + +src_libNetworkManagerTest_la_LIBADD = \ + src/libNetworkManager.la + +############################################################################### + +EXTRA_src_NetworkManager_DEPENDENCIES = \ + src/NetworkManager.ver + +src_NetworkManager_CPPFLAGS = $(src_cppflags) + +src_NetworkManager_SOURCES = \ + src/main-utils.c \ + src/main-utils.h \ + src/main.c + +src_NetworkManager_LDADD = \ + src/libNetworkManager.la + +src_NetworkManager_LDFLAGS = \ + -rdynamic \ + -Wl,--version-script="$(srcdir)/src/NetworkManager.ver" + +############################################################################### + +src_nm_iface_helper_CPPFLAGS = \ + $(src_cppflags) \ + -DNM_DHCP_INTERNAL_ONLY + +src_nm_iface_helper_SOURCES = \ + \ + src/dhcp-manager/nm-dhcp-client.c \ + src/dhcp-manager/nm-dhcp-client.h \ + src/dhcp-manager/nm-dhcp-client-logging.h \ + src/dhcp-manager/nm-dhcp-utils.c \ + src/dhcp-manager/nm-dhcp-utils.h \ + src/dhcp-manager/nm-dhcp-manager.c \ + src/dhcp-manager/nm-dhcp-manager.h \ + src/dhcp-manager/nm-dhcp-systemd.c \ + \ + src/platform/nmp-netns.c \ + src/platform/nmp-netns.h \ + src/platform/nmp-object.c \ + src/platform/nmp-object.h \ + src/platform/nm-platform-utils.c \ + src/platform/nm-platform-utils.h \ + src/platform/nm-platform.c \ + src/platform/nm-platform.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/nm-pacrunner-manager.c \ + src/nm-pacrunner-manager.h \ + \ + src/rdisc/nm-lndp-rdisc.c \ + src/rdisc/nm-lndp-rdisc.h \ + src/rdisc/nm-rdisc.c \ + src/rdisc/nm-rdisc.h \ + \ + src/nm-route-manager.c \ + src/nm-route-manager.h \ + \ + src/nm-exported-object.c \ + src/nm-exported-object.h \ + src/nm-proxy-config.c \ + src/nm-proxy-config.h \ + src/nm-ip4-config.c \ + src/nm-ip4-config.h \ + src/nm-ip6-config.c \ + src/nm-ip6-config.h \ + \ + src/nm-src-enum-types.c \ + src/nm-src-enum-types.h \ + src/nm-multi-index.c \ + src/nm-multi-index.h \ + src/NetworkManagerUtils.c \ + src/NetworkManagerUtils.h \ + \ + src/nm-iface-helper.c \ + src/main-utils.c \ + src/main-utils.h + +if WITH_WEXT +src_nm_iface_helper_SOURCES += \ + src/platform/wifi/wifi-utils-wext.c \ + src/platform/wifi/wifi-utils-wext.h +endif + +src_nm_iface_helper_LDADD = \ + libnm-core/libnm-core.la \ + introspection/libnmdbus.la \ + src/libNetworkManagerBase.la \ + src/libsystemd-nm.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) \ + $(LIBNDP_LIBS) \ + $(DL_LIBS) \ + $(LIBM) + +src_nm_iface_helper_LDFLAGS = \ + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" + +############################################################################### + +GLIB_GENERATED += \ + src/nm-src-enum-types.h \ + src/nm-src-enum-types.c +nm_src_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' +nm_src_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' +nm_src_enum_types_sources = $(filter-out \ + %/nm-device-private.h \ + %/nm-rdisc-private.h \ + %/wifi-utils-private.h \ + %/nm-dhcp-client-logging.h \ + %/nm-device-logging.h \ + , $(src_libNetworkManager_la_SOURCES)) + +############################################################################### + +EXTRA_DIST += \ + src/org.freedesktop.NetworkManager.conf \ + src/nm-test-utils-core.h \ + src/NetworkManager.ver + +############################################################################### +# src/dhcp-manager +############################################################################### + +libexec_PROGRAMS += src/dhcp-manager/nm-dhcp-helper + +src_dhcp_manager_nm_dhcp_helper_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + -I$(top_srcdir)/shared \ + -I${top_builddir}/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ + -DNMRUNDIR=\"$(nmrundir)\" + +src_dhcp_manager_nm_dhcp_helper_SOURCES = \ + src/dhcp-manager/nm-dhcp-helper.c \ + src/dhcp-manager/nm-dhcp-helper-api.h \ + $(NULL) + +src_dhcp_manager_nm_dhcp_helper_LDFLAGS = \ + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" + +src_dhcp_manager_nm_dhcp_helper_LDADD = $(GLIB_LIBS) + +############################################################################### +# src/dhcp-manager/tests +############################################################################### + +src_dhcp_manager_tests_cppflags = \ + -I$(top_srcdir)/shared \ + -I${top_builddir}/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I$(top_srcdir)/src/dhcp-manager \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/platform \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + -DTESTDIR="\"$(abs_srcdir)/src/dhcp-manager/tests\"" + +src_dhcp_manager_tests_ldadd = \ + src/libNetworkManager.la + +src_dhcp_manager_tests_programs = \ + src/dhcp-manager/tests/test-dhcp-dhclient \ + src/dhcp-manager/tests/test-dhcp-utils + +check_programs += $(src_dhcp_manager_tests_programs) + +src_dhcp_manager_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_manager_tests_cppflags) +src_dhcp_manager_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_manager_tests_cppflags) + +src_dhcp_manager_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_manager_tests_ldadd) +src_dhcp_manager_tests_test_dhcp_utils_LDADD = $(src_dhcp_manager_tests_ldadd) + +EXTRA_DIST += \ + src/dhcp-manager/tests/test-dhclient-duid.leases \ + src/dhcp-manager/tests/test-dhclient-commented-duid.leases \ + src/dhcp-manager/tests/leases/basic.leases \ + src/dhcp-manager/tests/leases/malformed1.leases \ + src/dhcp-manager/tests/leases/malformed2.leases \ + src/dhcp-manager/tests/leases/malformed3.leases + +############################################################################### +# src/ppp-manager +############################################################################### + +if WITH_PPP + +pppd_plugin_LTLIBRARIES += src/ppp-manager/nm-pppd-plugin.la + +src_ppp_manager_nm_pppd_plugin_la_CPPFLAGS = \ + -I${top_srcdir}/shared \ + -I${top_builddir}/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_srcdir}/src \ + -I${top_builddir}/libnm-core \ + -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) + +src_ppp_manager_nm_pppd_plugin_la_SOURCES = \ + src/ppp-manager/nm-pppd-plugin.c \ + src/ppp-manager/nm-pppd-plugin.h \ + src/ppp-manager/nm-ppp-status.h + +src_ppp_manager_nm_pppd_plugin_la_LDFLAGS = \ + -module -avoid-version + +src_ppp_manager_nm_pppd_plugin_la_LIBADD = \ + $(GLIB_LIBS) \ + $(DL_LIBS) + +endif + +############################################################################### +# src/settings/plugins/keyfile/tests +############################################################################### + +check_programs += src/settings/plugins/keyfile/tests/test-keyfile + +src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/settings \ + -I$(top_srcdir)/src/settings/plugins/keyfile \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \ + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\" \ + -DNMCONFDIR=\"nonexistent\" + +src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) + +src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ + src/libNetworkManager.la + +EXTRA_DIST += \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ + src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \ + src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \ + src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \ + src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \ + src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \ + src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \ + src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \ + src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \ + src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \ + src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \ + src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \ + src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \ + src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \ + src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \ + src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \ + src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \ + \ + src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ + src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem + +############################################################################### +# src/settings/plugins/ibft +############################################################################### + +if CONFIG_PLUGIN_IBFT + +pkglib_LTLIBRARIES += src/settings/plugins/ibft/libnm-settings-plugin-ibft.la + +noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la + +src_settings_plugins_ibft_cppflags = \ + -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/settings \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -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_SOURCES = \ + src/settings/plugins/ibft/nms-ibft-reader.c \ + src/settings/plugins/ibft/nms-ibft-reader.h + +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_settings_plugins_ibft_cppflags) + +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 + +check_programs += src/settings/plugins/ibft/tests/test-ibft + +src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/settings \ + -I$(srcdir)/src/settings/plugins/ibft \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \ + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\" + +src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) + +src_settings_plugins_ibft_tests_test_ibft_LDADD = \ + src/settings/plugins/ibft/libnms-ibft-core.la \ + src/libNetworkManager.la + +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 + +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 + +############################################################################### +# src/settings/plugins/ifcfg-rh +############################################################################### + +if CONFIG_PLUGIN_IFCFG_RH + +pkglib_LTLIBRARIES += src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la + +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$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/settings \ + -I$(top_srcdir)/src/settings/plugins/ifcfg-rh \ + -I$(top_builddir)/src/settings/plugins/ifcfg-rh \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(NSS_CFLAGS) \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -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)) + +BUILT_SOURCES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) + +src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml + $(AM_V_GEN) gdbus-codegen \ + --generate-c-code $(basename $@) \ + --c-namespace NMDBus \ + --interface-prefix com.redhat \ + $< + +src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h + @true + +############################################################################### + +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/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_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags) + +############################################################################### + +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-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_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" + +src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ + src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ + src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la + +check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la + $(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) + +check_local += check-local-symbols-settings-ifcfg-rh + +############################################################################### +# src/settings/plugins/ifcfg-rh/tests +############################################################################### + +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 = \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/settings \ + -I$(top_srcdir)/src/settings/plugins/ifcfg-rh \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \ + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\" \ + -DSYSCONFDIR=\"nonexistent\" \ + -DSBINDIR=\"nonexistent\" + +src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ + $(GLIB_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) + +src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ + src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ + src/libNetworkManager.la + +endif + +EXTRA_DIST += \ + 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-variables-corner-cases-1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-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-802-1X-subj-matches \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 + +# make target dependencies can't have colons in their names, which ends up +# meaning that we can't add the alias files to EXTRA_DIST. They are instead +# dist'ed via dist-hook-settings-ifcfg-rh below. +src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 + +dist-hook-settings-ifcfg-rh-alias-files: + @for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \ + cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \ + done + +dist_hook += dist-hook-settings-ifcfg-rh-alias-files + +############################################################################### + +dbusservice_DATA += src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf + +EXTRA_DIST += \ + src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ + src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml + +############################################################################### +# src/settings/plugins/ifupdown +############################################################################### + +if CONFIG_PLUGIN_IFUPDOWN + +pkglib_LTLIBRARIES += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la + +noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la + +src_settings_plugins_ifupdown_cppflags = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/settings \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(GUDEV_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_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_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags) + +src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" + +src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \ + src/settings/plugins/ifupdown/libnms-ifupdown-core.la + +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) + +check_local += check-local-symbols-settings-ifupdown + +############################################################################### + +check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown + +src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/settings \ + -I$(srcdir)/src/settings/plugins/ifupdown \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + -DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\" + +src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ + $(GLIB_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) + +src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ + src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ + src/libNetworkManager.la + +endif + +EXTRA_DIST += \ + src/settings/plugins/ifupdown/tests/test1 \ + src/settings/plugins/ifupdown/tests/test2 \ + src/settings/plugins/ifupdown/tests/test3 \ + src/settings/plugins/ifupdown/tests/test4 \ + src/settings/plugins/ifupdown/tests/test5 \ + src/settings/plugins/ifupdown/tests/test6 \ + src/settings/plugins/ifupdown/tests/test7 \ + src/settings/plugins/ifupdown/tests/test8 \ + src/settings/plugins/ifupdown/tests/test9 \ + src/settings/plugins/ifupdown/tests/test11 \ + src/settings/plugins/ifupdown/tests/test12 \ + src/settings/plugins/ifupdown/tests/test13 \ + src/settings/plugins/ifupdown/tests/test14 \ + src/settings/plugins/ifupdown/tests/test15 \ + src/settings/plugins/ifupdown/tests/test16 \ + src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \ + src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \ + src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \ + src/settings/plugins/ifupdown/tests/test20-source-stanza \ + src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \ + src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \ + src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \ + src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d + +############################################################################### +# src/settings/plugins/ifnet +############################################################################### + +if CONFIG_PLUGIN_IFNET + +pkglib_LTLIBRARIES += src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la + +noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la + +src_settings_plugins_ifnet_cppflags = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/settings \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" + -DSBINDIR=\"$(sbindir)\" + +src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \ + src/settings/plugins/ifnet/nms-ifnet-net-parser.c\ + src/settings/plugins/ifnet/nms-ifnet-net-parser.h\ + src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \ + src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \ + src/settings/plugins/ifnet/nms-ifnet-net-utils.h\ + src/settings/plugins/ifnet/nms-ifnet-net-utils.c\ + src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h\ + src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c + +src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES = \ + src/settings/plugins/ifnet/nms-ifnet-connection.c \ + src/settings/plugins/ifnet/nms-ifnet-connection.h \ + src/settings/plugins/ifnet/nms-ifnet-plugin.c \ + src/settings/plugins/ifnet/nms-ifnet-plugin.h + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" + +src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD = \ + src/settings/plugins/ifnet/libnms-ifnet-core.la + +check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la + $(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so) + +check_local += check-local-symbols-settings-ifnet + +############################################################################### + +check_programs += src/settings/plugins/ifnet/tests/test-ifnet + +src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/settings \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/settings/plugins/ifnet \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + -DTEST_IFNET_DIR=\"$(abs_srcdir)/src/settings/plugins/ifnet/tests\" \ + -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifnet/tests/\" \ + -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/src/settings/plugins/ifnet/tests/wpa_supplicant.conf"' \ + -DSYSCONFDIR=\"nonexistent\" + +src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \ + $(GLIB_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) + +src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \ + src/settings/plugins/ifnet/libnms-ifnet-core.la \ + src/libNetworkManager.la + +endif + +EXTRA_DIST += \ + src/settings/plugins/ifnet/tests/net \ + src/settings/plugins/ifnet/tests/net.all \ + src/settings/plugins/ifnet/tests/nm-system-settings.conf \ + src/settings/plugins/ifnet/tests/wpa_supplicant.conf \ + src/settings/plugins/ifnet/tests/test_ca_cert.pem + +############################################################################### +# src/devices/adsl +############################################################################### + +pkglib_LTLIBRARIES += src/devices/adsl/libnm-device-plugin-adsl.la + +src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \ + src/devices/adsl/nm-atm-manager.c \ + src/devices/adsl/nm-device-adsl.c \ + src/devices/adsl/nm-device-adsl.h + +src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ + -I${top_srcdir}/src \ + -I${top_builddir}/src \ + -I${top_srcdir}/src/devices \ + -I${top_srcdir}/src/platform \ + -I${top_builddir}/introspection \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/libnm-core \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GUDEV_CFLAGS) + +src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" + +src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ + introspection/libnmdbus.la \ + $(GUDEV_LIBS) + +check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la + $(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(top_srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so) + +check_local += check-local-devices-adsl + +############################################################################### +# src/devices/wwan +############################################################################### + +if WITH_MODEM_MANAGER_1 + +src_devices_wwan_cppflags = \ + -I${top_srcdir}/src \ + -I${top_builddir}/src \ + -I${top_srcdir}/src/devices \ + -I${top_srcdir}/src/settings \ + -I${top_srcdir}/src/platform \ + -I${top_builddir}/introspection \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/src/devices/wwan \ + -I${top_builddir}/src/devices/wwan \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(LIBSYSTEMD_CFLAGS) \ + $(MM_GLIB_CFLAGS) + +pkglib_LTLIBRARIES += src/devices/wwan/libnm-wwan.la + +GLIB_GENERATED += \ + src/devices/wwan/nm-modem-enum-types.h \ + src/devices/wwan/nm-modem-enum-types.c +nm_modem_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM +nm_modem_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' +nm_modem_enum_types_sources = src/devices/wwan/nm-modem.h + +src_devices_wwan_libnm_wwan_la_SOURCES = \ + src/devices/wwan/nm-modem-enum-types.h \ + src/devices/wwan/nm-modem-enum-types.c \ + src/devices/wwan/nm-modem-broadband.c \ + src/devices/wwan/nm-modem-broadband.h \ + src/devices/wwan/nm-modem-manager.c \ + src/devices/wwan/nm-modem-manager.h \ + src/devices/wwan/nm-modem.c \ + src/devices/wwan/nm-modem.h + +if WITH_OFONO +src_devices_wwan_libnm_wwan_la_SOURCES += \ + src/devices/wwan/nm-modem-ofono.c \ + src/devices/wwan/nm-modem-ofono.h +endif + +src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) + +src_devices_wwan_libnm_wwan_la_LDFLAGS = \ + -avoid-version \ + -Wl,--version-script="$(srcdir)/src/devices/wwan/libnm-wwan.ver" + +src_devices_wwan_libnm_wwan_la_LIBADD = \ + $(top_builddir)/introspection/libnmdbus.la \ + $(GLIB_LIBS) \ + $(LIBSYSTEMD_LIBS) \ + $(MM_GLIB_LIBS) + +pkglib_LTLIBRARIES += src/devices/wwan/libnm-device-plugin-wwan.la + +src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \ + src/devices/wwan/nm-wwan-factory.c \ + src/devices/wwan/nm-device-modem.c \ + src/devices/wwan/nm-device-modem.h + +src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) + +src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" + +src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \ + introspection/libnmdbus.la \ + src/devices/wwan/libnm-wwan.la \ + $(GLIB_LIBS) + +check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la + $(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(top_srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so) + $(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/devices/wwan/libnm-wwan.ver" + $(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-wwan.so) + +check_local += check-local-devices-wwan + +endif + +EXTRA_DIST += \ + src/devices/wwan/libnm-wwan.ver + +############################################################################### +# src/devices/bluetooth +############################################################################### + +if WITH_MODEM_MANAGER_1 + +GLIB_GENERATED += \ + src/devices/bluetooth/nm-bt-enum-types.h \ + src/devices/bluetooth/nm-bt-enum-types.c +nm_bt_enum_types_sources = src/devices/bluetooth/nm-bt-error.h + +pkglib_LTLIBRARIES += src/devices/bluetooth/libnm-device-plugin-bluetooth.la + +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \ + src/devices/bluetooth/nm-bt-enum-types.h \ + src/devices/bluetooth/nm-bt-enum-types.c \ + \ + src/devices/bluetooth/nm-bluez-manager.c \ + src/devices/bluetooth/nm-bluez-common.h \ + src/devices/bluetooth/nm-bluez-device.c \ + src/devices/bluetooth/nm-bluez-device.h \ + src/devices/bluetooth/nm-bluez4-adapter.c \ + src/devices/bluetooth/nm-bluez4-adapter.h \ + src/devices/bluetooth/nm-bluez4-manager.c \ + src/devices/bluetooth/nm-bluez4-manager.h \ + src/devices/bluetooth/nm-bluez5-manager.c \ + src/devices/bluetooth/nm-bluez5-manager.h \ + src/devices/bluetooth/nm-bt-error.h \ + src/devices/bluetooth/nm-bt-error.c \ + \ + src/devices/bluetooth/nm-device-bt.c \ + src/devices/bluetooth/nm-device-bt.h + +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ + -I${top_srcdir}/src \ + -I${top_builddir}/src \ + -I${top_srcdir}/src/devices \ + -I${top_srcdir}/src/settings \ + -I${top_srcdir}/src/platform \ + -I${top_srcdir}/src/devices/wwan \ + -I${top_builddir}/introspection \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/libnm-core \ + -I${top_srcdir}/src/devices/bluetooth \ + -I${top_builddir}/src/devices/bluetooth \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) + +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" + +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ + introspection/libnmdbus.la \ + src/devices/wwan/libnm-wwan.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) + +if WITH_BLUEZ5_DUN +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS += $(BLUEZ5_CFLAGS) + +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES += \ + src/devices/bluetooth/nm-bluez5-dun.c \ + src/devices/bluetooth/nm-bluez5-dun.h + +src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD += $(BLUEZ5_LIBS) +endif + +check-local-devices-bluetooth: src/devices/bluetooth/libnm-device-plugin-bluetooth.la + $(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(top_srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so) + +check_local += check-local-devices-bluetooth + +endif + +############################################################################### +# src/devices/wifi +############################################################################### + +if WITH_WIFI + +pkglib_LTLIBRARIES += src/devices/wifi/libnm-device-plugin-wifi.la + +src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ + src/devices/wifi/nm-wifi-factory.c \ + src/devices/wifi/nm-device-wifi.c \ + src/devices/wifi/nm-device-wifi.h \ + src/devices/wifi/nm-wifi-ap.c \ + src/devices/wifi/nm-wifi-ap.h \ + src/devices/wifi/nm-wifi-utils.c \ + src/devices/wifi/nm-wifi-utils.h \ + src/devices/wifi/nm-device-olpc-mesh.c \ + src/devices/wifi/nm-device-olpc-mesh.h + +src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ + -I${top_srcdir}/src \ + -I${top_builddir}/src \ + -I${top_srcdir}/src/devices \ + -I${top_srcdir}/src/settings \ + -I${top_srcdir}/src/platform \ + -I${top_srcdir}/src/supplicant-manager \ + -I${top_builddir}/introspection \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/libnm-core \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) + +src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" + +src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ + introspection/libnmdbus.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) + +check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la + $(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(top_srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so) + +check_local += check-local-devices-wifi + +check_programs += src/devices/wifi/tests/test-general + +src_devices_wifi_tests_test_general_SOURCES = \ + src/devices/wifi/tests/test-general.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 = \ + -I$(top_builddir)/introspection \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I${top_srcdir}/src/platform \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/devices/wifi \ + -I$(top_builddir)/src \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) + +src_devices_wifi_tests_test_general_LDADD = src/libNetworkManager.la + +endif + +############################################################################### +# src/devices/team +############################################################################### + +if WITH_TEAMDCTL + +pkglib_LTLIBRARIES += 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_libnm_device_plugin_team_la_CPPFLAGS = \ + -I${top_srcdir}/src \ + -I${top_builddir}/src \ + -I${top_srcdir}/src/devices \ + -I${top_srcdir}/src/platform \ + -I${top_srcdir}/src/settings \ + -I${top_builddir}/introspection \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/libnm-core \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + ${LIBTEAMDCTL_CFLAGS} \ + $(GLIB_CFLAGS) + +src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" + +src_devices_team_libnm_device_plugin_team_la_LIBADD = \ + introspection/libnmdbus.la \ + $(LIBTEAMDCTL_LIBS) \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) + +check-local-devices-team: src/devices/team/libnm-device-plugin-team.la + $(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(top_srcdir)/linker-script-devices.ver" + $(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so) + +check_local += check-local-devices-team + +endif + +############################################################################### +# src/dnsmasq-manager/tests +############################################################################### + +check_programs += src/dnsmasq-manager/tests/test-dnsmasq-utils + +src_dnsmasq_manager_tests_test_dnsmasq_utils_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I${top_builddir}/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I$(top_srcdir)/src/dnsmasq-manager \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/platform \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + -DTESTDIR="\"$(abs_srcdir)\"" + +src_dnsmasq_manager_tests_test_dnsmasq_utils_LDADD = \ + src/libNetworkManager.la + +############################################################################### +# src/platform/tests +############################################################################### + +src_platform_tests_cppflags = \ + -I${top_srcdir} \ + -I${top_srcdir}/shared \ + -I${top_builddir}/shared \ + -I${top_srcdir}/src \ + -I${top_builddir}/src \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${srcdir}/src/platform \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + $(LIBNL_CFLAGS) + +check_ltlibraries += \ + src/platform/tests/libnm-platform-tests.la + +src_platform_tests_libnm_platform_tests_la_SOURCES = \ + src/platform/tests/test-common.c \ + src/platform/tests/test-common.h +src_platform_tests_libnm_platform_tests_la_CPPFLAGS = $(src_platform_tests_cppflags) +if REQUIRE_ROOT_TESTS +src_platform_tests_libnm_platform_tests_la_CPPFLAGS += -DREQUIRE_ROOT_TESTS=1 +endif +src_platform_tests_libnm_platform_tests_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) +src_platform_tests_libnm_platform_tests_la_LIBADD = \ + src/libNetworkManagerTest.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) + +src_platform_tests_cppflags_linux = $(src_platform_tests_cppflags) -DSETUP=nm_linux_platform_setup +src_platform_tests_cppflags_fake = $(src_platform_tests_cppflags) -DSETUP=nm_fake_platform_setup + +src_platform_tests_ldflags = \ + $(CODE_COVERAGE_LDFLAGS) + +src_platform_tests_libadd = \ + src/platform/tests/libnm-platform-tests.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) + +noinst_PROGRAMS += \ + 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-nmp-object \ + src/platform/tests/test-route-fake \ + src/platform/tests/test-route-linux \ + src/platform/tests/test-cleanup-fake \ + src/platform/tests/test-cleanup-linux + +src_platform_tests_monitor_CPPFLAGS = $(src_platform_tests_cppflags) +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_platform_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_platform_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_platform_tests_cppflags_fake) +src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_address_fake_LDADD = $(src_platform_tests_libadd) + +src_platform_tests_test_address_linux_SOURCES = src/platform/tests/test-address.c +src_platform_tests_test_address_linux_CPPFLAGS = $(src_platform_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_platform_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_platform_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_platform_tests_cppflags_fake) +src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_cleanup_fake_LDADD = $(src_platform_tests_libadd) + +src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.c +src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_platform_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_platform_tests_cppflags) +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_platform_tests_cppflags) +src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags) +src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la + +############################################################################### +# src/devices/tests +############################################################################### + +src_devices_tests_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/devices \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src/platform/tests \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) + +src_devices_tests_ldflags = \ + $(CODE_COVERAGE_LDFLAGS) + +check_programs += \ + src/devices/tests/test-lldp \ + src/devices/tests/test-arping + +src_devices_tests_test_lldp_CPPFLAGS = $(src_devices_tests_cppflags) +src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_lldp_LDADD = \ + src/platform/tests/libnm-platform-tests.la + +src_devices_tests_test_arping_CPPFLAGS = $(src_devices_tests_cppflags) +src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_arping_LDADD = \ + src/platform/tests/libnm-platform-tests.la + +############################################################################### +# src/rdisc/tests +############################################################################### + +src_rdisc_tests_cppflags = \ + -I${top_srcdir} \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I${top_srcdir}/src \ + -I${top_srcdir}/src/platform \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${srcdir}/src/rdisc \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ + $(LIBNDP_CFLAGS) + +src_rdisc_tests_ldflags = \ + $(CODE_COVERAGE_LDFLAGS) + +src_rdisc_tests_ldadd = \ + src/libNetworkManagerTest.la \ + $(GLIB_LIBS) + +check_programs += src/rdisc/tests/test-rdisc-fake +check_programs_norun += src/rdisc/tests/test-rdisc-linux + +src_rdisc_tests_test_rdisc_linux_CPPFLAGS = $(src_rdisc_tests_cppflags) +src_rdisc_tests_test_rdisc_linux_LDFLAGS = $(src_rdisc_tests_flags) +src_rdisc_tests_test_rdisc_linux_LDADD = $(src_rdisc_tests_ldadd) + +src_rdisc_tests_test_rdisc_fake_CPPFLAGS = $(src_rdisc_tests_cppflags) +src_rdisc_tests_test_rdisc_fake_LDFLAGS = $(src_rdisc_tests_flags) +src_rdisc_tests_test_rdisc_fake_LDADD = $(src_rdisc_tests_ldadd) + +############################################################################### +# src/supplicant-manager/tests +############################################################################### + +check_programs += src/supplicant-manager/tests/test-supplicant-config + +src_supplicant_manager_tests_test_supplicant_config_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/supplicant-manager \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant-manager/tests/certs\" \ + $(GLIB_CFLAGS) + +src_supplicant_manager_tests_test_supplicant_config_LDADD = \ + src/libNetworkManager.la + +EXTRA_DIST += \ + src/supplicant-manager/tests/certs/test-ca-cert.pem \ + src/supplicant-manager/tests/certs/test-cert.p12 + +############################################################################### +# src/tests/config +############################################################################### + +check_programs += src/tests/config/test-config + +src_tests_config_test_config_SOURCES = \ + src/tests/config/nm-test-device.c \ + src/tests/config/nm-test-device.h \ + src/tests/config/test-config.c + +src_tests_config_test_config_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/devices \ + -I${top_srcdir}/src/platform \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + -DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \ + -DBUILDDIR=\""$(abs_builddir)/src/tests/config"\" + +src_tests_config_test_config_LDADD = \ + src/libNetworkManagerTest.la + +EXTRA_DIST += \ + src/tests/config/NetworkManager.conf \ + src/tests/config/NetworkManager.state \ + src/tests/config/bad.conf \ + src/tests/config/global-dns-invalid.conf \ + src/tests/config/conf.d/00-overrides.conf \ + src/tests/config/conf.d/10-more.conf \ + src/tests/config/conf.d/20-config-enable-1.conf \ + src/tests/config/conf.d/90-last.conf + +############################################################################### +# src/tests +############################################################################### + +src_tests_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/src/platform \ + -I$(top_srcdir)/src/dhcp-manager \ + -I$(top_srcdir)/src/devices \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + $(GLIB_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) + +src_tests_ldflags = \ + $(CODE_COVERAGE_LDFLAGS) + +src_tests_ldadd = \ + src/libNetworkManager.la + +check_programs += \ + src/tests/test-general \ + src/tests/test-general-with-expect \ + src/tests/test-ip4-config \ + src/tests/test-ip6-config \ + src/tests/test-route-manager-linux \ + src/tests/test-route-manager-fake \ + src/tests/test-dcb \ + src/tests/test-systemd \ + src/tests/test-resolvconf-capture \ + src/tests/test-wired-defname \ + src/tests/test-utils + +src_tests_test_ip4_config_CPPFLAGS = $(src_tests_cppflags) +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_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_LDFLAGS = $(src_tests_ldflags) +src_tests_test_dcb_LDADD = $(src_tests_ldadd) + +src_tests_test_resolvconf_capture_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_resolvconf_capture_LDFLAGS = $(src_tests_ldflags) +src_tests_test_resolvconf_capture_LDADD = $(src_tests_ldadd) + +src_tests_test_general_CPPFLAGS = $(src_tests_cppflags) +src_tests_test_general_LDFLAGS = $(src_tests_ldflags) +src_tests_test_general_LDADD = $(src_tests_ldadd) + +src_tests_test_general_with_expect_CPPFLAGS = $(src_tests_cppflags) +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_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_LDFLAGS = $(src_tests_ldflags) +src_tests_test_utils_LDADD = $(src_tests_ldadd) + + +src_tests_test_route_manager_cppflags = \ + -I$(top_srcdir)/src/platform/tests \ + $(src_tests_cppflags) \ + $(GUDEV_CFLAGS) + +src_tests_test_route_manager_ldflags = \ + $(CODE_COVERAGE_LDFLAGS) + +src_tests_test_route_manager_ldadd = \ + src/platform/tests/libnm-platform-tests.la \ + $(GLIB_LIBS) \ + $(GUDEV_LIBS) \ + $(LIBNL_LIBS) + +src_tests_test_route_manager_cppflags_fake = $(src_tests_test_route_manager_cppflags) -DSETUP=nm_fake_platform_setup +src_tests_test_route_manager_cppflags_linux = $(src_tests_test_route_manager_cppflags) -DSETUP=nm_linux_platform_setup + +src_tests_test_route_manager_fake_SOURCES = src/tests/test-route-manager.c +src_tests_test_route_manager_fake_CPPFLAGS = $(src_tests_test_route_manager_cppflags_fake) +src_tests_test_route_manager_fake_LDFLAGS = $(src_tests_test_route_manager_ldflags) +src_tests_test_route_manager_fake_LDADD = $(src_tests_test_route_manager_ldadd) + +src_tests_test_route_manager_linux_SOURCES = src/tests/test-route-manager.c +src_tests_test_route_manager_linux_CPPFLAGS = $(src_tests_test_route_manager_cppflags_linux) +src_tests_test_route_manager_linux_LDFLAGS = $(src_tests_test_route_manager_ldflags) +src_tests_test_route_manager_linux_LDADD = $(src_tests_test_route_manager_ldadd) + + +src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) +src_tests_test_systemd_LDADD = \ + src/libsystemd-nm.la \ + $(src_libsystemd_nm_la_libadd) + +EXTRA_DIST += \ + src/tests/test-secret-agent.py + +############################################################################### +# dispatcher +############################################################################### + +libexec_PROGRAMS += dispatcher/nm-dispatcher + +noinst_LTLIBRARIES += \ + dispatcher/libnm-dispatcher-core.la + +dispatcher_cppflags = \ + -I${top_srcdir}/shared \ + -I${top_builddir}/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/dispatcher \ + $(GLIB_CFLAGS) \ + -DNETWORKMANAGER_COMPILATION \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" + + +dispatcher_nmdbus_dispatcher_sources = \ + dispatcher/nmdbus-dispatcher.h \ + dispatcher/nmdbus-dispatcher.c + +dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml + $(AM_V_GEN) gdbus-codegen \ + --generate-c-code $(basename $@) \ + --c-namespace NMDBus \ + --interface-prefix org.freedesktop \ + $< + +dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h + +BUILT_SOURCES += $(dispatcher_nmdbus_dispatcher_sources) + + +dispatcher_libnm_dispatcher_core_la_SOURCES = \ + shared/nm-dispatcher-api.h \ + dispatcher/nm-dispatcher-utils.c \ + dispatcher/nm-dispatcher-utils.h + +dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) + +dispatcher_libnm_dispatcher_core_la_LIBADD = \ + libnm/libnm.la \ + $(GLIB_LIBS) + + +dispatcher_nm_dispatcher_SOURCES = \ + shared/nm-dispatcher-api.h \ + dispatcher/nm-dispatcher.c + +nodist_dispatcher_nm_dispatcher_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) + +dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags) + +dispatcher_nm_dispatcher_LDFLAGS = \ + -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" + +dispatcher_nm_dispatcher_LDADD = \ + libnm/libnm.la \ + dispatcher/libnm-dispatcher-core.la \ + $(GLIB_LIBS) + +dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in + @sed \ + -e 's|@sbindir[@]|$(sbindir)|g' \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' \ + $< >$@ + +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 + +install_data_hook += install-data-hook-dispatcher + + +dbusservice_DATA += dispatcher/nm-dispatcher.conf + +EXTRA_DIST += \ + dispatcher/nm-dispatcher.conf \ + dispatcher/org.freedesktop.nm_dispatcher.service.in \ + dispatcher/nm-dispatcher.xml + +############################################################################### +# dispatcher/tests +############################################################################### + +check_programs += dispatcher/tests/test-dispatcher-envp + +dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/dispatcher \ + -I$(top_builddir)/dispatcher \ + -DNETWORKMANAGER_COMPILATION \ + -DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \ + $(GLIB_CFLAGS) + +dispatcher_tests_test_dispatcher_envp_LDADD = \ + libnm/libnm.la \ + dispatcher/libnm-dispatcher-core.la \ + $(GLIB_LIBS) + +EXTRA_DIST += \ + dispatcher/tests/dispatcher-connectivity-full \ + dispatcher/tests/dispatcher-connectivity-unknown \ + dispatcher/tests/dispatcher-down \ + dispatcher/tests/dispatcher-external \ + dispatcher/tests/dispatcher-up \ + dispatcher/tests/dispatcher-vpn-down \ + dispatcher/tests/dispatcher-vpn-up + +############################################################################### +# clients +############################################################################### + +bin_PROGRAMS += clients/nm-online + +clients_nm_online_CPPFLAGS = \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/libnm \ + -I${top_builddir}/libnm \ + $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""nm-online"\" \ + -DNMLOCALEDIR=\"$(datadir)/locale\" + +clients_nm_online_LDFLAGS = \ + -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" + +clients_nm_online_LDADD = \ + libnm/libnm.la \ + $(GLIB_LIBS) + +############################################################################### +# clients/cli +############################################################################### + +if BUILD_NMCLI + +bin_PROGRAMS += clients/cli/nmcli + +clients_cli_nmcli_SOURCES = \ + clients/cli/agent.c \ + clients/cli/agent.h \ + clients/cli/common.c \ + clients/cli/common.h \ + clients/cli/connections.c \ + clients/cli/connections.h \ + clients/cli/devices.c \ + clients/cli/devices.h \ + clients/cli/general.c \ + clients/cli/general.h \ + clients/cli/settings.c \ + clients/cli/settings.h \ + clients/cli/nmcli.c \ + clients/cli/nmcli.h \ + clients/cli/utils.c \ + clients/cli/utils.h \ + clients/cli/polkit-agent.c \ + clients/cli/polkit-agent.h \ + \ + clients/common/nm-secret-agent-simple.c \ + clients/common/nm-secret-agent-simple.h \ + clients/common/nm-vpn-helpers.c \ + clients/common/nm-vpn-helpers.h \ + $(NULL) + +clients_cli_nmcli_CPPFLAGS = \ + -I${top_srcdir} \ + -I${top_builddir} \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/libnm \ + -I${top_builddir}/libnm \ + -I${top_srcdir}/clients/common \ + $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""nmcli"\" \ + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" + +clients_cli_nmcli_LDADD = \ + $(GLIB_LIBS) \ + $(READLINE_LIBS) \ + libnm/libnm.la + +if WITH_POLKIT_AGENT +clients_cli_nmcli_CPPFLAGS += $(POLKIT_CFLAGS) +clients_cli_nmcli_SOURCES += \ + clients/common/nm-polkit-listener.c \ + clients/common/nm-polkit-listener.h +clients_cli_nmcli_LDADD += $(POLKIT_LIBS) +endif + +clients_cli_nmcli_LDFLAGS = \ + -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" + + +install-data-hook-nmcli: + $(mkinstalldirs) $(DESTDIR)$(completiondir) + $(INSTALL_DATA) $(srcdir)/clients/cli/nmcli-completion $(DESTDIR)$(completiondir)/nmcli + +install_data_hook += install-data-hook-nmcli + +uninstall-hook-nmcli: + rm -f $(DESTDIR)$(completiondir)/nmcli + +uninstall_hook += uninstall-hook-nmcli + +endif + +if BUILD_SETTING_DOCS + +clients/cli/settings-docs.c: clients/cli/settings-docs.xsl libnm/nm-property-docs.xml + $(AM_V_GEN) xsltproc --output $@ $^ + +BUILT_SOURCES += clients/cli/settings-docs.c +EXTRA_DIST += clients/cli/settings-docs.c + +endif + +EXTRA_DIST += \ + clients/cli/nmcli-completion \ + clients/cli/settings-docs.xsl + +############################################################################### +# clients/tui +############################################################################### + +if BUILD_NMTUI + +noinst_LIBRARIES += clients/tui/newt/libnmt-newt.a + +clients_tui_newt_libnmt_newt_a_SOURCES = \ + clients/tui/newt/nmt-newt.h \ + clients/tui/newt/nmt-newt-types.h \ + clients/tui/newt/nmt-newt-button.c \ + clients/tui/newt/nmt-newt-button.h \ + clients/tui/newt/nmt-newt-button-box.c \ + clients/tui/newt/nmt-newt-button-box.h \ + clients/tui/newt/nmt-newt-checkbox.c \ + clients/tui/newt/nmt-newt-checkbox.h \ + clients/tui/newt/nmt-newt-component.c \ + clients/tui/newt/nmt-newt-component.h \ + clients/tui/newt/nmt-newt-container.c \ + clients/tui/newt/nmt-newt-container.h \ + clients/tui/newt/nmt-newt-entry.c \ + clients/tui/newt/nmt-newt-entry.h \ + clients/tui/newt/nmt-newt-entry-numeric.c \ + clients/tui/newt/nmt-newt-entry-numeric.h \ + clients/tui/newt/nmt-newt-form.c \ + clients/tui/newt/nmt-newt-form.h \ + clients/tui/newt/nmt-newt-grid.c \ + clients/tui/newt/nmt-newt-grid.h \ + clients/tui/newt/nmt-newt-hacks.c \ + clients/tui/newt/nmt-newt-hacks.h \ + clients/tui/newt/nmt-newt-label.c \ + clients/tui/newt/nmt-newt-label.h \ + clients/tui/newt/nmt-newt-listbox.c \ + clients/tui/newt/nmt-newt-listbox.h \ + clients/tui/newt/nmt-newt-popup.c \ + clients/tui/newt/nmt-newt-popup.h \ + clients/tui/newt/nmt-newt-section.c \ + clients/tui/newt/nmt-newt-section.h \ + clients/tui/newt/nmt-newt-separator.c \ + clients/tui/newt/nmt-newt-separator.h \ + clients/tui/newt/nmt-newt-stack.c \ + clients/tui/newt/nmt-newt-stack.h \ + clients/tui/newt/nmt-newt-textbox.c \ + clients/tui/newt/nmt-newt-textbox.h \ + clients/tui/newt/nmt-newt-toggle-button.c \ + clients/tui/newt/nmt-newt-toggle-button.h \ + clients/tui/newt/nmt-newt-utils.c \ + clients/tui/newt/nmt-newt-utils.h \ + clients/tui/newt/nmt-newt-widget.c \ + clients/tui/newt/nmt-newt-widget.h \ + $(NULL) + +clients_tui_newt_libnmt_newt_a_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DG_LOG_DOMAIN=\""nmtui"\" \ + $(GLIB_CFLAGS) \ + $(NEWT_CFLAGS) \ + $(NULL) + +bin_PROGRAMS += clients/tui/nmtui + +clients_tui_nmtui_SOURCES = \ + clients/tui/nmtui.c \ + clients/tui/nmtui.h \ + clients/tui/nmtui-connect.c \ + clients/tui/nmtui-connect.h \ + clients/tui/nmtui-edit.c \ + clients/tui/nmtui-edit.h \ + clients/tui/nmtui-hostname.c \ + clients/tui/nmtui-hostname.h \ + \ + clients/tui/nm-editor-bindings.c \ + clients/tui/nm-editor-bindings.h \ + clients/tui/nm-editor-utils.c \ + clients/tui/nm-editor-utils.h \ + \ + clients/tui/nmt-address-list.c \ + clients/tui/nmt-address-list.h \ + clients/tui/nmt-connect-connection-list.c \ + clients/tui/nmt-connect-connection-list.h \ + clients/tui/nmt-device-entry.c \ + clients/tui/nmt-device-entry.h \ + clients/tui/nmt-edit-connection-list.c \ + clients/tui/nmt-edit-connection-list.h \ + clients/tui/nmt-editor-grid.c \ + clients/tui/nmt-editor-grid.h \ + clients/tui/nmt-editor-page.c \ + clients/tui/nmt-editor-page.h \ + clients/tui/nmt-editor-page-device.c \ + clients/tui/nmt-editor-page-device.h \ + clients/tui/nmt-editor-section.c \ + clients/tui/nmt-editor-section.h \ + clients/tui/nmt-editor.c \ + clients/tui/nmt-editor.h \ + clients/tui/nmt-ip-entry.c \ + clients/tui/nmt-ip-entry.h \ + clients/tui/nmt-mac-entry.c \ + clients/tui/nmt-mac-entry.h \ + clients/tui/nmt-mtu-entry.c \ + clients/tui/nmt-mtu-entry.h \ + clients/tui/nmt-page-bond.c \ + clients/tui/nmt-page-bond.h \ + clients/tui/nmt-page-bridge.c \ + clients/tui/nmt-page-bridge.h \ + clients/tui/nmt-page-bridge-port.c \ + clients/tui/nmt-page-bridge-port.h \ + clients/tui/nmt-page-dsl.c \ + clients/tui/nmt-page-dsl.h \ + clients/tui/nmt-page-ethernet.c \ + clients/tui/nmt-page-ethernet.h \ + clients/tui/nmt-page-infiniband.c \ + clients/tui/nmt-page-infiniband.h \ + clients/tui/nmt-page-ip4.c \ + clients/tui/nmt-page-ip4.h \ + clients/tui/nmt-page-ip6.c \ + clients/tui/nmt-page-ip6.h \ + clients/tui/nmt-page-ppp.c \ + clients/tui/nmt-page-ppp.h \ + clients/tui/nmt-page-team.c \ + clients/tui/nmt-page-team.h \ + clients/tui/nmt-page-team-port.c \ + clients/tui/nmt-page-team-port.h \ + clients/tui/nmt-page-vlan.c \ + clients/tui/nmt-page-vlan.h \ + clients/tui/nmt-page-wifi.c \ + clients/tui/nmt-page-wifi.h \ + clients/tui/nmt-password-dialog.c \ + clients/tui/nmt-password-dialog.h \ + clients/tui/nmt-password-fields.c \ + clients/tui/nmt-password-fields.h \ + clients/tui/nmt-route-editor.c \ + clients/tui/nmt-route-editor.h \ + clients/tui/nmt-route-entry.c \ + clients/tui/nmt-route-entry.h \ + clients/tui/nmt-route-table.c \ + clients/tui/nmt-route-table.h \ + clients/tui/nmt-slave-list.c \ + clients/tui/nmt-slave-list.h \ + clients/tui/nmt-utils.c \ + clients/tui/nmt-utils.h \ + clients/tui/nmt-widget-list.c \ + clients/tui/nmt-widget-list.h \ + clients/common/nm-secret-agent-simple.c \ + clients/common/nm-secret-agent-simple.h \ + clients/common/nm-vpn-helpers.c \ + clients/common/nm-vpn-helpers.h \ + $(NULL) + +clients_tui_nmtui_CPPFLAGS = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -I$(top_srcdir)/libnm \ + -I$(top_builddir)/libnm \ + -I$(srcdir)/clients/tui/newt \ + -I$(top_srcdir)/clients/common \ + $(GLIB_CFLAGS) \ + $(NEWT_CFLAGS) \ + $(GUDEV_CFLAGS) \ + -DG_LOG_DOMAIN=\""nmtui"\" \ + -DLOCALEDIR=\""$(localedir)"\" \ + $(NULL) + +clients_tui_nmtui_LDFLAGS = \ + -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" + +clients_tui_nmtui_LDADD = \ + libnm/libnm.la \ + clients/tui/newt/libnmt-newt.a \ + $(GUDEV_LIBS) \ + $(NEWT_LIBS) \ + $(GLIB_LIBS) \ + $(NULL) + +nmtui_links = nmtui-edit nmtui-connect nmtui-hostname + +install-exec-hook-nmtui: + for link in $(nmtui_links); do \ + $(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \ + done + +install_exec_hook += install-exec-hook-nmtui + +uninstall-hook-nmtui: + for link in $(nmtui_links); do \ + rm -f "$(DESTDIR)$(bindir)/$$link"; \ + done + +uninstall_hook += uninstall-hook-nmtui + +endif + +############################################################################### +# data +############################################################################### + +data_edit = sed \ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@sbindir[@]|$(sbindir)|g' \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' \ + -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' + +if HAVE_SYSTEMD + +systemdsystemunit_DATA = \ + data/NetworkManager.service \ + data/NetworkManager-wait-online.service \ + data/NetworkManager-dispatcher.service + +data/NetworkManager.service: $(srcdir)/data/NetworkManager.service.in + $(data_edit) $< >$@ + +if HAVE_SYSTEMD_200 +data/NetworkManager-wait-online.service: $(srcdir)/data/NetworkManager-wait-online.service.in + $(data_edit) $< >$@ +else +data/NetworkManager-wait-online.service: $(srcdir)/data/NetworkManager-wait-online-systemd-pre200.service.in + $(data_edit) $< >$@ +endif + +data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in + $(data_edit) $< >$@ + +data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.NetworkManager.service.in + $(data_edit) $< >$@ + +service_DATA += data/org.freedesktop.NetworkManager.service + +install-exec-local-data: + install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants + ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants + +install_exec_local += install-exec-local-data + +endif + +examples_DATA += data/server.conf + +if WITH_UDEV_DIR +udevrulesdir = $(UDEV_DIR)/rules.d +udevrules_DATA = \ + data/84-nm-drivers.rules \ + data/85-nm-unmanaged.rules +endif + +data/server.conf: $(srcdir)/data/server.conf.in + mkdir -p data/ + $(data_edit) $< >$@ + +EXTRA_DIST += \ + data/NetworkManager.service.in \ + data/NetworkManager-wait-online.service.in \ + data/NetworkManager-wait-online-systemd-pre200.service.in \ + data/NetworkManager-dispatcher.service.in \ + data/org.freedesktop.NetworkManager.service.in \ + data/84-nm-drivers.rules \ + data/85-nm-unmanaged.rules \ + data/server.conf.in + +CLEANFILES += \ + data/NetworkManager.service \ + data/NetworkManager-wait-online.service \ + data/NetworkManager-dispatcher.service \ + data/org.freedesktop.NetworkManager.service \ + 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 = \ + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/shared \ + -I$(top_builddir)/shared \ + -DG_LOG_DOMAIN=\""libnm-util"\" \ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(UUID_CFLAGS) + +libnm_util_libnm_util_include_HEADERS = \ + 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 + +nodist_libnm_util_libnm_util_include_HEADERS = \ + libnm-util/nm-utils-enum-types.h + +libnm_util_libnm_util_la_private_headers = \ + shared/nm-utils/nm-shared-utils.h \ + 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_la_csources = \ + shared/nm-utils/nm-shared-utils.c \ + 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-enum-types.c \ + libnm-util/nm-utils.c \ + libnm-util/nm-value-transforms.c + +libnm_util_libnm_util_la_SOURCES = \ + $(libnm_util_libnm_util_la_csources) \ + $(libnm_util_libnm_util_la_private_headers) + +libnm_util_libnm_util_la_CPPFLAGS = $(libnm_util_cppflags) + + +GLIB_GENERATED += \ + libnm-util/nm-utils-enum-types.h \ + libnm-util/nm-utils-enum-types.c +nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_libnm_util_include_HEADERS)) + +libnm_util_libnm_util_la_LIBADD = \ + $(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_libnm_util_la_SOURCES += libnm-util/crypto_gnutls.c +libnm_util_libnm_util_la_LIBADD += $(GNUTLS_LIBS) +endif + +if WITH_NSS +libnm_util_cppflags += $(NSS_CFLAGS) +libnm_util_libnm_util_la_SOURCES += libnm-util/crypto_nss.c +libnm_util_libnm_util_la_LIBADD += $(NSS_LIBS) +endif + + +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 + +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$(top_srcdir)/libnm-util +libnm_util_NetworkManager_1_0_gir_LIBS = libnm-util/libnm-util.la +libnm_util_NetworkManager_1_0_gir_FILES = \ + $(libnm_util_libnm_util_include_HEADERS) \ + $(nodist_libnm_util_libnm_util_include_HEADERS) \ + $(libnm_util_libnm_util_la_csources) +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 + +############################################################################### +# libnm-util/tests +############################################################################### + +libnm_util_tests_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + -DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \ + -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" + +libnm_util_tests_ldadd = \ + libnm-util/libnm-util.la \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) + +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_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_secrets_CPPFLAGS = $(libnm_util_tests_cppflags) +libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd) + +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_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags) +libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd) + +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_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags) +libnm_util_tests_test_libnm_linking_LDADD = \ + $(top_builddir)/libnm/libnm.la \ + $(libnm_util_tests_ldadd) + +############################################################################### +# libnm-glib +############################################################################### + +libnm_glib_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ + -I$(top_srcdir)/libnm-glib \ + -I$(top_builddir)/libnm-glib \ + -DG_LOG_DOMAIN=\""libnm-glib"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ + $(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_libnminclude_HEADERS = \ + 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/nm-glib-enum-types.h + +libnm_glib_libnmvpn_HEADERS = \ + libnm-glib/nm-vpn-plugin.h \ + libnm-glib/nm-vpn-plugin-ui-interface.h \ + libnm-glib/nm-vpn-plugin-utils.h \ + libnm-glib/nm-vpn-enum-types.h + +libnm_glib_libnm_glib_la_csources = \ + 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/nm-glib-enum-types.c + +libnm_glib_libnm_glib_la_private_headers = \ + 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_libnm_glib_la_SOURCES = \ + $(libnm_glib_libnm_glib_la_csources) \ + $(libnm_glib_libnm_glib_la_private_headers) + +libnm_glib_libnm_glib_la_CPPFLAGS = \ + $(libnm_glib_cppflags) \ + $(GUDEV_CFLAGS) \ + -DNMRUNDIR=\"$(nmrundir)\" + +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 \ + $(GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(GUDEV_LIBS) + + +GLIB_GENERATED += \ + libnm-glib/nm-glib-enum-types.h \ + libnm-glib/nm-glib-enum-types.c +nm_glib_enum_types_sources = $(libnm_glib_libnminclude_HEADERS) + + +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) + + +lib_LTLIBRARIES += libnm-glib/libnm-glib-vpn.la + +libnm_glib_libnm_glib_vpn_la_SOURCES = \ + libnm-glib/nm-vpn-plugin.c \ + libnm-glib/nm-vpn-plugin-ui-interface.c \ + libnm-glib/nm-vpn-plugin-utils.c \ + libnm-glib/nm-vpn-enum-types.c +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" + + +GLIB_GENERATED += \ + libnm-glib/nm-vpn-enum-types.h \ + libnm-glib/nm-vpn-enum-types.c +nm_vpn_enum_types_sources = $(libnm_glib_libnmvpn_HEADERS) + + +libnm-glib/nm-vpn-plugin-glue.h: $(srcdir)/introspection/nm-vpn-plugin.xml + $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $< + +libnm-glib/nm-secret-agent-glue.h: $(srcdir)/introspection/nm-secret-agent.xml + $(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $< + +BUILT_SOURCES += \ + libnm-glib/nm-vpn-plugin-glue.h \ + 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 + +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 gudev-1.0 +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_libnminclude_HEADERS) \ + $(libnm_glib_libnm_glib_la_csources) +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: + $(top_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 + +############################################################################### +# libnm-glib/tests +############################################################################### + +libnm_glib_tests_cppflags = \ + -I$(top_srcdir)/shared \ + -I$(top_builddir)/shared \ + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ + -I$(top_srcdir)/libnm-glib \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ + -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) + +check_programs += \ + libnm-glib/tests/test-nm-client \ + libnm-glib/tests/test-remote-settings-client + +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_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) + +endif + +############################################################################### +# man +############################################################################### + +XSLTPROC_MAN_FLAGS = \ + --xinclude --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl + +if ENABLE_GTK_DOC + +man/%.1: man/%.xml man/common.ent + $(AM_V_GEN) xsltproc --output $@ $(XSLTPROC_MAN_FLAGS) $< + +man/%.5: man/%.xml man/common.ent + $(AM_V_GEN) xsltproc --output $@ $(XSLTPROC_MAN_FLAGS) $< + +man/%.7: man/%.xml man/common.ent + $(AM_V_GEN) xsltproc --output $@ $(XSLTPROC_MAN_FLAGS) $< + +man/%.8: man/%.xml man/common.ent + $(AM_V_GEN) xsltproc --output $@ $(XSLTPROC_MAN_FLAGS) $< + +endif + +if BUILD_SETTING_DOCS + +man/nm-settings.xml: man/nm-settings.xsl libnm/nm-setting-docs.xml + $(AM_V_GEN) xsltproc --output $@ $^ + +man/nm-settings-keyfile.xml: man/nm-settings-keyfile.xsl libnm/nm-keyfile-docs.xml + $(AM_V_GEN) xsltproc --output $@ $^ + +man/nm-settings-ifcfg-rh.xml: man/nm-settings-ifcfg-rh.xsl libnm/nm-ifcfg-rh-docs.xml + $(AM_V_GEN) xsltproc --output $@ $^ + +CLEANFILES += \ + man/nm-settings.xml \ + man/nm-settings-keyfile.xml \ + man/nm-settings-ifcfg-rh.xml + +endif + +man_pages += \ + man/nmcli.1 \ + man/nmtui.1 \ + man/nm-online.1 \ + man/NetworkManager.conf.5 \ + man/nmcli-examples.7 \ + man/NetworkManager.8 + +man_pages_autogen += \ + man/nm-settings.5 \ + man/nm-settings-keyfile.5 + +if CONFIG_PLUGIN_IFCFG_RH +man_pages_autogen += man/nm-settings-ifcfg-rh.5 +else +EXTRA_DIST += man/nm-settings-ifcfg-rh.5 +endif + +EXTRA_DIST += \ + man/nm-settings.xml \ + man/nm-settings.xsl \ + man/nm-settings-keyfile.xml \ + man/nm-settings-keyfile.xsl \ + man/nm-settings-ifcfg-rh.xml \ + man/nm-settings-ifcfg-rh.xsl \ + $(addsuffix .xml,$(basename $(man_pages))) \ + $(man_pages) \ + $(man_pages_autogen) + +if INSTALL_PREGEN_MANPAGES +install_manpages = true +else +if ENABLE_GTK_DOC +install_manpages = true +endif +endif + +install-data-hook-man: + if test -n "$(install_manpages)"; then \ + for link in $(nmtui_links); do \ + ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; \ + fi + +install_data_hook += install-data-hook-man + +uninstall-hook-man: + if test -n "$(install_manpages)"; then \ + for link in $(nmtui_links); do \ + rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ + done; \ + rm -f $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5; \ + fi + +uninstall_hook += uninstall-hook-man + +if ENABLE_GTK_DOC +man_MANS += $(man_pages) +CLEANFILES += $(man_pages) +if SETTING_DOCS_AVAILABLE +man_MANS += $(man_pages_autogen) +CLEANFILES += $(man_pages_autogen) +endif +else +if INSTALL_PREGEN_MANPAGES +man_MANS += \ + $(man_pages) \ + $(man_pages_autogen) +endif +endif + +############################################################################### +# vapi +############################################################################### + +if ENABLE_VAPIGEN + +if WITH_LEGACY_LIBRARIES +VAPIGEN_VAPIS += \ + vapi/libnm-util.vapi \ + vapi/libnm-glib.vapi +endif + +vapi/libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir vapi/libnm-util.deps vapi/NetworkManager-1.0.metadata +vapi/libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir vapi/libnm-glib.deps vapi/NMClient-1.0.metadata vapi/libnm-util.vapi + +vapi_libnm_util_vapi_METADATADIRS = $(srcdir)/vapi +vapi_libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir + +vapi_libnm_glib_vapi_METADATADIRS = $(srcdir)/vapi +vapi_libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir +vapi_libnm_glib_vapi_VAPIDIRS = $(builddir) +vapi_libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util +vapi_libnm_glib_vapi_DEPS = gio-2.0 + +vapi_DATA += \ + $(VAPIGEN_VAPIS) \ + $(VAPIGEN_VAPIS:.vapi=.deps) + +CLEANFILES += $(VAPIGEN_VAPIS) + +endif + +EXTRA_DIST += \ + vapi/NetworkManager-1.0.metadata \ + vapi/NMClient-1.0.metadata \ + vapi/libnm-util.deps \ + vapi/libnm-glib.deps + +############################################################################### + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +dbusservicedir = $(DBUS_SYS_DIR) +dbusservice_DATA += src/org.freedesktop.NetworkManager.conf + +############################################################################### + +if ENABLE_TESTS +noinst_PROGRAMS += $(check_programs) $(check_programs_norun) +noinst_LTLIBRARIES += $(check_ltlibraries) +else +check_PROGRAMS += $(check_programs) $(check_programs_norun) +check_LTLIBRARIES += $(check_ltlibraries) +endif + +TESTS += $(check_programs) + +EXTRA_DIST += \ CONTRIBUTING \ NetworkManager.pc.in \ intltool-extract.in \ @@ -105,9 +4225,26 @@ EXTRA_DIST = \ shared/nm-utils/unaligned.h \ shared/nm-version-macros.h.in \ \ + tools/check-exports.sh \ + tools/create-exports-NetworkManager.sh \ + tools/debug-helper.py \ + tools/run-nm-test.sh \ + tools/test-networkmanager-service.py \ + tools/test-sudo-wrapper.sh \ + tools/enums-to-docbook.pl \ + \ + src/settings/plugins/README \ + \ $(NULL) -CLEANFILES = \ +BUILT_SOURCES += \ + $(GLIB_GENERATED) \ + $(gir_DATA) \ + $(typelib_DATA) + +CLEANFILES += \ + $(BUILT_SOURCES) \ + \ cscope.in.out \ cscope.out \ cscope.po.out \ @@ -118,9 +4255,32 @@ CLEANFILES = \ ############################################################################### +include Makefile.examples + +############################################################################### + +check-local: $(check_local) + +dist-hook: $(dist_hook) + +############################################################################### + +install-exec-hook: $(install_exec_hook) + +install-exec-local: $(install_exec_local) + +install-data-hook: $(install_data_hook) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir) + $(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) + +uninstall-hook: $(uninstall_hook) + +############################################################################### + cscope: cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients; ############################################################################### -.PHONY: cscope +.PHONY: cscope $(check_local) $(dist_hook) diff --git a/Makefile.examples b/Makefile.examples new file mode 100644 index 0000000000..d1587c97d4 --- /dev/null +++ b/Makefile.examples @@ -0,0 +1,179 @@ +############################################################################### +# examples/C/glib +############################################################################### + +examples_C_glib_cppflags = \ + -I${top_srcdir}/shared \ + -I${top_builddir}/shared \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${top_srcdir}/libnm \ + -I${top_builddir}/libnm \ + $(GLIB_CFLAGS) \ + -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE + +examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) +examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags) + +check_programs_norun += \ + examples/C/glib/add-connection-gdbus \ + examples/C/glib/add-connection-libnm \ + examples/C/glib/get-active-connections-gdbus \ + examples/C/glib/get-ap-info-libnm \ + examples/C/glib/list-connections-gdbus \ + examples/C/glib/list-connections-libnm \ + examples/C/glib/monitor-nm-running-gdbus \ + examples/C/glib/monitor-nm-state-gdbus + +examples_C_glib_add_connection_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) +examples_C_glib_add_connection_gdbus_LDADD = \ + $(GLIB_LIBS) \ + $(UUID_LIBS) + +examples_C_glib_add_connection_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) +examples_C_glib_add_connection_libnm_LDADD = \ + libnm/libnm.la \ + $(GLIB_LIBS) + +examples_C_glib_get_active_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) +examples_C_glib_get_active_connections_gdbus_LDADD = \ + $(GLIB_LIBS) + +examples_C_glib_get_ap_info_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) +examples_C_glib_get_ap_info_libnm_LDADD = \ + libnm/libnm.la \ + $(GLIB_LIBS) + +examples_C_glib_list_connections_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) +examples_C_glib_list_connections_gdbus_LDADD = \ + $(GLIB_LIBS) + +examples_C_glib_list_connections_libnm_CPPFLAGS = $(examples_C_glib_cppflags_libnm) +examples_C_glib_list_connections_libnm_LDADD = \ + libnm/libnm.la \ + $(GLIB_LIBS) + +examples_C_glib_monitor_nm_running_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) +examples_C_glib_monitor_nm_running_gdbus_LDADD = \ + $(GLIB_LIBS) + +examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdbus) +examples_C_glib_monitor_nm_state_gdbus_LDADD = \ + $(GLIB_LIBS) + +############################################################################### +# examples/C/qt +############################################################################### + +if WITH_QT + +examples_C_qt_cppflags = \ + -I${top_srcdir}/libnm-core \ + -I${top_builddir}/libnm-core \ + -I${builddir}/examples/C/qt \ + $(DBUS_CFLAGS) \ + $(QT_CFLAGS) + +check_programs_norun += \ + examples/C/qt/add-connection-wired \ + examples/C/qt/list-connections \ + examples/C/qt/change-ipv4-addresses \ + examples/C/qt/monitor-nm-running + +examples_C_qt_add_connection_wired_SOURCES = examples/C/qt/add-connection-wired.cpp +examples_C_qt_add_connection_wired_CPPFLAGS = $(examples_C_qt_cppflags) +examples_C_qt_add_connection_wired_LDADD = \ + $(DBUS_LIBS) \ + $(QT_LIBS) + +examples_C_qt_list_connections_SOURCES = examples/C/qt/list-connections.cpp +examples_C_qt_list_connections_CPPFLAGS = $(examples_C_qt_cppflags) +examples_C_qt_list_connections_LDADD = \ + $(DBUS_LIBS) \ + $(QT_LIBS) + +examples_C_qt_change_ipv4_addresses_SOURCES = examples/C/qt/change-ipv4-addresses.cpp +examples_C_qt_change_ipv4_addresses_CPPFLAGS = $(examples_C_qt_cppflags) +examples_C_qt_change_ipv4_addresses_LDADD = \ + $(DBUS_LIBS) \ + $(QT_LIBS) + +examples_C_qt_monitor_nm_running_SOURCES = examples/C/qt/monitor-nm-running.cpp +examples_C_qt_monitor_nm_running_CPPFLAGS = $(examples_C_qt_cppflags) +examples_C_qt_monitor_nm_running_LDADD = \ + $(DBUS_LIBS) \ + $(QT_LIBS) + +examples/C/qt/monitor-nm-running.moc: examples/C/qt/monitor-nm-running.cpp + $(AM_V_GEN) $(MOC) -i $< -o $@ + +BUILT_SOURCES += \ + examples/C/qt/monitor-nm-running.moc + +endif + +EXTRA_DIST += \ + examples/C/qt/add-connection-wired.cpp \ + examples/C/qt/list-connections.cpp \ + examples/C/qt/change-ipv4-addresses.cpp \ + examples/C/qt/monitor-nm-running.cpp + +############################################################################### +# examples +############################################################################### + +EXTRA_DIST += \ + examples/dispatcher/10-ifcfg-rh-routes.sh \ + examples/dispatcher/70-wifi-wired-exclusive.sh \ + \ + examples/lua/lgi/add-connection.lua \ + examples/lua/lgi/list-connections.lua \ + examples/lua/lgi/list-devices.lua \ + examples/lua/lgi/show-wifi-networks.lua \ + examples/lua/lgi/get-basic-nm-info.lua \ + examples/lua/lgi/get-ips.lua \ + examples/lua/lgi/change-vpn-username.lua \ + examples/lua/lgi/deactivate-all.lua \ + \ + examples/python/dbus/nm-state.py \ + examples/python/dbus/add-connection.py \ + examples/python/dbus/add-connection-compat.py \ + examples/python/dbus/add-wifi-eap-connection.py \ + examples/python/dbus/add-wifi-psk-connection.py \ + examples/python/dbus/vpn.py \ + examples/python/dbus/update-secrets.py \ + examples/python/dbus/list-connections.py \ + examples/python/dbus/show-bssids.py \ + examples/python/dbus/disconnect-device.py \ + examples/python/dbus/get-active-connection-uuids.py \ + examples/python/dbus/list-devices.py \ + examples/python/dbus/update-ip4-method.py \ + examples/python/dbus/is-wwan-default.py \ + examples/python/dbus/wifi-hotspot.py \ + examples/python/dbus/create-bond.py \ + examples/python/dbus/wifi-active-ap.py\ + \ + examples/python/gi/list-connections.py \ + examples/python/gi/device-state-ip4config.py \ + examples/python/gi/firewall-zone.py \ + examples/python/gi/show-wifi-networks.py \ + examples/python/gi/get_ips.py \ + examples/python/gi/add_connection.py \ + examples/python/gi/get-active-connections.py \ + examples/python/gi/update-ip4-method.py \ + examples/python/gi/deactivate-all.py \ + examples/python/gi/README \ + \ + examples/python/python-networkmanager/README \ + \ + examples/ruby/add-connection.rb \ + examples/ruby/get-basic-nm-info.rb \ + examples/ruby/list-devices.rb \ + \ + examples/shell/nm-logging.sh \ + examples/shell/get-hostname.sh \ + examples/shell/list-devices.sh \ + examples/shell/disconnect-device.sh \ + examples/shell/active-wifi.sh \ + \ + $(NULL) diff --git a/vapi/Makefile.vapigen b/Makefile.vapigen similarity index 96% rename from vapi/Makefile.vapigen rename to Makefile.vapigen index 5163af13d3..7a2ece00a7 100644 --- a/vapi/Makefile.vapigen +++ b/Makefile.vapigen @@ -43,8 +43,6 @@ _vapigen_silent_opts = $(_vapigen_silent_opts_$(V)) _vapigen_silent_opts_ = $(_vapigen_silent_opts_$(AM_DEFAULT_VERBOSITY)) _vapigen_silent_opts_0 = --quiet -$(if $(VAPIGEN),,$(error You must define VAPIGEN)) - _vapi_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1)))) define vapigen @@ -57,7 +55,8 @@ $(1): $$($(_vapi_name)_GIR) $(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \ $(foreach _vapi_gir_dir,$(if $($(_vapi_name)_GIRDIRS),$($(_vapi_name)_GIRDIRS),$(VAPIGEN_GIRDIRS)),--girdir $(_vapi_gir_dir)) \ $(foreach _vapi_dep_name,$(if $($(_vapi_name)_DEPS),$($(_vapi_name)_DEPS),$(VAPIGEN_DEPS)),--pkg $(_vapi_dep_name)) \ - $$($(_vapi_name)_FILES) + $$($(_vapi_name)_FILES) && \ + touch $(1) endef $(foreach vapi,$(VAPIGEN_VAPIS),$(eval $(call vapigen,$(vapi)))) diff --git a/clients/Makefile.am b/clients/Makefile.am deleted file mode 100644 index 46cb1d1e01..0000000000 --- a/clients/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -SUBDIRS = cli tui - -AM_CPPFLAGS = \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm \ - -I${top_builddir}/libnm \ - $(GLIB_CFLAGS) \ - -DNMLOCALEDIR=\"$(datadir)/locale\" - -bin_PROGRAMS = nm-online - -nm_online_SOURCES = nm-online.c -nm_online_CPPFLAGS = \ - -DG_LOG_DOMAIN=\""nm-online"\" \ - $(AM_CPPFLAGS) - -nm_online_LDFLAGS = \ - -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" - -nm_online_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am deleted file mode 100644 index deb8159cb1..0000000000 --- a/clients/cli/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -if BUILD_NMCLI - -bin_PROGRAMS = \ - nmcli - -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_builddir} \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm \ - -I${top_builddir}/libnm \ - -I${top_srcdir}/clients/common \ - $(GLIB_CFLAGS) \ - -DG_LOG_DOMAIN=\""nmcli"\" \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" - -nmcli_SOURCES = \ - agent.c \ - agent.h \ - common.c \ - common.h \ - connections.c \ - connections.h \ - devices.c \ - devices.h \ - general.c \ - general.h \ - settings.c \ - settings.h \ - nmcli.c \ - nmcli.h \ - utils.c \ - utils.h \ - polkit-agent.c \ - polkit-agent.h \ - \ - $(srcdir)/../common/nm-secret-agent-simple.c \ - $(srcdir)/../common/nm-secret-agent-simple.h \ - $(srcdir)/../common/nm-vpn-helpers.c \ - $(srcdir)/../common/nm-vpn-helpers.h \ - $(NULL) - -nmcli_LDADD = \ - $(GLIB_LIBS) \ - $(READLINE_LIBS) \ - $(top_builddir)/libnm/libnm.la - -if WITH_POLKIT_AGENT -AM_CPPFLAGS += $(POLKIT_CFLAGS) -nmcli_SOURCES += $(srcdir)/../common/nm-polkit-listener.c $(srcdir)/../common/nm-polkit-listener.h -nmcli_LDADD += $(POLKIT_LIBS) -endif - -nmcli_LDFLAGS = \ - -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" - -if BUILD_SETTING_DOCS -settings-docs.c: settings-docs.xsl $(top_builddir)/libnm/nm-property-docs.xml - $(AM_V_GEN) xsltproc --output $@ $^ - -BUILT_SOURCES = settings-docs.c -CLEANFILES = settings-docs.c -endif - -EXTRA_DIST = settings-docs.c settings-docs.xsl - -completiondir = $(datadir)/bash-completion/completions - -install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(completiondir) - $(INSTALL_DATA) $(srcdir)/nmcli-completion $(DESTDIR)$(completiondir)/nmcli - -uninstall-hook: - rm -f $(DESTDIR)$(completiondir)/nmcli - -EXTRA_DIST += nmcli-completion - -endif diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am deleted file mode 100644 index 1fe2ec4515..0000000000 --- a/clients/tui/Makefile.am +++ /dev/null @@ -1,133 +0,0 @@ -if BUILD_NMTUI - -SUBDIRS = newt . - -AM_CPPFLAGS= \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/libnm \ - -I$(top_builddir)/libnm \ - -I$(srcdir)/newt \ - -I$(top_srcdir)/clients/common \ - $(GLIB_CFLAGS) \ - $(NEWT_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -DG_LOG_DOMAIN=\""nmtui"\" \ - -DLOCALEDIR=\""$(localedir)"\" \ - $(NULL) - -bin_PROGRAMS = nmtui -links = nmtui-edit nmtui-connect nmtui-hostname - -install-exec-hook: - for link in $(links); do \ - $(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \ - done - -uninstall-hook: - for link in $(links); do \ - rm -f "$(DESTDIR)$(bindir)/$$link"; \ - done - -nmtui_SOURCES = \ - nmtui.c \ - nmtui.h \ - nmtui-connect.c \ - nmtui-connect.h \ - nmtui-edit.c \ - nmtui-edit.h \ - nmtui-hostname.c \ - nmtui-hostname.h \ - \ - nm-editor-bindings.c \ - nm-editor-bindings.h \ - nm-editor-utils.c \ - nm-editor-utils.h \ - \ - nmt-address-list.c \ - nmt-address-list.h \ - nmt-connect-connection-list.c \ - nmt-connect-connection-list.h \ - nmt-device-entry.c \ - nmt-device-entry.h \ - nmt-edit-connection-list.c \ - nmt-edit-connection-list.h \ - nmt-editor-grid.c \ - nmt-editor-grid.h \ - nmt-editor-page.c \ - nmt-editor-page.h \ - nmt-editor-page-device.c \ - nmt-editor-page-device.h \ - nmt-editor-section.c \ - nmt-editor-section.h \ - nmt-editor.c \ - nmt-editor.h \ - nmt-ip-entry.c \ - nmt-ip-entry.h \ - nmt-mac-entry.c \ - nmt-mac-entry.h \ - nmt-mtu-entry.c \ - nmt-mtu-entry.h \ - nmt-page-bond.c \ - nmt-page-bond.h \ - nmt-page-bridge.c \ - nmt-page-bridge.h \ - nmt-page-bridge-port.c \ - nmt-page-bridge-port.h \ - nmt-page-dsl.c \ - nmt-page-dsl.h \ - nmt-page-ethernet.c \ - nmt-page-ethernet.h \ - nmt-page-infiniband.c \ - nmt-page-infiniband.h \ - nmt-page-ip4.c \ - nmt-page-ip4.h \ - nmt-page-ip6.c \ - nmt-page-ip6.h \ - nmt-page-ppp.c \ - nmt-page-ppp.h \ - nmt-page-team.c \ - nmt-page-team.h \ - nmt-page-team-port.c \ - nmt-page-team-port.h \ - nmt-page-vlan.c \ - nmt-page-vlan.h \ - nmt-page-wifi.c \ - nmt-page-wifi.h \ - nmt-password-dialog.c \ - nmt-password-dialog.h \ - nmt-password-fields.c \ - nmt-password-fields.h \ - nmt-route-editor.c \ - nmt-route-editor.h \ - nmt-route-entry.c \ - nmt-route-entry.h \ - nmt-route-table.c \ - nmt-route-table.h \ - nmt-slave-list.c \ - nmt-slave-list.h \ - nmt-utils.c \ - nmt-utils.h \ - nmt-widget-list.c \ - nmt-widget-list.h \ - $(srcdir)/../common/nm-secret-agent-simple.c \ - $(srcdir)/../common/nm-secret-agent-simple.h \ - $(srcdir)/../common/nm-vpn-helpers.c \ - $(srcdir)/../common/nm-vpn-helpers.h \ - $(NULL) - -nmtui_LDFLAGS = \ - -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" - -nmtui_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(builddir)/newt/libnmt-newt.a \ - $(GUDEV_LIBS) \ - $(NEWT_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) - -endif diff --git a/clients/tui/newt/Makefile.am b/clients/tui/newt/Makefile.am deleted file mode 100644 index e07f9beff6..0000000000 --- a/clients/tui/newt/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -AM_CPPFLAGS= \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""nmtui"\" \ - $(GLIB_CFLAGS) \ - $(NEWT_CFLAGS) \ - $(NULL) - -noinst_LIBRARIES = libnmt-newt.a - -libnmt_newt_a_SOURCES = \ - nmt-newt.h \ - nmt-newt-types.h \ - nmt-newt-button.c \ - nmt-newt-button.h \ - nmt-newt-button-box.c \ - nmt-newt-button-box.h \ - nmt-newt-checkbox.c \ - nmt-newt-checkbox.h \ - nmt-newt-component.c \ - nmt-newt-component.h \ - nmt-newt-container.c \ - nmt-newt-container.h \ - nmt-newt-entry.c \ - nmt-newt-entry.h \ - nmt-newt-entry-numeric.c \ - nmt-newt-entry-numeric.h \ - nmt-newt-form.c \ - nmt-newt-form.h \ - nmt-newt-grid.c \ - nmt-newt-grid.h \ - nmt-newt-hacks.c \ - nmt-newt-hacks.h \ - nmt-newt-label.c \ - nmt-newt-label.h \ - nmt-newt-listbox.c \ - nmt-newt-listbox.h \ - nmt-newt-popup.c \ - nmt-newt-popup.h \ - nmt-newt-section.c \ - nmt-newt-section.h \ - nmt-newt-separator.c \ - nmt-newt-separator.h \ - nmt-newt-stack.c \ - nmt-newt-stack.h \ - nmt-newt-textbox.c \ - nmt-newt-textbox.h \ - nmt-newt-toggle-button.c \ - nmt-newt-toggle-button.h \ - nmt-newt-utils.c \ - nmt-newt-utils.h \ - nmt-newt-widget.c \ - nmt-newt-widget.h \ - $(NULL) diff --git a/configure.ac b/configure.ac index a245d72934..32282ddb15 100644 --- a/configure.ac +++ b/configure.ac @@ -1043,6 +1043,7 @@ dnl Vala bindings dnl ------------------------- VAPIGEN_CHECK(0.17.1.24) +AC_CONFIG_COMMANDS([vapi], [$MKDIR_P vapi]) # Tests, utilities and documentation AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests (default: yes)])) @@ -1069,10 +1070,7 @@ else with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions' fi fi -AS_IF([test "$with_valgrind" != "no"], - AC_SUBST(VALGRIND_RULES, 'LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"), - AC_SUBST(VALGRIND_RULES, [])) -AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no") +AC_SUBST(NM_LOG_COMPILER, 'LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto'), GTK_DOC_CHECK(1.0) @@ -1137,66 +1135,13 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h AC_CONFIG_FILES([ Makefile shared/nm-version-macros.h -src/Makefile -src/tests/Makefile -src/tests/config/Makefile -src/dhcp-manager/Makefile -src/dhcp-manager/tests/Makefile -src/dnsmasq-manager/tests/Makefile -src/supplicant-manager/tests/Makefile -src/supplicant-manager/tests/certs/Makefile -src/ppp-manager/Makefile -src/settings/plugins/Makefile -src/settings/plugins/ifupdown/Makefile -src/settings/plugins/ifupdown/tests/Makefile -src/settings/plugins/ifnet/Makefile -src/settings/plugins/ifnet/tests/Makefile -src/settings/plugins/ifcfg-rh/Makefile -src/settings/plugins/ifcfg-rh/tests/Makefile -src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile -src/settings/plugins/ibft/Makefile -src/settings/plugins/ibft/tests/Makefile -src/settings/plugins/keyfile/Makefile -src/settings/plugins/keyfile/tests/Makefile -src/settings/plugins/keyfile/tests/keyfiles/Makefile -src/platform/Makefile -src/platform/tests/Makefile -src/rdisc/Makefile -src/rdisc/tests/Makefile -src/devices/Makefile -src/devices/tests/Makefile -src/devices/adsl/Makefile -src/devices/bluetooth/Makefile -src/devices/team/Makefile -src/devices/wifi/Makefile -src/devices/wifi/tests/Makefile -src/devices/wwan/Makefile -libnm-core/Makefile -libnm-core/tests/Makefile libnm/libnm.pc -libnm/Makefile -libnm/tests/Makefile libnm-util/libnm-util.pc -libnm-util/Makefile -libnm-util/tests/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc -libnm-glib/Makefile -libnm-glib/tests/Makefile -dispatcher/Makefile -dispatcher/tests/Makefile -tools/Makefile -clients/Makefile -clients/cli/Makefile -clients/tui/Makefile -clients/tui/newt/Makefile -introspection/Makefile -man/Makefile man/common.ent po/Makefile.in policy/org.freedesktop.NetworkManager.policy.in -data/Makefile -docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile @@ -1206,20 +1151,6 @@ docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc -examples/Makefile -examples/shell/Makefile -examples/python/Makefile -examples/python/dbus/Makefile -examples/python/gi/Makefile -examples/python/python-networkmanager/Makefile -examples/ruby/Makefile -examples/lua/Makefile -examples/lua/lgi/Makefile -examples/C/Makefile -examples/C/glib/Makefile -examples/C/qt/Makefile -examples/dispatcher/Makefile -vapi/Makefile ]) AC_CONFIG_SUBDIRS([libndp]) AC_OUTPUT diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 8b9b715969..c2e12167a6 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -487,7 +487,7 @@ cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_ %check %if %{with test} -make check +make %{?_smp_mflags} check %endif diff --git a/contrib/travis/travis-check.sh b/contrib/travis/travis-check.sh index ef70fb959e..5211c9f36a 100755 --- a/contrib/travis/travis-check.sh +++ b/contrib/travis/travis-check.sh @@ -8,7 +8,7 @@ print_test_logs() { echo ">>>> PRINT TEST LOGS $1 (done)" } -if ! make check -k ; then +if ! make check -j 4 -k ; then print_test_logs "first-test" diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index ce059fcb0f..0000000000 --- a/data/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ - -if HAVE_SYSTEMD -systemdsystemunit_DATA = \ - NetworkManager.service \ - NetworkManager-wait-online.service \ - NetworkManager-dispatcher.service - -NetworkManager.service: NetworkManager.service.in - $(edit) $< >$@ - -if HAVE_SYSTEMD_200 -NetworkManager-wait-online.service: NetworkManager-wait-online.service.in - $(edit) $< >$@ -else -NetworkManager-wait-online.service: NetworkManager-wait-online-systemd-pre200.service.in - $(edit) $< >$@ -endif - -NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in - $(edit) $< >$@ - -servicedir = $(datadir)/dbus-1/system-services -service_in_files = org.freedesktop.NetworkManager.service.in -service_DATA = $(service_in_files:.service.in=.service) - -$(service_DATA): $(service_in_files) Makefile - $(edit) $< >$@ - -install-exec-local: - install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants - ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants -endif - -examplesdir = $(docdir)/examples -examples_DATA = server.conf - -if WITH_UDEV_DIR -udevrulesdir = $(UDEV_DIR)/rules.d -udevrules_DATA = \ - 84-nm-drivers.rules \ - 85-nm-unmanaged.rules -endif - -server.conf: server.conf.in - $(edit) $< >$@ - -edit = sed \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@sbindir[@]|$(sbindir)|g' \ - -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@libexecdir[@]|$(libexecdir)|g' \ - -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' - -EXTRA_DIST = \ - NetworkManager.service.in \ - NetworkManager-wait-online.service.in \ - NetworkManager-wait-online-systemd-pre200.service.in \ - NetworkManager-dispatcher.service.in \ - org.freedesktop.NetworkManager.service.in \ - 84-nm-drivers.rules \ - 85-nm-unmanaged.rules \ - server.conf.in - -CLEANFILES = \ - NetworkManager.service \ - NetworkManager-wait-online.service \ - NetworkManager-dispatcher.service \ - org.freedesktop.NetworkManager.service \ - server.conf - diff --git a/dispatcher/Makefile.am b/dispatcher/Makefile.am deleted file mode 100644 index 1f65b47a6a..0000000000 --- a/dispatcher/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -SUBDIRS = . tests - -libexec_PROGRAMS = \ - nm-dispatcher - -noinst_LTLIBRARIES = \ - libnm-dispatcher-core.la \ - libnmdbus-dispatcher.la - -AM_CPPFLAGS = \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - $(GLIB_CFLAGS) \ - -DNETWORKMANAGER_COMPILATION \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" - -############################################################################### - -dbusservicedir = $(DBUS_SYS_DIR) -dbusservice_DATA = \ - nm-dispatcher.conf - -############################################################################### - -libnm_dispatcher_core_la_SOURCES = \ - $(top_srcdir)/shared/nm-dispatcher-api.h \ - nm-dispatcher-utils.c \ - nm-dispatcher-utils.h - -libnm_dispatcher_core_la_LIBADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) - -############################################################################### - -nm_dispatcher_SOURCES = \ - $(top_srcdir)/shared/nm-dispatcher-api.h \ - nm-dispatcher.c - -nm_dispatcher_LDFLAGS = \ - -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" - -nm_dispatcher_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - libnm-dispatcher-core.la \ - libnmdbus-dispatcher.la \ - $(GLIB_LIBS) - -############################################################################### - -nodist_libnmdbus_dispatcher_la_SOURCES = \ - nmdbus-dispatcher.c \ - nmdbus-dispatcher.h - -libnmdbus_dispatcher_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS)) - -nmdbus-dispatcher.h: nm-dispatcher.xml - $(AM_V_GEN) gdbus-codegen \ - --generate-c-code $(basename $@) \ - --c-namespace NMDBus \ - --interface-prefix org.freedesktop \ - $< - -nmdbus-dispatcher.c: nmdbus-dispatcher.h - @true - -BUILT_SOURCES = nmdbus-dispatcher.h nmdbus-dispatcher.c - -############################################################################### - -dbusactivationdir = $(datadir)/dbus-1/system-services -dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in -dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service) - -%.service: %.service.in - $(edit) $< >$@ - -edit = @sed \ - -e 's|@sbindir[@]|$(sbindir)|g' \ - -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@libexecdir[@]|$(libexecdir)|g' - -dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d -install-data-hook: - $(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 - -############################################################################### - -CLEANFILES = \ - $(BUILT_SOURCES) \ - $(dbusactivation_DATA) - -EXTRA_DIST = \ - $(dbusservice_DATA) \ - $(dbusactivation_in_files) \ - nm-dispatcher.xml - diff --git a/dispatcher/tests/Makefile.am b/dispatcher/tests/Makefile.am deleted file mode 100644 index e7e50adc03..0000000000 --- a/dispatcher/tests/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/dispatcher \ - -I$(top_builddir)/dispatcher \ - -DNETWORKMANAGER_COMPILATION \ - -DSRCDIR=\"$(abs_srcdir)\" \ - $(GLIB_CFLAGS) - -noinst_PROGRAMS = \ - test-dispatcher-envp - -############################################################################### - -test_dispatcher_envp_SOURCES = \ - test-dispatcher-envp.c - -test_dispatcher_envp_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(top_builddir)/dispatcher/libnm-dispatcher-core.la \ - $(GLIB_LIBS) - -############################################################################### - -@VALGRIND_RULES@ -TESTS = test-dispatcher-envp - -endif - -EXTRA_DIST= \ - dispatcher-connectivity-full \ - dispatcher-connectivity-unknown \ - dispatcher-down \ - dispatcher-external \ - dispatcher-up \ - dispatcher-vpn-down \ - dispatcher-vpn-up diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 52cbe5286d..0000000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS = libnm api - -if WITH_LEGACY_LIBRARIES -SUBDIRS += \ - libnm-util \ - libnm-glib -endif diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am deleted file mode 100644 index 4502e9bb78..0000000000 --- a/examples/C/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS= glib - -if WITH_QT -SUBDIRS += qt -endif diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am deleted file mode 100644 index e3d655d07b..0000000000 --- a/examples/C/glib/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm \ - -I${top_builddir}/libnm \ - $(GLIB_CFLAGS) \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE - -noinst_PROGRAMS = \ - add-connection-gdbus \ - add-connection-libnm \ - get-active-connections-gdbus \ - get-ap-info-libnm \ - list-connections-gdbus \ - list-connections-libnm \ - monitor-nm-running-gdbus \ - monitor-nm-state-gdbus - -add_connection_gdbus_SOURCES = add-connection-gdbus.c -add_connection_gdbus_LDADD = \ - $(GLIB_LIBS) \ - $(UUID_LIBS) - -add_connection_libnm_SOURCES = add-connection-libnm.c -add_connection_libnm_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) - -get_active_connections_gdbus_SOURCES = get-active-connections-gdbus.c -get_active_connections_gdbus_LDADD = \ - $(GLIB_LIBS) - -get_ap_info_libnm_SOURCES = get-ap-info-libnm.c -get_ap_info_libnm_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) - -list_connections_gdbus_SOURCES = list-connections-gdbus.c -list_connections_gdbus_LDADD = \ - $(GLIB_LIBS) - -list_connections_libnm_SOURCES = list-connections-libnm.c -list_connections_libnm_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) - -monitor_nm_running_gdbus_SOURCES = monitor-nm-running-gdbus.c -monitor_nm_running_gdbus_LDADD = \ - $(GLIB_LIBS) - -monitor_nm_state_gdbus_SOURCES = monitor-nm-state-gdbus.c -monitor_nm_state_gdbus_LDADD = \ - $(GLIB_LIBS) diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am deleted file mode 100644 index aff4c48e24..0000000000 --- a/examples/C/qt/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - $(DBUS_CFLAGS) \ - $(QT_CFLAGS) - -noinst_PROGRAMS = \ - add-connection-wired \ - list-connections \ - change-ipv4-addresses \ - monitor-nm-running - -add_connection_wired_SOURCES = add-connection-wired.cpp -add_connection_wired_LDADD = \ - $(DBUS_LIBS) \ - $(QT_LIBS) - -list_connections_SOURCES = list-connections.cpp -list_connections_LDADD = \ - $(DBUS_LIBS) \ - $(QT_LIBS) - -change_ipv4_addresses_SOURCES = change-ipv4-addresses.cpp -change_ipv4_addresses_LDADD = \ - $(DBUS_LIBS) \ - $(QT_LIBS) - -monitor_nm_running_SOURCES = monitor-nm-running.cpp -monitor_nm_running_LDADD = \ - $(DBUS_LIBS) \ - $(QT_LIBS) - -monitor-nm-running.moc: monitor-nm-running.cpp - $(AM_V_GEN) $(MOC) -i $< -o $@ - -BUILT_SOURCES = \ - monitor-nm-running.moc - -EXTRA_DIST = \ - add-connection-wired.cpp \ - list-connections.cpp \ - change-ipv4-addresses.cpp \ - monitor-nm-running.cpp - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 3521b4cecd..0000000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -SUBDIRS= \ - shell \ - python \ - ruby \ - lua \ - C \ - dispatcher diff --git a/examples/dispatcher/Makefile.am b/examples/dispatcher/Makefile.am deleted file mode 100644 index 0089d5fe7b..0000000000 --- a/examples/dispatcher/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - 10-ifcfg-rh-routes.sh \ - 70-wifi-wired-exclusive.sh - diff --git a/examples/lua/Makefile.am b/examples/lua/Makefile.am deleted file mode 100644 index bf14f68299..0000000000 --- a/examples/lua/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS= lgi - diff --git a/examples/lua/lgi/Makefile.am b/examples/lua/lgi/Makefile.am deleted file mode 100644 index ce5c8f5c90..0000000000 --- a/examples/lua/lgi/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -EXTRA_DIST = \ - add-connection.lua \ - list-connections.lua \ - list-devices.lua \ - show-wifi-networks.lua \ - get-basic-nm-info.lua \ - get-ips.lua \ - change-vpn-username.lua \ - deactivate-all.lua diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am deleted file mode 100644 index cd3ce3ed90..0000000000 --- a/examples/python/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS= dbus gi python-networkmanager - diff --git a/examples/python/dbus/Makefile.am b/examples/python/dbus/Makefile.am deleted file mode 100644 index 0a89dc5663..0000000000 --- a/examples/python/dbus/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -EXTRA_DIST = \ - nm-state.py \ - add-connection.py \ - add-connection-compat.py \ - add-wifi-eap-connection.py \ - add-wifi-psk-connection.py \ - vpn.py \ - update-secrets.py \ - list-connections.py \ - show-bssids.py \ - disconnect-device.py \ - get-active-connection-uuids.py \ - list-devices.py \ - update-ip4-method.py \ - is-wwan-default.py \ - wifi-hotspot.py \ - create-bond.py \ - wifi-active-ap.py diff --git a/examples/python/gi/Makefile.am b/examples/python/gi/Makefile.am deleted file mode 100644 index 9c69407f49..0000000000 --- a/examples/python/gi/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -EXTRA_DIST = \ - list-connections.py \ - device-state-ip4config.py \ - firewall-zone.py \ - show-wifi-networks.py \ - get_ips.py \ - add_connection.py \ - get-active-connections.py \ - update-ip4-method.py \ - deactivate-all.py \ - README diff --git a/examples/python/python-networkmanager/Makefile.am b/examples/python/python-networkmanager/Makefile.am deleted file mode 100644 index 45fe750c45..0000000000 --- a/examples/python/python-networkmanager/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ - README diff --git a/examples/ruby/Makefile.am b/examples/ruby/Makefile.am deleted file mode 100644 index 14f97ef89d..0000000000 --- a/examples/ruby/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -EXTRA_DIST = \ - add-connection.rb \ - get-basic-nm-info.rb \ - list-devices.rb diff --git a/examples/shell/Makefile.am b/examples/shell/Makefile.am deleted file mode 100644 index e4b6f6c795..0000000000 --- a/examples/shell/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_DIST = \ - nm-logging.sh \ - get-hostname.sh \ - list-devices.sh \ - disconnect-device.sh \ - active-wifi.sh diff --git a/introspection/Makefile.am b/introspection/Makefile.am deleted file mode 100644 index 27b54e5d04..0000000000 --- a/introspection/Makefile.am +++ /dev/null @@ -1,180 +0,0 @@ -noinst_LTLIBRARIES = \ - libnmdbus.la - -# gdbus-codegen 2.38 will emit code that requires glib 2.38, which -# will then cause availability warnings if we define -# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32. -# -# This is fixed in GLib 2.40 (it emits code that takes -# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go -# away when we depend on that. -AM_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) - -nodist_libnmdbus_la_SOURCES = \ - nmdbus-access-point.c \ - nmdbus-access-point.h \ - nmdbus-active-connection.c \ - nmdbus-active-connection.h \ - nmdbus-agent-manager.c \ - nmdbus-agent-manager.h \ - nmdbus-checkpoint.c \ - nmdbus-checkpoint.h \ - nmdbus-device-adsl.c \ - nmdbus-device-adsl.h \ - nmdbus-device-bond.c \ - nmdbus-device-bond.h \ - nmdbus-device-bridge.c \ - nmdbus-device-bridge.h \ - nmdbus-device-bt.c \ - nmdbus-device-bt.h \ - nmdbus-device-ethernet.c \ - nmdbus-device-ethernet.h \ - nmdbus-device.c \ - nmdbus-device.h \ - nmdbus-device-generic.c \ - nmdbus-device-generic.h \ - nmdbus-device-infiniband.c \ - nmdbus-device-infiniband.h \ - nmdbus-device-ip-tunnel.c \ - nmdbus-device-ip-tunnel.h \ - nmdbus-device-macvlan.c \ - nmdbus-device-macvlan.h \ - nmdbus-device-modem.c \ - nmdbus-device-modem.h \ - nmdbus-device-olpc-mesh.c \ - nmdbus-device-olpc-mesh.h \ - nmdbus-device-statistics.c \ - nmdbus-device-statistics.h \ - nmdbus-device-team.c \ - nmdbus-device-team.h \ - nmdbus-device-tun.c \ - nmdbus-device-tun.h \ - nmdbus-device-veth.c \ - nmdbus-device-veth.h \ - nmdbus-device-vlan.c \ - nmdbus-device-vlan.h \ - nmdbus-device-vxlan.c \ - nmdbus-device-vxlan.h \ - nmdbus-device-wifi.c \ - nmdbus-device-wifi.h \ - nmdbus-device-wimax.c \ - nmdbus-device-wimax.h \ - nmdbus-dhcp4-config.c \ - nmdbus-dhcp4-config.h \ - nmdbus-dhcp6-config.c \ - nmdbus-dhcp6-config.h \ - nmdbus-ip4-config.c \ - nmdbus-ip4-config.h \ - nmdbus-ip6-config.c \ - nmdbus-ip6-config.h \ - nmdbus-manager.c \ - nmdbus-manager.h \ - nmdbus-ppp-manager.c \ - nmdbus-ppp-manager.h \ - nmdbus-secret-agent.c \ - nmdbus-secret-agent.h \ - nmdbus-settings-connection.c \ - nmdbus-settings-connection.h \ - nmdbus-settings.c \ - nmdbus-settings.h \ - nmdbus-vpn-connection.c \ - nmdbus-vpn-connection.h \ - nmdbus-vpn-plugin.c \ - nmdbus-vpn-plugin.h - -DBUS_INTERFACE_DOCS = \ - nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ - nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ - nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \ - nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \ - nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \ - nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \ - nmdbus-manager-org.freedesktop.NetworkManager.xml \ - nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \ - nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \ - nmdbus-device-org.freedesktop.NetworkManager.Device.xml \ - nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \ - nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ - nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \ - nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \ - nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \ - nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \ - nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \ - nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \ - nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \ - nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \ - nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \ - nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ - nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \ - nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \ - nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \ - nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \ - nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \ - nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \ - nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \ - nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \ - nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \ - nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ - nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ - nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ - nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml - -define _make_nmdbus_rule -$(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1)) - $$(AM_V_GEN) gdbus-codegen \ - --generate-c-code $$(basename $$@) \ - --generate-docbook $$(basename $$@) \ - --c-namespace NMDBus \ - --interface-prefix org.freedesktop.NetworkManager \ - $$< - -$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1) - @true - -$(basename $(1)).h: $(1) - @true -endef - -$(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f))) - -BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - nm-access-point.xml \ - nm-active-connection.xml \ - nm-agent-manager.xml \ - nm-checkpoint.xml \ - nm-device-adsl.xml \ - nm-device-bond.xml \ - nm-device-bridge.xml \ - nm-device-bt.xml \ - nm-device-ethernet.xml \ - nm-device-generic.xml \ - nm-device-infiniband.xml \ - nm-device-ip-tunnel.xml \ - nm-device-macvlan.xml \ - nm-device-modem.xml \ - nm-device-olpc-mesh.xml \ - nm-device-statistics.xml \ - nm-device-team.xml \ - nm-device-tun.xml \ - nm-device-veth.xml \ - nm-device-vlan.xml \ - nm-device-vxlan.xml \ - nm-device-wifi.xml \ - nm-device-wimax.xml \ - nm-device.xml \ - nm-dhcp4-config.xml \ - nm-dhcp6-config.xml \ - nm-ip4-config.xml \ - nm-ip6-config.xml \ - nm-manager.xml \ - nm-ppp-manager.xml \ - nm-secret-agent.xml \ - nm-settings-connection.xml \ - nm-settings.xml \ - nm-vpn-connection.xml \ - nm-vpn-plugin.xml \ - nm-wimax-nsp.xml diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am deleted file mode 100644 index 695b6a3a58..0000000000 --- a/libnm-core/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -include $(GLIB_MAKEFILE) - -@GNOME_CODE_COVERAGE_RULES@ - -SUBDIRS = . tests - -AM_CPPFLAGS = \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -DG_LOG_DOMAIN=\""libnm"\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLIBDIR=\"$(nmlibdir)\" \ - -DNMPLUGINDIR=\"$(pkglibdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - $(JANSSON_CFLAGS) - -noinst_LTLIBRARIES = libnm-core.la - -# header/source defines are in Makefile.libnm-core, so they can be shared -# with libnm/Makefile.am -include Makefile.libnm-core - -libnmincludedir = $(includedir)/libnm - -libnminclude_HEADERS = $(libnm_core_headers) -libnm_core_la_SOURCES = \ - $(libnm_core_sources) \ - $(libnm_core_private_headers) - -GLIB_GENERATED = nm-core-enum-types.h nm-core-enum-types.c -nm_core_enum_types_sources = $(filter-out %nm-core-enum-types.h,$(libnminclude_HEADERS)) -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM - -libnm_core_la_LIBADD = \ - $(GLIB_LIBS) \ - $(UUID_LIBS) \ - $(JANSSON_LIBS) - -libnm_core_la_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) - -if WITH_GNUTLS -AM_CPPFLAGS += $(GNUTLS_CFLAGS) -libnm_core_la_SOURCES += crypto_gnutls.c -libnm_core_la_LIBADD += $(GNUTLS_LIBS) -endif - -if WITH_NSS -AM_CPPFLAGS += $(NSS_CFLAGS) -libnm_core_la_SOURCES += crypto_nss.c -libnm_core_la_LIBADD += $(NSS_LIBS) -endif - -nm-vpn-dbus-types.xml: nm-vpn-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl - $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $^ >$@ - -nm-dbus-types.xml: nm-dbus-interface.h $(top_srcdir)/tools/enums-to-docbook.pl - $(AM_V_GEN) @PERL@ $(top_srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $^ >$@ - -BUILT_SOURCES = $(GLIB_GENERATED) nm-vpn-dbus-types.xml nm-dbus-types.xml -CLEANFILES = $(BUILT_SOURCES) diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core deleted file mode 100644 index 72bfcae860..0000000000 --- a/libnm-core/Makefile.libnm-core +++ /dev/null @@ -1,115 +0,0 @@ -# In order for this to work correctly from both libnm-core/ and libnm/, -# we have to specify full pathnames. (We can't just use $(addprefix) from -# libnm/, because that's incompatible with the Makefile.introspection rules.) - -core = $(top_srcdir)/libnm-core -core_build = $(top_builddir)/libnm-core - -libnm_core_headers = \ - $(top_builddir)/shared/nm-version-macros.h \ - $(core_build)/nm-core-enum-types.h \ - $(core)/nm-connection.h \ - $(core)/nm-core-types.h \ - $(core)/nm-dbus-interface.h \ - $(core)/nm-errors.h \ - $(core)/nm-setting-8021x.h \ - $(core)/nm-setting-adsl.h \ - $(core)/nm-setting-bluetooth.h \ - $(core)/nm-setting-bond.h \ - $(core)/nm-setting-bridge-port.h \ - $(core)/nm-setting-bridge.h \ - $(core)/nm-setting-cdma.h \ - $(core)/nm-setting-connection.h \ - $(core)/nm-setting-dcb.h \ - $(core)/nm-setting-generic.h \ - $(core)/nm-setting-gsm.h \ - $(core)/nm-setting-infiniband.h \ - $(core)/nm-setting-ip-config.h \ - $(core)/nm-setting-ip-tunnel.h \ - $(core)/nm-setting-ip4-config.h \ - $(core)/nm-setting-ip6-config.h \ - $(core)/nm-setting-macvlan.h \ - $(core)/nm-setting-olpc-mesh.h \ - $(core)/nm-setting-ppp.h \ - $(core)/nm-setting-pppoe.h \ - $(core)/nm-setting-proxy.h \ - $(core)/nm-setting-serial.h \ - $(core)/nm-setting-team-port.h \ - $(core)/nm-setting-team.h \ - $(core)/nm-setting-tun.h \ - $(core)/nm-setting-vlan.h \ - $(core)/nm-setting-vpn.h \ - $(core)/nm-setting-vxlan.h \ - $(core)/nm-setting-wimax.h \ - $(core)/nm-setting-wired.h \ - $(core)/nm-setting-wireless-security.h \ - $(core)/nm-setting-wireless.h \ - $(core)/nm-setting.h \ - $(core)/nm-simple-connection.h \ - $(core)/nm-utils.h \ - $(core)/nm-version.h \ - $(core)/nm-vpn-dbus-interface.h \ - $(core)/nm-vpn-editor-plugin.h \ - $(core)/nm-vpn-plugin-info.h - -libnm_core_private_headers = \ - $(top_builddir)/shared/nm-utils/nm-shared-utils.h \ - $(core)/crypto.h \ - $(core)/nm-connection-private.h \ - $(core)/nm-core-internal.h \ - $(core)/nm-core-types-internal.h \ - $(core)/nm-keyfile-internal.h \ - $(core)/nm-keyfile-utils.h \ - $(core)/nm-property-compare.h \ - $(core)/nm-setting-private.h \ - $(core)/nm-utils-private.h - -libnm_core_sources = \ - $(top_builddir)/shared/nm-utils/nm-shared-utils.c \ - $(core_build)/nm-core-enum-types.c \ - $(core)/crypto.c \ - $(core)/nm-connection.c \ - $(core)/nm-dbus-utils.c \ - $(core)/nm-errors.c \ - $(core)/nm-keyfile-reader.c \ - $(core)/nm-keyfile-utils.c \ - $(core)/nm-keyfile-writer.c \ - $(core)/nm-property-compare.c \ - $(core)/nm-setting-8021x.c \ - $(core)/nm-setting-adsl.c \ - $(core)/nm-setting-bluetooth.c \ - $(core)/nm-setting-bond.c \ - $(core)/nm-setting-bridge-port.c \ - $(core)/nm-setting-bridge.c \ - $(core)/nm-setting-cdma.c \ - $(core)/nm-setting-connection.c \ - $(core)/nm-setting-dcb.c \ - $(core)/nm-setting-generic.c \ - $(core)/nm-setting-gsm.c \ - $(core)/nm-setting-infiniband.c \ - $(core)/nm-setting-ip-config.c \ - $(core)/nm-setting-ip-tunnel.c \ - $(core)/nm-setting-ip4-config.c \ - $(core)/nm-setting-ip6-config.c \ - $(core)/nm-setting-macvlan.c \ - $(core)/nm-setting-olpc-mesh.c \ - $(core)/nm-setting-ppp.c \ - $(core)/nm-setting-pppoe.c \ - $(core)/nm-setting-proxy.c \ - $(core)/nm-setting-serial.c \ - $(core)/nm-setting-team-port.c \ - $(core)/nm-setting-team.c \ - $(core)/nm-setting-tun.c \ - $(core)/nm-setting-vlan.c \ - $(core)/nm-setting-vpn.c \ - $(core)/nm-setting-vxlan.c \ - $(core)/nm-setting-wimax.c \ - $(core)/nm-setting-wired.c \ - $(core)/nm-setting-wireless-security.c \ - $(core)/nm-setting-wireless.c \ - $(core)/nm-setting.c \ - $(core)/nm-simple-connection.c \ - $(core)/nm-utils.c \ - $(core)/nm-vpn-editor-plugin.c \ - $(core)/nm-vpn-plugin-info.c - diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am deleted file mode 100644 index 485fd1410c..0000000000 --- a/libnm-core/tests/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -include $(GLIB_MAKEFILE) - -GLIB_GENERATED = nm-core-tests-enum-types.h nm-core-tests-enum-types.c -nm_core_tests_enum_types_sources = test-general-enums.h -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM - -BUILT_SOURCES = $(GLIB_GENERATED) - -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION \ - $(GLIB_CFLAGS) \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/certs\" - -noinst_PROGRAMS = \ - test-compare \ - test-crypto \ - test-general \ - test-keyfile \ - test-secrets \ - test-setting-8021x \ - test-setting-bond \ - test-setting-dcb \ - test-settings-defaults - -LDADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(GLIB_LIBS) - -@VALGRIND_RULES@ -TESTS = $(noinst_PROGRAMS) - -test_general_SOURCES = \ - test-general.c \ - test-general-enums.h \ - nm-core-tests-enum-types.c \ - nm-core-tests-enum-types.h - -endif - -# test-cert.p12 created with: -# -# openssl pkcs12 -export \ -# -in test_key_and_cert.pem \ -# -inkey test_key_and_cert.pem \ -# -certfile test_ca_cert.pem \ -# -name "test-pkcs12" \ -# -out test-cert.p12 - -EXTRA_DIST = \ - certs/ca-no-ending-newline.pem \ - certs/pkcs8-decrypted.der \ - certs/pkcs8-enc-key.pem \ - certs/pkcs8-noenc-key.pem \ - certs/test2_ca_cert.pem \ - certs/test2-cert.p12 \ - certs/test2_key_and_cert.pem \ - certs/test-aes-key.pem \ - certs/test_ca_cert.der \ - certs/test_ca_cert.pem \ - certs/test-ca-cert.pem \ - certs/test-cert.p12 \ - certs/test_key_and_cert.pem \ - certs/test-key-and-cert.pem \ - certs/test-key-only-decrypted.der \ - certs/test-key-only-decrypted.pem \ - certs/test-key-only.pem - diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am deleted file mode 100644 index 71fb7341ad..0000000000 --- a/libnm-glib/Makefile.am +++ /dev/null @@ -1,226 +0,0 @@ -include $(GLIB_MAKEFILE) - -SUBDIRS = . tests - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - -DG_LOG_DOMAIN=\""libnm-glib"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) - -BUILT_SOURCES = \ - nm-vpn-plugin-glue.h \ - nm-secret-agent-glue.h - - -noinst_LTLIBRARIES = \ - libdeprecated-nm-glib.la - -##################################################### -# Deprecated original libnm_glib bits -##################################################### - -libdeprecated_nm_glib_la_SOURCES = \ - libnm_glib.h \ - libnm_glib.c - -libdeprecated_nm_glib_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -Wno-deprecated-declarations \ - -Wno-deprecated - -libdeprecated_nm_glib_la_LIBADD = \ - $(DBUS_LIBS) \ - $(GLIB_LIBS) - -libdeprecateddir = $(includedir)/libnm-glib -libdeprecated_HEADERS = libnm_glib.h - -##################################################### -# Real libnm-glib stuff -##################################################### - -lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la - -libnm_glib_la_CFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -DNMRUNDIR=\"$(nmrundir)\" - -libnmincludedir = $(includedir)/libnm-glib -libnmvpndir = $(includedir)/libnm-glib - -libnminclude_HEADERS = \ - nm-object.h \ - nm-client.h \ - nm-device.h \ - nm-device-ethernet.h \ - nm-device-infiniband.h \ - nm-device-adsl.h \ - nm-device-wifi.h \ - nm-device-bt.h \ - nm-device-olpc-mesh.h \ - nm-device-bond.h \ - nm-device-team.h \ - nm-device-bridge.h \ - nm-device-vlan.h \ - nm-device-generic.h \ - nm-access-point.h \ - nm-ip4-config.h \ - nm-device-modem.h \ - nm-vpn-connection.h \ - nm-types.h \ - nm-active-connection.h \ - nm-dhcp4-config.h \ - nm-ip6-config.h \ - nm-dhcp6-config.h \ - nm-remote-connection.h \ - nm-remote-settings.h \ - nm-secret-agent.h \ - nm-device-wimax.h \ - nm-wimax-nsp.h \ - nm-glib-enum-types.h - -libnmvpn_HEADERS = \ - nm-vpn-plugin.h \ - nm-vpn-plugin-ui-interface.h \ - nm-vpn-plugin-utils.h \ - nm-vpn-enum-types.h - -libnm_glib_la_csources = \ - nm-object.c \ - nm-dbus-helpers.c \ - nm-client.c \ - nm-device.c \ - nm-device-ethernet.c \ - nm-device-infiniband.c \ - nm-device-adsl.c \ - nm-device-wifi.c \ - nm-device-bt.c \ - nm-device-olpc-mesh.c \ - nm-device-bond.c \ - nm-device-team.c \ - nm-device-bridge.c \ - nm-device-vlan.c \ - nm-device-generic.c \ - nm-access-point.c \ - nm-ip4-config.c \ - nm-device-modem.c \ - nm-vpn-connection.c \ - nm-types.c \ - nm-object-cache.c \ - nm-active-connection.c \ - nm-dhcp4-config.c \ - nm-ip6-config.c \ - nm-dhcp6-config.c \ - nm-remote-connection.c \ - nm-remote-settings.c \ - nm-secret-agent.c \ - nm-device-wimax.c \ - nm-wimax-nsp.c \ - nm-glib-enum-types.c - -libnm_glib_la_private_headers = \ - nm-object-private.h \ - nm-device-private.h \ - nm-types-private.h \ - nm-object-cache.h \ - nm-remote-connection-private.h \ - nm-dbus-helpers-private.h - -libnm_glib_la_SOURCES = \ - $(libnm_glib_la_csources) \ - $(libnm_glib_la_private_headers) - -GLIB_GENERATED = nm-glib-enum-types.h nm-glib-enum-types.c -nm_glib_enum_types_sources = $(libnminclude_HEADERS) -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM - -libnm_glib_la_LIBADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(builddir)/libdeprecated-nm-glib.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(GUDEV_LIBS) - -SYMBOL_VIS_FILE=$(srcdir)/libnm-glib.ver - -libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - -version-info "13:0:9" - -noinst_PROGRAMS = libnm-glib-test - -libnm_glib_test_SOURCES = libnm-glib-test.c -libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) -libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) - - -libnm_glib_vpn_la_SOURCES = \ - nm-vpn-plugin.c \ - nm-vpn-plugin-ui-interface.c \ - nm-vpn-plugin-utils.c \ - nm-vpn-enum-types.c -GLIB_GENERATED += nm-vpn-enum-types.h nm-vpn-enum-types.c -nm_vpn_enum_types_sources = $(libnmvpn_HEADERS) -libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) -libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) -libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib-vpn.ver \ - -version-info "3:0:2" - -BUILT_SOURCES += $(GLIB_GENERATED) - -##################################################### - -nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $< - -nm-secret-agent-glue.h: $(top_srcdir)/introspection/nm-secret-agent.xml - $(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $< - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnm-glib.pc libnm-glib-vpn.pc - -DISTCLEANFILES = libnm-glib.pc libnm-glib.pc - -EXTRA_DIST = libnm-glib.pc.in libnm-glib-vpn.pc.in libnm-glib.ver libnm-glib-vpn.ver - -CLEANFILES = $(BUILT_SOURCES) - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libnm-util - -# Pass SANITIZER_ENV where a command that uses built libraries is -# executed, to suppress possible errors -INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) - -if HAVE_INTROSPECTION -introspection_sources = $(libnminclude_HEADERS) $(libnm_glib_la_csources) - -NMClient-1.0.gir: libnm-glib.la -NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0 -NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0 -NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn -NMClient_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util -NMClient_1_0_gir_LIBS = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la -NMClient_1_0_gir_FILES = $(introspection_sources) -NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm --include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir -INTROSPECTION_GIRS += NMClient-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) -endif - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE) diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am deleted file mode 100644 index 3368d60cfe..0000000000 --- a/libnm-glib/tests/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - -I$(top_srcdir)/libnm-glib \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - -noinst_PROGRAMS = $(TESTS) - -if WITH_VALGRIND -@VALGRIND_RULES@ --launch-dbus -else -LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh -endif -TESTS = test-nm-client test-remote-settings-client - -####### NMClient and non-settings tests ####### - -test_nm_client_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-nm-client.c - -test_nm_client_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm-glib.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -####### remote settings client test ####### - -test_remote_settings_client_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-remote-settings-client.c - -test_remote_settings_client_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(top_builddir)/libnm-glib/libnm-glib.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -########################################### - -endif diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am deleted file mode 100644 index 2991aa93d0..0000000000 --- a/libnm-util/Makefile.am +++ /dev/null @@ -1,200 +0,0 @@ -include $(GLIB_MAKEFILE) - -SUBDIRS = . tests - -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -DG_LOG_DOMAIN=\""libnm-util"\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(UUID_CFLAGS) - -if WITH_GNUTLS -AM_CPPFLAGS += $(GNUTLS_CFLAGS) -endif - -if WITH_NSS -AM_CPPFLAGS += $(NSS_CFLAGS) -endif - -lib_LTLIBRARIES=libnm-util.la - -libnm_util_include_HEADERS = \ - $(top_builddir)/shared/nm-version-macros.h \ - NetworkManager.h \ - NetworkManagerVPN.h \ - nm-connection.h \ - nm-setting.h \ - nm-setting-8021x.h \ - nm-setting-adsl.h \ - nm-setting-bluetooth.h \ - nm-setting-bond.h \ - nm-setting-team.h \ - nm-setting-team-port.h \ - nm-setting-bridge.h \ - nm-setting-bridge-port.h \ - nm-setting-connection.h \ - nm-setting-dcb.h \ - nm-setting-infiniband.h \ - nm-setting-ip4-config.h \ - nm-setting-vlan.h \ - nm-setting-ip6-config.h \ - nm-setting-ppp.h \ - nm-setting-pppoe.h \ - nm-setting-serial.h \ - nm-setting-generic.h \ - nm-setting-gsm.h \ - nm-setting-cdma.h \ - nm-setting-olpc-mesh.h \ - nm-setting-wimax.h \ - nm-setting-wired.h \ - nm-setting-wireless.h \ - nm-setting-wireless-security.h \ - nm-setting-vpn.h \ - nm-utils.h \ - nm-version.h - -nodist_libnm_util_include_HEADERS = \ - nm-utils-enum-types.h - -libnm_util_la_private_headers = \ - $(top_builddir)/shared/nm-utils/nm-shared-utils.h \ - crypto.h \ - nm-dbus-glib-types.h \ - nm-gvaluearray-compat.h \ - nm-param-spec-specialized.h \ - nm-setting-private.h \ - nm-utils-private.h - -libnm_util_la_csources = \ - $(top_builddir)/shared/nm-utils/nm-shared-utils.c \ - crypto.c \ - nm-connection.c \ - nm-param-spec-specialized.c \ - nm-setting.c \ - nm-setting-8021x.c \ - nm-setting-adsl.c \ - nm-setting-bluetooth.c \ - nm-setting-bond.c \ - nm-setting-team.c \ - nm-setting-team-port.c \ - nm-setting-bridge.c \ - nm-setting-bridge-port.c \ - nm-setting-connection.c \ - nm-setting-dcb.c \ - nm-setting-infiniband.c \ - nm-setting-ip4-config.c \ - nm-setting-vlan.c \ - nm-setting-ip6-config.c \ - nm-setting-ppp.c \ - nm-setting-pppoe.c \ - nm-setting-serial.c \ - nm-setting-generic.c \ - nm-setting-gsm.c \ - nm-setting-cdma.c \ - nm-setting-olpc-mesh.c \ - nm-setting-wimax.c \ - nm-setting-wired.c \ - nm-setting-wireless.c \ - nm-setting-wireless-security.c \ - nm-setting-vpn.c \ - nm-utils-enum-types.c \ - nm-utils.c \ - nm-value-transforms.c - -libnm_util_la_SOURCES = \ - $(libnm_util_la_csources) \ - $(libnm_util_la_private_headers) - -GLIB_GENERATED = nm-utils-enum-types.h nm-utils-enum-types.c -BUILT_SOURCES = $(GLIB_GENERATED) -nm_utils_enum_types_sources = $(filter-out NetworkManager%,$(libnm_util_include_HEADERS)) -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM - -libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) - -SYMBOL_VIS_FILE=$(srcdir)/libnm-util.ver - -libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - -version-info "9:0:7" - -if WITH_GNUTLS -libnm_util_la_SOURCES += crypto_gnutls.c -libnm_util_la_LIBADD += $(GNUTLS_LIBS) -endif - -if WITH_NSS -libnm_util_la_SOURCES += crypto_nss.c -libnm_util_la_LIBADD += $(NSS_LIBS) -endif - -libnm_util_includedir=$(includedir)/NetworkManager - - -########################################### -# Crypto test library -########################################### - -noinst_LTLIBRARIES = libtest-crypto.la - -libtest_crypto_la_SOURCES = crypto.c - -libtest_crypto_la_LIBADD = \ - $(GLIB_LIBS) - -if WITH_GNUTLS -libtest_crypto_la_SOURCES += crypto_gnutls.c -libtest_crypto_la_LIBADD += $(GNUTLS_LIBS) -endif - -if WITH_NSS -libtest_crypto_la_SOURCES += crypto_nss.c -libtest_crypto_la_LIBADD += $(NSS_LIBS) -endif - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnm-util.pc - -DISTCLEANFILES = libnm-util.pc - -EXTRA_DIST = libnm-util.pc.in libnm-util.ver - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -# Pass SANITIZER_ENV where a command that uses built libraries is -# executed, to suppress possible errors -INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) - -if HAVE_INTROSPECTION -introspection_sources = $(libnm_util_include_HEADERS) $(nodist_libnm_util_include_HEADERS) $(libnm_util_la_csources) - -NetworkManager-1.0.gir: libnm-util.la -NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 -NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 -NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util -NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util -NetworkManager_1_0_gir_LIBS = libnm-util.la -NetworkManager_1_0_gir_FILES = $(introspection_sources) -NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm -INTROSPECTION_GIRS += NetworkManager-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES = $(gir_DATA) $(typelib_DATA) - -endif - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE) diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am deleted file mode 100644 index 1076a933e6..0000000000 --- a/libnm-util/tests/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - -DBUILD_DIR=\"$(abs_builddir)\" \ - -DTEST_CERT_DIR=\"$(abs_top_srcdir)/libnm-core/tests/certs\" - -@VALGRIND_RULES@ -TESTS = \ - test-settings-defaults \ - test-crypto \ - test-secrets \ - test-general \ - test-setting-8021x \ - test-setting-dcb - -noinst_PROGRAMS = \ - $(TESTS) \ - test-libnm-linking - -test_settings_defaults_SOURCES = \ - test-settings-defaults.c - -test_settings_defaults_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -test_crypto_SOURCES = \ - test-crypto.c - -test_crypto_LDADD = \ - $(top_builddir)/libnm-util/libtest-crypto.la \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) - -test_secrets_SOURCES = \ - test-secrets.c - -test_secrets_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -test_general_SOURCES = \ - test-general.c - -test_general_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -test_general_DEPENDENCIES = test-libnm-linking - -test_setting_8021x_SOURCES = \ - test-setting-8021x.c - -test_setting_8021x_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -test_setting_dcb_SOURCES = \ - test-setting-dcb.c - -test_setting_dcb_LDADD = \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -test_libnm_linking_SOURCES = \ - test-libnm-linking.c - -test_libnm_linking_LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(top_builddir)/libnm-util/libnm-util.la \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -endif diff --git a/libnm/Makefile.am b/libnm/Makefile.am deleted file mode 100644 index 71321e97c4..0000000000 --- a/libnm/Makefile.am +++ /dev/null @@ -1,254 +0,0 @@ -include $(GLIB_MAKEFILE) - -include $(top_srcdir)/nm.mk - -@GNOME_CODE_COVERAGE_RULES@ - -SUBDIRS = . tests - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_builddir)/introspection \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/libnm \ - -I$(top_builddir)/libnm \ - -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -DNMRUNDIR=\"$(nmrundir)\" \ - $(CODE_COVERAGE_CFLAGS) - -include $(top_srcdir)/libnm-core/Makefile.libnm-core - -# libnm - -lib_LTLIBRARIES = libnm.la - -libnmincludedir = $(includedir)/libnm - -libnminclude_hfiles = \ - $(top_builddir)/shared/nm-version-macros.h \ - NetworkManager.h \ - nm-access-point.h \ - nm-active-connection.h \ - nm-client.h \ - nm-device-adsl.h \ - nm-device-bond.h \ - nm-device-bridge.h \ - nm-device-bt.h \ - nm-device-ethernet.h \ - nm-device-generic.h \ - nm-device-infiniband.h \ - nm-device-ip-tunnel.h \ - nm-device-macvlan.h \ - nm-device-modem.h \ - nm-device-olpc-mesh.h \ - nm-device-team.h \ - nm-device-tun.h \ - nm-device-vlan.h \ - nm-device-vxlan.h \ - nm-device-wifi.h \ - nm-device-wimax.h \ - nm-device.h \ - nm-dhcp-config.h \ - nm-enum-types.h \ - nm-ip-config.h \ - nm-object.h \ - nm-remote-connection.h \ - nm-types.h \ - nm-vpn-connection.h \ - nm-vpn-editor.h \ - nm-wimax-nsp.h - -libnminclude_nointrospect_hfiles = \ - nm-secret-agent-old.h \ - nm-vpn-plugin-old.h \ - nm-vpn-service-plugin.h - -libnminclude_HEADERS = \ - $(libnminclude_hfiles) \ - $(libnminclude_nointrospect_hfiles) - -libnm_la_private_headers = \ - nm-dbus-helpers.h \ - nm-device-private.h \ - nm-dhcp4-config.h \ - nm-dhcp6-config.h \ - nm-ip4-config.h \ - nm-ip6-config.h \ - nm-manager.h \ - nm-object-cache.h \ - nm-object-private.h \ - nm-remote-connection-private.h \ - nm-remote-settings.h - -libnm_la_csources = \ - nm-access-point.c \ - nm-active-connection.c \ - nm-client.c \ - nm-dbus-helpers.c \ - nm-device-adsl.c \ - nm-device-bond.c \ - nm-device-bridge.c \ - nm-device-bt.c \ - nm-device-ethernet.c \ - nm-device-generic.c \ - nm-device-infiniband.c \ - nm-device-ip-tunnel.c \ - nm-device-macvlan.c \ - nm-device-modem.c \ - nm-device-olpc-mesh.c \ - nm-device-team.c \ - nm-device-tun.c \ - nm-device-vlan.c \ - nm-device-vxlan.c \ - nm-device-wifi.c \ - nm-device-wimax.c \ - nm-device.c \ - nm-dhcp-config.c \ - nm-dhcp4-config.c \ - nm-dhcp6-config.c \ - nm-enum-types.c \ - nm-ip-config.c \ - nm-ip4-config.c \ - nm-ip6-config.c \ - nm-manager.c \ - nm-object-cache.c \ - nm-object.c \ - nm-remote-connection.c \ - nm-remote-settings.c \ - nm-secret-agent-old.c \ - nm-vpn-connection.c \ - nm-vpn-plugin-old.c \ - nm-vpn-editor.c \ - nm-vpn-service-plugin.c \ - nm-wimax-nsp.c - -libnm_la_SOURCES = \ - $(libnm_la_csources) \ - $(libnm_la_private_headers) - -GLIB_GENERATED = nm-enum-types.h nm-enum-types.c -nm_enum_types_sources = $(libnminclude_HEADERS) -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' - -EXTRA_libnm_la_DEPENDENCIES = \ - libnm.ver - -libnm_la_LIBADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(top_builddir)/introspection/libnmdbus.la \ - $(DL_LIBS) \ - $(GLIB_LIBS) \ - $(UUID_LIBS) \ - $(GUDEV_LIBS) - -SYMBOL_VIS_FILE=$(srcdir)/libnm.ver - -libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ - $(CODE_COVERAGE_LDFLAGS) \ - -version-info "1:0:1" - -### - -BUILT_SOURCES = $(GLIB_GENERATED) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libnm.pc - -DISTCLEANFILES = libnm.pc - -EXTRA_DIST = libnm.pc.in libnm.ver - -CLEANFILES = $(BUILT_SOURCES) - --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_COMPILER_ARGS = \ - --includedir=$(top_srcdir)/libnm-core \ - --includedir=$(top_builddir)/libnm-core \ - --includedir=$(top_srcdir)/libnm \ - --includedir=$(top_builddir)/libnm - -# Pass SANITIZER_ENV where a command that uses built libraries is -# executed, to suppress possible errors -INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) - -if HAVE_INTROSPECTION -introspection_sources = \ - $(libnm_core_headers) \ - $(libnminclude_hfiles) \ - $(libnm_core_sources) \ - $(libnm_la_csources) - -NM-1.0.gir: libnm.la -NM_1_0_gir_INCLUDES = Gio-2.0 -NM_1_0_gir_PACKAGES = gio-2.0 gudev-1.0 -NM_1_0_gir_EXPORT_PACKAGES = libnm -NM_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -NM_1_0_gir_LIBS = libnm.la -NM_1_0_gir_FILES = $(introspection_sources) -NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm -INTROSPECTION_GIRS += NM-1.0.gir - -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibdir = $(libdir)/girepository-1.0 -typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) -endif - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm.so $(SYMBOL_VIS_FILE) - -if BUILD_SETTING_DOCS - -noinst_DATA = \ - nm-property-docs.xml \ - nm-setting-docs-overrides.xml \ - nm-setting-docs.xml \ - nm-keyfile-docs.xml \ - nm-ifcfg-rh-docs.xml - -docs_sources = $(filter-out %/nm-core-enum-types.c,$(libnm_core_sources)) - -nm-setting-docs-overrides.xml: generate-plugin-docs.pl $(docs_sources) - $(srcdir)/generate-plugin-docs.pl dbus $(top_srcdir)/libnm-core $@ - -# When the python scripts loads libnm and the address sanitizers is -# enabled, we must LD_PRELOAD libasan otherwise it will complain that -# it was not loaded as initial library. -nm-property-docs.xml: generate-setting-docs.py $(docs_sources) | NM-1.0.gir NM-1.0.typelib libnm.la - export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ - export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ - $(call set_sanitizer_env,$(abs_builddir)/.libs/libnm.so); \ - $(srcdir)/generate-setting-docs.py \ - --gir $(builddir)/NM-1.0.gir \ - --output $@ - -nm-setting-docs.xml: generate-setting-docs.py $(docs_sources) nm-setting-docs-overrides.xml | NM-1.0.gir NM-1.0.typelib libnm.la - export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ - export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ - $(call set_sanitizer_env,$(abs_builddir)/.libs/libnm.so); \ - $(srcdir)/generate-setting-docs.py \ - --gir $(builddir)/NM-1.0.gir \ - --overrides $(builddir)/nm-setting-docs-overrides.xml \ - --output $@ - -nm-keyfile-docs.xml: generate-plugin-docs.pl $(docs_sources) - $(srcdir)/generate-plugin-docs.pl keyfile $(top_srcdir)/libnm-core $@ -nm-ifcfg-rh-docs.xml: generate-plugin-docs.pl $(docs_sources) - $(srcdir)/generate-plugin-docs.pl ifcfg-rh $(top_srcdir)/libnm-core $@ - -CLEANFILES += $(noinst_DATA) -EXTRA_DIST += $(noinst_DATA) - -endif - -EXTRA_DIST += generate-setting-docs.py generate-plugin-docs.pl diff --git a/libnm/generate-plugin-docs.pl b/libnm/generate-plugin-docs.pl index 35cfdfc6ac..8c4a39da67 100755 --- a/libnm/generate-plugin-docs.pl +++ b/libnm/generate-plugin-docs.pl @@ -60,12 +60,12 @@ my $start_tag = "---$plugin---\\s*\$"; my $end_tag = '---end---'; # get source files to scan for documentation comments (nm-setting-.c) -my $file = "$srcdir/Makefile.libnm-core"; +my $file = "$srcdir/Makefile.am"; open my $fh, '<', $file or die "Can't open $file: $!"; while (my $line = <$fh>) { - chomp $line; - my @strings = $line =~ /\/(nm-setting-[^.]*\.c)(?:\s|$)/g; - push @source_files, @strings + if ($line =~ /^\t*(libnm-core\/nm-setting-[^.]*\.c)( \\)?$/g) { + push @source_files, $1; + } } close $fh; diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am deleted file mode 100644 index 1c65f72340..0000000000 --- a/libnm/tests/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm \ - -I$(top_builddir)/libnm \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ - $(GLIB_CFLAGS) - -LDADD = \ - $(top_builddir)/libnm/libnm.la \ - $(GLIB_LIBS) - -noinst_PROGRAMS = $(TESTS) - -if WITH_VALGRIND -@VALGRIND_RULES@ --launch-dbus -else -LOG_COMPILER = $(top_srcdir)/tools/run-test-dbus-session.sh -endif -TESTS = test-nm-client test-remote-settings-client test-secret-agent - -test_nm_client_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-nm-client.c - -test_remote_settings_client_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-remote-settings-client.c - -test_secret_agent_SOURCES = \ - $(top_builddir)/shared/nm-test-utils-impl.c \ - $(top_builddir)/shared/nm-test-libnm-utils.h \ - test-secret-agent.c -endif - -############################################################################### - -noinst_LTLIBRARIES = \ - libnm-vpn-plugin-utils-test.la - -libnm_vpn_plugin_utils_test_la_SOURCES = \ - $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.c \ - $(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.h \ - $(NULL) - -libnm_vpn_plugin_utils_test_la_CFLAGS = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_srcdir)/libnm \ - $(NULL) - -libnm_vpn_plugin_utils_test_la_LIBADD = \ - $(GLIB_LIBS) \ - $(NULL) - -############################################################################### - diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 9338edbbe0..0000000000 --- a/man/Makefile.am +++ /dev/null @@ -1,126 +0,0 @@ -man_MANS = -CLEANFILES = -EXTRA_DIST = - -XSLTPROC = xsltproc - -XSLTPROC_FLAGS = --xinclude --nonet - -XSLTPROC_MAN_FLAGS = \ - $(XSLTPROC_FLAGS) \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl - -if ENABLE_GTK_DOC - -%.1: %.xml common.ent - $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< - -%.5: %.xml common.ent - $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< - -%.7: %.xml common.ent - $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< - -%.8: %.xml common.ent - $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< - -endif - -if BUILD_SETTING_DOCS - -nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml - $(AM_V_GEN) xsltproc --output $@ $^ - -nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm/nm-keyfile-docs.xml - $(AM_V_GEN) xsltproc --output $@ $^ - -nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm/nm-ifcfg-rh-docs.xml - $(AM_V_GEN) xsltproc --output $@ $^ - -CLEANFILES += \ - nm-settings.xml \ - nm-settings-keyfile.xml \ - nm-settings-ifcfg-rh.xml - -endif - -man_pages = \ - nmcli.1 \ - nmtui.1 \ - nm-online.1 \ - NetworkManager.conf.5 \ - nmcli-examples.7 \ - NetworkManager.8 - -autogenerated_man_pages = \ - nm-settings.5 \ - nm-settings-keyfile.5 - -if CONFIG_PLUGIN_IFCFG_RH -autogenerated_man_pages += nm-settings-ifcfg-rh.5 -else -EXTRA_DIST += nm-settings-ifcfg-rh.5 -endif - -EXTRA_DIST += \ - nm-settings.xml \ - nm-settings.xsl \ - nm-settings-keyfile.xml \ - nm-settings-keyfile.xsl \ - nm-settings-ifcfg-rh.xml \ - nm-settings-ifcfg-rh.xsl \ - $(addsuffix .xml,$(basename $(man_pages))) \ - $(man_pages) \ - $(autogenerated_man_pages) - -nmtui_links = nmtui-edit nmtui-connect nmtui-hostname -NetworkManager_conf_links = nm-system-settings.conf - -# Implement a || condition -if INSTALL_PREGEN_MANPAGES -install_manpages = true -else -if ENABLE_GTK_DOC -install_manpages = true -endif -endif - -install-data-hook: - if test -n "$(install_manpages)"; then \ - for link in $(nmtui_links); do \ - ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \ - done; \ - for link in $(NetworkManager_conf_links); do \ - ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/$$link.5; \ - done; \ - fi - -uninstall-hook: - if test -n "$(install_manpages)"; then \ - for link in $(nmtui_links); do \ - rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \ - done; \ - for link in $(NetworkManager_conf_links); do \ - rm -f $(DESTDIR)$(mandir)/man5/$$link.5; \ - done; \ - fi - -if ENABLE_GTK_DOC -man_MANS += $(man_pages) -CLEANFILES += $(man_pages) -if SETTING_DOCS_AVAILABLE -man_MANS += $(autogenerated_man_pages) -CLEANFILES += $(autogenerated_man_pages) -endif -else -if INSTALL_PREGEN_MANPAGES -man_MANS += \ - $(man_pages) \ - $(autogenerated_man_pages) -endif -endif diff --git a/nm.mk b/nm.mk deleted file mode 100644 index 23f5a647cc..0000000000 --- a/nm.mk +++ /dev/null @@ -1,11 +0,0 @@ -# NetworkManager Makefile helpers - -set_sanitizer_env = \ - [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ - if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \ - export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ - fi - -check_so_symbols = \ - $(call set_sanitizer_env,$(1)); \ - LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(top_builddir)/src/NetworkManager --version >/dev/null diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 0aeb35109e..0000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,637 +0,0 @@ -include $(GLIB_MAKEFILE) - -@GNOME_CODE_COVERAGE_RULES@ - -SUBDIRS = \ - . \ - dhcp-manager \ - ppp-manager \ - settings/plugins \ - devices/adsl - -if WITH_MODEM_MANAGER_1 -SUBDIRS += devices/wwan devices/bluetooth -endif - -if WITH_WIFI -SUBDIRS += devices/wifi -endif - -if WITH_TEAMDCTL -SUBDIRS += devices/team -endif - -if ENABLE_TESTS -SUBDIRS += \ - dhcp-manager/tests \ - dnsmasq-manager/tests \ - platform \ - devices \ - rdisc \ - supplicant-manager/tests \ - tests -endif - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_builddir)/introspection \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - \ - $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d) \ - \ - -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -DRUNSTATEDIR=\"$(runstatedir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DRUNDIR=\"$(rundir)\" \ - \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLOCALEDIR=\"$(datadir)/locale\" \ - -DNMPLUGINDIR=\"$(pkglibdir)\" \ - -DNMRUNDIR=\"$(nmrundir)\" \ - -DNMSTATEDIR=\"$(nmstatedir)\" \ - -DNMLIBDIR=\"$(nmlibdir)\" \ - \ - -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ - -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ - -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ - \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(LIBNDP_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(LIBAUDIT_CFLAGS) \ - $(SYSTEMD_LOGIN_CFLAGS) \ - $(SYSTEMD_JOURNAL_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - \ - $(NULL) - -AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - -sbin_PROGRAMS = \ - NetworkManager - -libexec_PROGRAMS = \ - nm-iface-helper - -noinst_LTLIBRARIES = \ - libNetworkManagerBase.la \ - libNetworkManager.la \ - libNetworkManagerTest.la \ - libsystemd-nm.la - -############################################################################### - -libsystemd_nm_la_SOURCES = \ - systemd/nm-sd.c \ - systemd/nm-sd.h \ - systemd/sd-adapt/nm-sd-adapt.c \ - systemd/sd-adapt/nm-sd-adapt.h \ - systemd/sd-adapt/build.h \ - systemd/sd-adapt/cgroup-util.h \ - systemd/sd-adapt/condition.h \ - systemd/sd-adapt/conf-parser.h \ - systemd/sd-adapt/def.h \ - systemd/sd-adapt/dirent-util.h \ - systemd/sd-adapt/formats-util.h \ - systemd/sd-adapt/gunicode.h \ - systemd/sd-adapt/libudev.h \ - systemd/sd-adapt/missing.h \ - systemd/sd-adapt/mkdir.h \ - systemd/sd-adapt/process-util.h \ - systemd/sd-adapt/sd-daemon.h \ - systemd/sd-adapt/stat-util.h \ - systemd/sd-adapt/udev-util.h \ - systemd/sd-adapt/udev.h \ - systemd/sd-adapt/user-util.h \ - systemd/sd-adapt/virt.h \ - systemd/src/basic/alloc-util.c \ - systemd/src/basic/alloc-util.h \ - systemd/src/basic/async.h \ - systemd/src/basic/escape.c \ - systemd/src/basic/escape.h \ - systemd/src/basic/ether-addr-util.c \ - systemd/src/basic/ether-addr-util.h \ - systemd/src/basic/extract-word.c \ - systemd/src/basic/extract-word.h \ - systemd/src/basic/fd-util.c \ - systemd/src/basic/fd-util.h \ - systemd/src/basic/fileio.c \ - systemd/src/basic/fileio.h \ - systemd/src/basic/fs-util.c \ - systemd/src/basic/fs-util.h \ - systemd/src/basic/hash-funcs.c \ - systemd/src/basic/hash-funcs.h \ - systemd/src/basic/hashmap.c \ - systemd/src/basic/hashmap.h \ - systemd/src/basic/hexdecoct.c \ - systemd/src/basic/hexdecoct.h \ - systemd/src/basic/hostname-util.c \ - systemd/src/basic/hostname-util.h \ - systemd/src/basic/in-addr-util.c \ - systemd/src/basic/in-addr-util.h \ - systemd/src/basic/io-util.c \ - systemd/src/basic/io-util.h \ - systemd/src/basic/list.h \ - systemd/src/basic/log.h \ - systemd/src/basic/macro.h \ - systemd/src/basic/mempool.c \ - systemd/src/basic/mempool.h \ - systemd/src/basic/parse-util.c \ - systemd/src/basic/parse-util.h \ - systemd/src/basic/path-util.c \ - systemd/src/basic/path-util.h \ - systemd/src/basic/prioq.c \ - systemd/src/basic/prioq.h \ - systemd/src/basic/random-util.c \ - systemd/src/basic/random-util.h \ - systemd/src/basic/refcnt.h \ - systemd/src/basic/set.h \ - systemd/src/basic/signal-util.h \ - systemd/src/basic/siphash24.c \ - systemd/src/basic/siphash24.h \ - systemd/src/basic/socket-util.c \ - systemd/src/basic/socket-util.h \ - systemd/src/basic/sparse-endian.h \ - systemd/src/basic/stdio-util.h \ - systemd/src/basic/string-table.c \ - systemd/src/basic/string-table.h \ - systemd/src/basic/string-util.c \ - systemd/src/basic/string-util.h \ - systemd/src/basic/strv.c \ - systemd/src/basic/strv.h \ - systemd/src/basic/time-util.c \ - systemd/src/basic/time-util.h \ - systemd/src/basic/umask-util.h \ - systemd/src/basic/unaligned.h \ - systemd/src/basic/utf8.c \ - systemd/src/basic/utf8.h \ - systemd/src/basic/util.c \ - systemd/src/basic/util.h \ - systemd/src/libsystemd-network/arp-util.c \ - systemd/src/libsystemd-network/arp-util.h \ - systemd/src/libsystemd-network/dhcp-identifier.c \ - systemd/src/libsystemd-network/dhcp-identifier.h \ - systemd/src/libsystemd-network/dhcp-internal.h \ - systemd/src/libsystemd-network/dhcp-lease-internal.h \ - systemd/src/libsystemd-network/dhcp-network.c \ - systemd/src/libsystemd-network/dhcp-option.c \ - systemd/src/libsystemd-network/dhcp-packet.c \ - systemd/src/libsystemd-network/dhcp-protocol.h \ - systemd/src/libsystemd-network/dhcp6-internal.h \ - systemd/src/libsystemd-network/dhcp6-lease-internal.h \ - systemd/src/libsystemd-network/dhcp6-network.c \ - systemd/src/libsystemd-network/dhcp6-option.c \ - systemd/src/libsystemd-network/dhcp6-protocol.h \ - systemd/src/libsystemd-network/lldp-internal.h \ - systemd/src/libsystemd-network/lldp-neighbor.c \ - systemd/src/libsystemd-network/lldp-neighbor.h \ - systemd/src/libsystemd-network/lldp-network.c \ - systemd/src/libsystemd-network/lldp-network.h \ - systemd/src/libsystemd-network/network-internal.c \ - systemd/src/libsystemd-network/network-internal.h \ - systemd/src/libsystemd-network/sd-dhcp-client.c \ - systemd/src/libsystemd-network/sd-dhcp-lease.c \ - systemd/src/libsystemd-network/sd-dhcp6-client.c \ - systemd/src/libsystemd-network/sd-dhcp6-lease.c \ - systemd/src/libsystemd-network/sd-ipv4acd.c \ - systemd/src/libsystemd-network/sd-ipv4ll.c \ - systemd/src/libsystemd-network/sd-lldp.c \ - systemd/src/libsystemd/sd-event/sd-event.c \ - systemd/src/libsystemd/sd-id128/id128-util.c \ - systemd/src/libsystemd/sd-id128/id128-util.h \ - systemd/src/libsystemd/sd-id128/sd-id128.c \ - systemd/src/shared/dns-domain.c \ - systemd/src/shared/dns-domain.h \ - systemd/src/systemd/_sd-common.h \ - systemd/src/systemd/sd-dhcp-client.h \ - systemd/src/systemd/sd-dhcp-lease.h \ - systemd/src/systemd/sd-dhcp6-client.h \ - systemd/src/systemd/sd-dhcp6-lease.h \ - systemd/src/systemd/sd-event.h \ - systemd/src/systemd/sd-id128.h \ - systemd/src/systemd/sd-ipv4acd.h \ - systemd/src/systemd/sd-ipv4ll.h \ - systemd/src/systemd/sd-lldp.h \ - systemd/src/systemd/sd-ndisc.h - -libsystemd_nm_la_CPPFLAGS = \ - -I$(top_srcdir)/shared/ \ - -I$(top_builddir)/shared/ \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/systemd/sd-adapt/ \ - -I$(top_srcdir)/src/systemd/src/systemd/ \ - -I$(top_srcdir)/src/systemd/src/basic/ \ - -I$(top_srcdir)/src/systemd/src/shared/ \ - -I$(top_srcdir)/src/systemd/src/libsystemd-network/ \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ - $(GLIB_CFLAGS) - -libsystemd_nm_la_LIBADD = \ - $(GLIB_LIBS) - -############################################################################### - -libNetworkManagerBase_la_SOURCES = \ - nm-core-utils.c \ - nm-core-utils.h \ - nm-logging.c \ - nm-logging.h - -libNetworkManagerBase_la_LIBADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(GLIB_LIBS) \ - $(SYSTEMD_JOURNAL_LIBS) \ - $(NULL) - -############################################################################### - -libNetworkManager_la_SOURCES = \ - \ - nm-checkpoint-manager.c \ - nm-checkpoint-manager.h \ - nm-checkpoint.c \ - nm-checkpoint.h \ - \ - devices/nm-device.c \ - devices/nm-device.h \ - devices/nm-lldp-listener.c \ - devices/nm-lldp-listener.h \ - devices/nm-arping-manager.c \ - devices/nm-arping-manager.h \ - devices/nm-device-ethernet-utils.c \ - devices/nm-device-ethernet-utils.h \ - devices/nm-device-factory.c \ - devices/nm-device-factory.h \ - devices/nm-device-generic.c \ - devices/nm-device-generic.h \ - devices/nm-device-logging.h \ - devices/nm-device-private.h \ - \ - devices/nm-device-bond.c \ - devices/nm-device-bond.h \ - devices/nm-device-bridge.c \ - devices/nm-device-bridge.h \ - devices/nm-device-ethernet.c \ - devices/nm-device-ethernet.h \ - devices/nm-device-infiniband.c \ - devices/nm-device-infiniband.h \ - devices/nm-device-ip-tunnel.c \ - devices/nm-device-ip-tunnel.h \ - devices/nm-device-macvlan.c \ - devices/nm-device-macvlan.h \ - devices/nm-device-tun.c \ - devices/nm-device-tun.h \ - devices/nm-device-veth.c \ - devices/nm-device-veth.h \ - devices/nm-device-vlan.c \ - devices/nm-device-vlan.h \ - devices/nm-device-vxlan.c \ - devices/nm-device-vxlan.h \ - \ - dhcp-manager/nm-dhcp-client.c \ - dhcp-manager/nm-dhcp-client.h \ - dhcp-manager/nm-dhcp-client-logging.h \ - dhcp-manager/nm-dhcp-utils.c \ - dhcp-manager/nm-dhcp-manager.c \ - dhcp-manager/nm-dhcp-manager.h \ - dhcp-manager/nm-dhcp-utils.h \ - dhcp-manager/nm-dhcp-dhclient.c \ - dhcp-manager/nm-dhcp-dhcpcd.c \ - dhcp-manager/nm-dhcp-systemd.c \ - dhcp-manager/nm-dhcp-helper-api.h \ - dhcp-manager/nm-dhcp-listener.c \ - dhcp-manager/nm-dhcp-listener.h \ - dhcp-manager/nm-dhcp-dhclient-utils.c \ - dhcp-manager/nm-dhcp-dhclient-utils.h \ - \ - dns-manager/nm-dns-dnsmasq.c \ - dns-manager/nm-dns-dnsmasq.h \ - dns-manager/nm-dns-systemd-resolved.c \ - dns-manager/nm-dns-systemd-resolved.h \ - dns-manager/nm-dns-unbound.c \ - dns-manager/nm-dns-unbound.h \ - dns-manager/nm-dns-manager.c \ - dns-manager/nm-dns-manager.h \ - dns-manager/nm-dns-plugin.c \ - dns-manager/nm-dns-plugin.h \ - \ - dnsmasq-manager/nm-dnsmasq-manager.c \ - dnsmasq-manager/nm-dnsmasq-manager.h \ - dnsmasq-manager/nm-dnsmasq-utils.c \ - dnsmasq-manager/nm-dnsmasq-utils.h \ - \ - platform/nmp-netns.c \ - platform/nmp-netns.h \ - platform/nmp-object.c \ - platform/nmp-object.h \ - platform/nm-platform-utils.c \ - platform/nm-platform-utils.h \ - platform/nm-platform.c \ - platform/nm-platform.h \ - platform/nm-linux-platform.c \ - platform/nm-linux-platform.h \ - platform/wifi/wifi-utils-nl80211.c \ - platform/wifi/wifi-utils-nl80211.h \ - platform/wifi/wifi-utils-private.h \ - platform/wifi/wifi-utils.c \ - platform/wifi/wifi-utils.h \ - \ - rdisc/nm-lndp-rdisc.c \ - rdisc/nm-lndp-rdisc.h \ - rdisc/nm-rdisc.c \ - rdisc/nm-rdisc.h \ - rdisc/nm-rdisc-private.h \ - \ - ppp-manager/nm-ppp-manager.c \ - ppp-manager/nm-ppp-manager.h \ - ppp-manager/nm-ppp-status.h \ - \ - settings/nm-agent-manager.c \ - settings/nm-agent-manager.h \ - settings/nm-inotify-helper.c \ - settings/nm-inotify-helper.h \ - settings/nm-secret-agent.c \ - settings/nm-secret-agent.h \ - settings/nm-settings-connection.c \ - settings/nm-settings-connection.h \ - settings/nm-settings-plugin.c \ - settings/nm-settings-plugin.h \ - settings/nm-settings.c \ - settings/nm-settings.h \ - \ - settings/plugins/keyfile/nms-keyfile-connection.c \ - settings/plugins/keyfile/nms-keyfile-connection.h \ - settings/plugins/keyfile/nms-keyfile-plugin.c \ - settings/plugins/keyfile/nms-keyfile-plugin.h \ - settings/plugins/keyfile/nms-keyfile-reader.c \ - settings/plugins/keyfile/nms-keyfile-reader.h \ - settings/plugins/keyfile/nms-keyfile-utils.c \ - settings/plugins/keyfile/nms-keyfile-utils.h \ - settings/plugins/keyfile/nms-keyfile-writer.c \ - settings/plugins/keyfile/nms-keyfile-writer.h \ - \ - supplicant-manager/nm-supplicant-config.c \ - supplicant-manager/nm-supplicant-config.h \ - supplicant-manager/nm-supplicant-interface.c \ - supplicant-manager/nm-supplicant-interface.h \ - supplicant-manager/nm-supplicant-manager.c \ - supplicant-manager/nm-supplicant-manager.h \ - supplicant-manager/nm-supplicant-settings-verify.c \ - supplicant-manager/nm-supplicant-settings-verify.h \ - supplicant-manager/nm-supplicant-types.h \ - \ - vpn-manager/nm-vpn-connection.c \ - vpn-manager/nm-vpn-connection.h \ - vpn-manager/nm-vpn-manager.c \ - vpn-manager/nm-vpn-manager.h \ - \ - nm-act-request.c \ - nm-act-request.h \ - nm-active-connection.c \ - nm-active-connection.h \ - nm-audit-manager.c \ - nm-audit-manager.h \ - nm-bus-manager.c \ - nm-bus-manager.h \ - nm-config.c \ - nm-config.h \ - nm-config-data.c \ - nm-config-data.h \ - nm-connectivity.c \ - nm-connectivity.h \ - nm-dcb.c \ - nm-dcb.h \ - nm-route-manager.c \ - nm-route-manager.h \ - nm-default-route-manager.c \ - nm-default-route-manager.h \ - nm-dhcp4-config.c \ - nm-dhcp4-config.h \ - nm-dhcp6-config.c \ - nm-dhcp6-config.h \ - nm-dispatcher.c \ - nm-dispatcher.h \ - nm-enum-types.c \ - nm-enum-types.h \ - nm-exported-object.c \ - nm-exported-object.h \ - nm-firewall-manager.c \ - nm-firewall-manager.h \ - nm-proxy-config.c \ - nm-proxy-config.h \ - nm-ip4-config.c \ - nm-ip4-config.h \ - nm-ip6-config.c \ - nm-ip6-config.h \ - nm-auth-manager.c \ - nm-auth-manager.h \ - nm-auth-subject.c \ - nm-auth-subject.h \ - nm-auth-utils.c \ - nm-auth-utils.h \ - nm-manager.c \ - nm-manager.h \ - nm-multi-index.c \ - nm-multi-index.h \ - nm-pacrunner-manager.c \ - nm-pacrunner-manager.h \ - nm-policy.c \ - nm-policy.h \ - nm-rfkill-manager.c \ - nm-rfkill-manager.h \ - nm-session-monitor.h \ - nm-session-monitor.c \ - nm-sleep-monitor.c \ - nm-sleep-monitor.h \ - nm-types.h \ - NetworkManagerUtils.c \ - NetworkManagerUtils.h \ - $(NULL) - -if WITH_WEXT -libNetworkManager_la_SOURCES += \ - platform/wifi/wifi-utils-wext.c \ - platform/wifi/wifi-utils-wext.h -endif - - -libNetworkManager_la_LIBADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(top_builddir)/introspection/libnmdbus.la \ - libNetworkManagerBase.la \ - libsystemd-nm.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ - $(LIBNL_LIBS) \ - $(SYSTEMD_LOGIN_LIBS) \ - $(LIBNDP_LIBS) \ - $(DL_LIBS) \ - $(LIBM) \ - $(SELINUX_LIBS) \ - $(LIBAUDIT_LIBS) - -if WITH_LIBSOUP -libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) -endif - -############################################################################### - -libNetworkManagerTest_la_SOURCES = \ - rdisc/nm-fake-rdisc.c \ - rdisc/nm-fake-rdisc.h \ - platform/nm-fake-platform.c \ - platform/nm-fake-platform.h - -libNetworkManagerTest_la_LIBADD = \ - libNetworkManager.la - -############################################################################### - -EXTRA_NetworkManager_DEPENDENCIES = \ - NetworkManager.ver - -NetworkManager_SOURCES = \ - main-utils.c \ - main-utils.h \ - main.c - -NetworkManager_LDADD = \ - libNetworkManager.la - -NetworkManager_LDFLAGS = \ - -rdynamic \ - -Wl,--version-script="$(srcdir)/NetworkManager.ver" - -############################################################################### - -nm_iface_helper_CFLAGS = \ - -DNM_DHCP_INTERNAL_ONLY - -nm_iface_helper_SOURCES = \ - \ - dhcp-manager/nm-dhcp-client.c \ - dhcp-manager/nm-dhcp-client.h \ - dhcp-manager/nm-dhcp-client-logging.h \ - dhcp-manager/nm-dhcp-utils.c \ - dhcp-manager/nm-dhcp-utils.h \ - dhcp-manager/nm-dhcp-manager.c \ - dhcp-manager/nm-dhcp-manager.h \ - dhcp-manager/nm-dhcp-systemd.c \ - \ - platform/nmp-netns.c \ - platform/nmp-netns.h \ - platform/nmp-object.c \ - platform/nmp-object.h \ - platform/nm-platform-utils.c \ - platform/nm-platform-utils.h \ - platform/nm-platform.c \ - platform/nm-platform.h \ - platform/nm-linux-platform.c \ - platform/nm-linux-platform.h \ - platform/wifi/wifi-utils-nl80211.c \ - platform/wifi/wifi-utils-nl80211.h \ - platform/wifi/wifi-utils-private.h \ - platform/wifi/wifi-utils.c \ - platform/wifi/wifi-utils.h \ - \ - nm-pacrunner-manager.c \ - nm-pacrunner-manager.h \ - \ - rdisc/nm-lndp-rdisc.c \ - rdisc/nm-lndp-rdisc.h \ - rdisc/nm-rdisc.c \ - rdisc/nm-rdisc.h \ - \ - nm-route-manager.c \ - nm-route-manager.h \ - \ - nm-exported-object.c \ - nm-exported-object.h \ - nm-proxy-config.c \ - nm-proxy-config.h \ - nm-ip4-config.c \ - nm-ip4-config.h \ - nm-ip6-config.c \ - nm-ip6-config.h \ - \ - nm-enum-types.c \ - nm-enum-types.h \ - nm-multi-index.c \ - nm-multi-index.h \ - NetworkManagerUtils.c \ - NetworkManagerUtils.h \ - \ - nm-iface-helper.c \ - main-utils.c \ - main-utils.h - -if WITH_WEXT -nm_iface_helper_SOURCES += \ - platform/wifi/wifi-utils-wext.c \ - platform/wifi/wifi-utils-wext.h -endif - -nm_iface_helper_LDADD = \ - $(top_builddir)/libnm-core/libnm-core.la \ - $(top_builddir)/introspection/libnmdbus.la \ - libNetworkManagerBase.la \ - libsystemd-nm.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) \ - $(LIBNL_LIBS) \ - $(LIBNDP_LIBS) \ - $(DL_LIBS) \ - $(LIBM) - -nm_iface_helper_LDFLAGS = \ - -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" - -############################################################################### - -GLIB_GENERATED = nm-enum-types.h nm-enum-types.c -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' -nm_enum_types_sources = $(filter-out \ - %/nm-device-private.h \ - %/nm-rdisc-private.h \ - %/wifi-utils-private.h \ - %/nm-dhcp-client-logging.h \ - %/nm-device-logging.h \ - , $(libNetworkManager_la_SOURCES)) - -BUILT_SOURCES = $(GLIB_GENERATED) - -############################################################################### - -dbusservicedir = $(DBUS_SYS_DIR) -dbusservice_DATA = org.freedesktop.NetworkManager.conf - -EXTRA_DIST = \ - $(dbusservice_DATA) \ - $(NetworkManager_DATA) \ - nm-test-utils-core.h \ - NetworkManager.ver - -rundir=$(runstatedir)/NetworkManager -statedir=$(localstatedir)/lib/NetworkManager -install-data-hook: - $(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir) - $(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir) - $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) - -CLEANFILES = \ - $(BUILT_SOURCES) diff --git a/src/devices/Makefile.am b/src/devices/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/src/devices/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am deleted file mode 100644 index 573f19a8c3..0000000000 --- a/src/devices/adsl/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -include $(GLIB_MAKEFILE) - -include $(top_srcdir)/nm.mk - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/src/devices \ - -I${top_srcdir}/src/platform \ - -I${top_builddir}/introspection \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GUDEV_CFLAGS) - -pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la - -libnm_device_plugin_adsl_la_SOURCES = \ - nm-atm-manager.c \ - nm-device-adsl.c \ - nm-device-adsl.h - -libnm_device_plugin_adsl_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" - -libnm_device_plugin_adsl_la_LIBADD = \ - $(top_builddir)/introspection/libnmdbus.la \ - $(GUDEV_LIBS) - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-adsl.so "$(top_srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-adsl.so) diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index d1d0a9b0de..ff4e4cd92a 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -33,7 +33,7 @@ #include #include "nm-device-private.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-platform.h" #include "ppp-manager/nm-ppp-manager.h" #include "ppp-manager/nm-ppp-status.h" diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am deleted file mode 100644 index 79418558fe..0000000000 --- a/src/devices/bluetooth/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -include $(GLIB_MAKEFILE) - -include $(top_srcdir)/nm.mk - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/src/devices \ - -I${top_srcdir}/src/settings \ - -I${top_srcdir}/src/platform \ - -I${top_srcdir}/src/devices/wwan \ - -I${top_builddir}/introspection \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) - -GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM -nm_bt_enum_types_sources = $(srcdir)/nm-bt-error.h - -BUILT_SOURCES = $(GLIB_GENERATED) - -pkglib_LTLIBRARIES = libnm-device-plugin-bluetooth.la - -libnm_device_plugin_bluetooth_la_SOURCES = \ - nm-bluez-manager.c \ - nm-bluez-common.h \ - nm-bluez-device.c \ - nm-bluez-device.h \ - nm-bluez4-adapter.c \ - nm-bluez4-adapter.h \ - nm-bluez4-manager.c \ - nm-bluez4-manager.h \ - nm-bluez5-manager.c \ - nm-bluez5-manager.h \ - nm-bt-error.h \ - nm-bt-error.c \ - \ - nm-device-bt.c \ - nm-device-bt.h \ - \ - $(BUILT_SOURCES) - -libnm_device_plugin_bluetooth_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" - -libnm_device_plugin_bluetooth_la_LIBADD = \ - $(top_builddir)/introspection/libnmdbus.la \ - $(top_builddir)/src/devices/wwan/libnm-wwan.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) - -if WITH_BLUEZ5_DUN -AM_CPPFLAGS += $(BLUEZ5_CFLAGS) - -libnm_device_plugin_bluetooth_la_SOURCES += \ - nm-bluez5-dun.c \ - nm-bluez5-dun.h - -libnm_device_plugin_bluetooth_la_LIBADD += $(BLUEZ5_LIBS) -endif - -CLEANFILES = $(BUILT_SOURCES) - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-bluetooth.so "$(top_srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-bluetooth.so) diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index ae029438c8..69045e6ddd 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -28,7 +28,7 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-device-factory.h" #include "nm-core-internal.h" #include "nm-ip4-config.h" diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index 682c260b17..f727f5c34a 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -26,7 +26,7 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-platform.h" #include "nm-device-factory.h" #include "nm-core-internal.h" diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index a4a560f049..0c23b3dc07 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -40,7 +40,7 @@ #include "nm-supplicant-config.h" #include "ppp-manager/nm-ppp-manager.h" #include "ppp-manager/nm-ppp-status.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-platform.h" #include "nm-platform-utils.h" #include "nm-dcb.h" diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c index dc8828a96d..457b92aeac 100644 --- a/src/devices/nm-device-generic.c +++ b/src/devices/nm-device-generic.c @@ -23,7 +23,7 @@ #include "nm-device-generic.h" #include "nm-device-private.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-platform.h" #include "nm-core-internal.h" diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index bc6051569c..c8805729c9 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -26,7 +26,7 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-act-request.h" #include "nm-ip4-config.h" #include "nm-platform.h" diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index 0f241e8388..de580ed988 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -28,7 +28,7 @@ #include "nm-utils.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-settings.h" #include "nm-act-request.h" #include "nm-ip4-config.h" diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 55e1ff5344..c508dcc0b4 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -53,7 +53,7 @@ #include "nm-dhcp6-config.h" #include "nm-rfkill-manager.h" #include "nm-firewall-manager.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-settings-connection.h" #include "nm-settings.h" #include "nm-auth-utils.h" diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am deleted file mode 100644 index 2810c494c0..0000000000 --- a/src/devices/team/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -include $(GLIB_MAKEFILE) - -include $(top_srcdir)/nm.mk - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/src/devices \ - -I${top_srcdir}/src/platform \ - -I${top_srcdir}/src/settings \ - -I${top_builddir}/introspection \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) - -if WITH_TEAMDCTL -AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS} -endif - -pkglib_LTLIBRARIES = libnm-device-plugin-team.la - -libnm_device_plugin_team_la_SOURCES = \ - nm-team-factory.c \ - nm-device-team.c \ - nm-device-team.h - -libnm_device_plugin_team_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" - -libnm_device_plugin_team_la_LIBADD = \ - $(top_builddir)/introspection/libnmdbus.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) - -if WITH_TEAMDCTL -libnm_device_plugin_team_la_LIBADD += $(LIBTEAMDCTL_LIBS) -endif - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-team.so "$(top_srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-team.so) diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 0ed80f84c8..ff3a6f0b26 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -32,7 +32,7 @@ #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-core-internal.h" #include "nm-ip4-config.h" #include "nm-dbus-compat.h" diff --git a/src/devices/tests/Makefile.am b/src/devices/tests/Makefile.am deleted file mode 100644 index 5914b13108..0000000000 --- a/src/devices/tests/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/devices \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) - -AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) -AM_LDFLAGS = $(GLIB_LIBS) $(CODE_COVERAGE_LDFLAGS) -DEVICES_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -@GNOME_CODE_COVERAGE_RULES@ - -noinst_PROGRAMS = \ - test-lldp \ - test-arping - -test_lldp_SOURCES = \ - test-lldp.c \ - ../nm-lldp-listener.c \ - $(top_srcdir)/src/platform/tests/test-common.c - -test_lldp_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/platform/tests \ - -DSETUP=nm_linux_platform_setup - -test_lldp_LDADD = $(DEVICES_LDADD) - -test_arping_SOURCES = \ - test-arping.c \ - ../nm-arping-manager.c \ - $(top_srcdir)/src/platform/tests/test-common.c - -test_arping_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir)/src/platform/tests \ - -DSETUP=nm_linux_platform_setup - -test_arping_LDADD = $(DEVICES_LDADD) - -@VALGRIND_RULES@ -TESTS = \ - test-lldp \ - test-arping diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c index 244d0715ec..35bf749342 100644 --- a/src/devices/tests/test-arping.c +++ b/src/devices/tests/test-arping.c @@ -125,6 +125,8 @@ fixture_teardown (test_fixture *fixture, gconstpointer user_data) nm_platform_link_delete (NM_PLATFORM_GET, fixture->ifindex1); } +NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup; + void _nmtstp_init_tests (int *argc, char ***argv) { diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index 02b003fb9d..1fbab316e3 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -432,6 +432,8 @@ _test_recv_fixture_teardown (TestRecvFixture *fixture, gconstpointer user_data) /*****************************************************************************/ +NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup; + void _nmtstp_init_tests (int *argc, char ***argv) { diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am deleted file mode 100644 index 45c0ef7399..0000000000 --- a/src/devices/wifi/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -include $(GLIB_MAKEFILE) - -include $(top_srcdir)/nm.mk - -@GNOME_CODE_COVERAGE_RULES@ - -SUBDIRS=. tests - -AM_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/src/devices \ - -I${top_srcdir}/src/settings \ - -I${top_srcdir}/src/platform \ - -I${top_srcdir}/src/supplicant-manager \ - -I${top_builddir}/introspection \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_builddir}/libnm-core \ - -I${top_srcdir}/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) - -pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la - -libnm_device_plugin_wifi_la_SOURCES = \ - nm-wifi-factory.c \ - nm-device-wifi.c \ - nm-device-wifi.h \ - nm-wifi-ap.c \ - nm-wifi-ap.h \ - nm-wifi-utils.c \ - nm-wifi-utils.h \ - nm-device-olpc-mesh.c \ - nm-device-olpc-mesh.h - -libnm_device_plugin_wifi_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" - -libnm_device_plugin_wifi_la_LIBADD = \ - $(top_builddir)/introspection/libnmdbus.la \ - $(GLIB_LIBS) \ - $(GUDEV_LIBS) - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wifi.so "$(top_srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-wifi.so) diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index cac8b068cd..95d6dd8d95 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -46,7 +46,7 @@ #include "nm-setting-connection.h" #include "nm-setting-olpc-mesh.h" #include "nm-manager.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-platform.h" /* This is a bug; but we can't really change API now... */ diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index bfb0780477..38b4501fe2 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -48,7 +48,7 @@ #include "nm-auth-utils.h" #include "nm-settings-connection.h" #include "nm-settings.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-core-internal.h" #include "nm-config.h" diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am deleted file mode 100644 index 1f0171d0db..0000000000 --- a/src/devices/wifi/tests/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I$(top_builddir)/introspection \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I${top_srcdir}/src/platform \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/devices/wifi \ - -I$(top_builddir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) - -noinst_PROGRAMS = test-general - -test_general_SOURCES = \ - test-general.c \ - $(srcdir)/../nm-wifi-ap.c \ - $(srcdir)/../nm-wifi-ap.h \ - $(srcdir)/../nm-wifi-utils.c \ - $(srcdir)/../nm-wifi-utils.h - -test_general_LDADD = $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-general - -endif diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am deleted file mode 100644 index 8efd9a27d2..0000000000 --- a/src/devices/wwan/Makefile.am +++ /dev/null @@ -1,90 +0,0 @@ -include $(GLIB_MAKEFILE) - -include $(top_srcdir)/nm.mk - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/src/devices \ - -I${top_srcdir}/src/settings \ - -I${top_srcdir}/src/platform \ - -I${top_builddir}/introspection \ - -I${top_srcdir}/shared \ - -I$(top_builddir)/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(LIBSYSTEMD_CFLAGS) \ - $(MM_GLIB_CFLAGS) - -BUILT_SOURCES = $(null) - -pkglib_LTLIBRARIES = libnm-wwan.la libnm-device-plugin-wwan.la - -########################################################### - -GLIB_GENERATED = nm-modem-enum-types.h nm-modem-enum-types.c -GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM -GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' -nm_modem_enum_types_sources = $(srcdir)/nm-modem.h - -BUILT_SOURCES += $(GLIB_GENERATED) - -libnm_wwan_la_SOURCES = \ - nm-modem-broadband.c \ - nm-modem-broadband.h \ - nm-modem-manager.c \ - nm-modem-manager.h \ - nm-modem.c \ - nm-modem.h \ - \ - $(GLIB_GENERATED) - -if WITH_OFONO -libnm_wwan_la_SOURCES += \ - nm-modem-ofono.c \ - nm-modem-ofono.h \ - $(NULL) -endif - -libnm_wwan_la_LDFLAGS = \ - -avoid-version \ - -Wl,--version-script="$(srcdir)/libnm-wwan.ver" -libnm_wwan_la_LIBADD = \ - $(top_builddir)/introspection/libnmdbus.la \ - $(GLIB_LIBS) \ - $(LIBSYSTEMD_LIBS) \ - $(MM_GLIB_LIBS) - -########################################################### - -libnm_device_plugin_wwan_la_SOURCES = \ - nm-wwan-factory.c \ - nm-device-modem.c \ - nm-device-modem.h - -libnm_device_plugin_wwan_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver" - -libnm_device_plugin_wwan_la_LIBADD = \ - $(top_builddir)/introspection/libnmdbus.la \ - libnm-wwan.la \ - $(GLIB_LIBS) - -########################################################### - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - libnm-wwan.ver - -check-local: - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wwan.so "$(top_srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-wwan.so) - $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-wwan.so "$(srcdir)/libnm-wwan.ver" - $(call check_so_symbols,$(builddir)/.libs/libnm-wwan.so) diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am deleted file mode 100644 index e6fe60c1b7..0000000000 --- a/src/dhcp-manager/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -libexec_PROGRAMS = nm-dhcp-helper - -nm_dhcp_helper_SOURCES = \ - nm-dhcp-helper.c \ - nm-dhcp-helper-api.h \ - $(NULL) - -nm_dhcp_helper_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/shared \ - -I${top_builddir}/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ - -DNMRUNDIR=\"$(nmrundir)\" - -nm_dhcp_helper_LDFLAGS = \ - -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" - -nm_dhcp_helper_LDADD = $(GLIB_LIBS) diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am deleted file mode 100644 index b26cea1411..0000000000 --- a/src/dhcp-manager/tests/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I$(top_srcdir)/src/dhcp-manager \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DTESTDIR="\"$(abs_srcdir)\"" - -noinst_PROGRAMS = \ - test-dhcp-dhclient \ - test-dhcp-utils - -####### dhclient leases test ####### - -test_dhcp_dhclient_SOURCES = \ - $(top_srcdir)/src/dhcp-manager/nm-dhcp-dhclient-utils.h \ - $(top_srcdir)/src/dhcp-manager/nm-dhcp-dhclient-utils.c \ - $(top_srcdir)/src/dhcp-manager/nm-dhcp-utils.h \ - $(top_srcdir)/src/dhcp-manager/nm-dhcp-utils.c \ - test-dhcp-dhclient.c - -test_dhcp_dhclient_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### DHCP utils test ####### - -test_dhcp_utils_SOURCES = \ - test-dhcp-utils.c - -test_dhcp_utils_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -################################# - -@VALGRIND_RULES@ -TESTS = test-dhcp-dhclient test-dhcp-utils - -EXTRA_DIST = \ - test-dhclient-duid.leases \ - test-dhclient-commented-duid.leases \ - leases/basic.leases \ - leases/malformed1.leases \ - leases/malformed2.leases \ - leases/malformed3.leases - diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am deleted file mode 100644 index 6d7a2a92d0..0000000000 --- a/src/dnsmasq-manager/tests/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I$(top_srcdir)/src/dnsmasq-manager \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DTESTDIR="\"$(abs_srcdir)\"" - -noinst_PROGRAMS = test-dnsmasq-utils - -test_dnsmasq_utils_SOURCES = \ - test-dnsmasq-utils.c - -test_dnsmasq_utils_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-dnsmasq-utils - diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index 2a5f007066..04c2a6f9a3 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -34,7 +34,7 @@ #include #include "nm-bus-manager.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "NetworkManagerUtils.h" enum { diff --git a/src/nm-config.c b/src/nm-config.c index 6338eb617d..2d7237faa8 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -29,7 +29,7 @@ #include "nm-utils.h" #include "nm-device.h" #include "NetworkManagerUtils.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-core-internal.h" #include "nm-keyfile-internal.h" diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index c2f6d1ea27..984e3ec2ed 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -3135,6 +3135,19 @@ _set_stable_privacy (guint8 stable_type, return TRUE; } +gboolean +nm_utils_ipv6_addr_set_stable_privacy_impl (guint8 stable_type, + struct in6_addr *addr, + const char *ifname, + const char *network_id, + guint dad_counter, + guint8 *secret_key, + gsize key_len, + GError **error) +{ + return _set_stable_privacy (stable_type, addr, ifname, network_id, dad_counter, secret_key, key_len, error); +} + #define RFC7217_IDGEN_RETRIES 3 /** * nm_utils_ipv6_addr_set_stable_privacy: @@ -3287,6 +3300,18 @@ _hw_addr_gen_stable_eth (NMUtilsStableType stable_type, return nm_utils_hwaddr_ntoa (&bin_addr, ETH_ALEN); } +char * +nm_utils_hw_addr_gen_stable_eth_impl (NMUtilsStableType stable_type, + const char *stable_id, + const guint8 *secret_key, + gsize key_len, + const char *ifname, + const char *current_mac_address, + const char *generate_mac_address_mask) +{ + return _hw_addr_gen_stable_eth (stable_type, stable_id, secret_key, key_len, ifname, current_mac_address, generate_mac_address_mask); +} + char * nm_utils_hw_addr_gen_stable_eth (NMUtilsStableType stable_type, const char *stable_id, diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index 9e4f8f7895..929031a1b8 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -363,6 +363,16 @@ typedef enum { /*< skip >*/ NM_UTILS_STABLE_TYPE_STABLE_ID = 1, } NMUtilsStableType; + +gboolean nm_utils_ipv6_addr_set_stable_privacy_impl (guint8 stable_type, + struct in6_addr *addr, + const char *ifname, + const char *network_id, + guint dad_counter, + guint8 *secret_key, + gsize key_len, + GError **error); + gboolean nm_utils_ipv6_addr_set_stable_privacy (NMUtilsStableType id_type, struct in6_addr *addr, const char *ifname, @@ -372,6 +382,13 @@ gboolean nm_utils_ipv6_addr_set_stable_privacy (NMUtilsStableType id_type, char *nm_utils_hw_addr_gen_random_eth (const char *current_mac_address, const char *generate_mac_address_mask); +char *nm_utils_hw_addr_gen_stable_eth_impl (NMUtilsStableType stable_type, + const char *stable_id, + const guint8 *secret_key, + gsize key_len, + const char *ifname, + const char *current_mac_address, + const char *generate_mac_address_mask); char *nm_utils_hw_addr_gen_stable_eth (NMUtilsStableType stable_type, const char *stable_id, const char *ifname, diff --git a/src/nm-manager.c b/src/nm-manager.c index 5ce72acf4d..1d70561777 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -43,7 +43,7 @@ #include "nm-auth-manager.h" #include "NetworkManagerUtils.h" #include "nm-device-factory.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-sleep-monitor.h" #include "nm-connectivity.h" #include "nm-policy.h" diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/src/platform/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 01bdcf3e4a..d1bd44886f 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -37,7 +37,7 @@ #include "nm-core-internal.h" #include "nm-core-utils.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-platform-utils.h" #include "nmp-object.h" #include "nmp-netns.h" diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am deleted file mode 100644 index 0633dd28ba..0000000000 --- a/src/platform/tests/Makefile.am +++ /dev/null @@ -1,132 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/src \ - -I${top_builddir}/src \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${srcdir}/.. \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) - -if REQUIRE_ROOT_TESTS -AM_CPPFLAGS += -DREQUIRE_ROOT_TESTS=1 -endif - -PLATFORM_SOURCES = \ - ../nm-platform.c \ - ../nm-fake-platform.c \ - ../nm-linux-platform.c -TEST_SOURCES = \ - test-common.c \ - test-common.h \ - $(PLATFORM_SOURCES) -AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) -AM_LDFLAGS = $(GLIB_LIBS) $(GUDEV_LIBS) $(LIBNL_LIBS) $(CODE_COVERAGE_LDFLAGS) -PLATFORM_LDADD = \ - $(top_builddir)/src/libNetworkManagerTest.la - -@GNOME_CODE_COVERAGE_RULES@ - -noinst_PROGRAMS = \ - monitor \ - test-link-fake \ - test-link-linux \ - test-address-fake \ - test-address-linux \ - test-general \ - test-nmp-object \ - test-route-fake \ - test-route-linux \ - test-cleanup-fake \ - test-cleanup-linux - -EXTRA_DIST = test-common.h - -monitor_SOURCES = monitor.c $(PLATFORM_SOURCES) -monitor_LDADD = $(PLATFORM_LDADD) - -test_link_fake_SOURCES = $(TEST_SOURCES) test-link.c -test_link_fake_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_fake_platform_setup \ - -DKERNEL_HACKS=0 -test_link_fake_LDADD = $(PLATFORM_LDADD) - -test_link_linux_SOURCES = $(TEST_SOURCES) test-link.c -test_link_linux_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_linux_platform_setup \ - -DKERNEL_HACKS=1 -test_link_linux_LDADD = $(PLATFORM_LDADD) - -test_address_fake_SOURCES = $(TEST_SOURCES) test-address.c -test_address_fake_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_fake_platform_setup \ - -DKERNEL_HACKS=0 -test_address_fake_LDADD = $(PLATFORM_LDADD) - -test_address_linux_SOURCES = $(TEST_SOURCES) test-address.c -test_address_linux_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_linux_platform_setup \ - -DKERNEL_HACKS=1 -test_address_linux_LDADD = $(PLATFORM_LDADD) - -test_route_fake_SOURCES = $(TEST_SOURCES) test-route.c -test_route_fake_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_fake_platform_setup \ - -DKERNEL_HACKS=0 -test_route_fake_LDADD = $(PLATFORM_LDADD) - -test_route_linux_SOURCES = $(TEST_SOURCES) test-route.c -test_route_linux_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_linux_platform_setup \ - -DKERNEL_HACKS=1 -test_route_linux_LDADD = $(PLATFORM_LDADD) - -test_cleanup_fake_SOURCES = $(TEST_SOURCES) test-cleanup.c -test_cleanup_fake_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_fake_platform_setup \ - -DKERNEL_HACKS=0 -test_cleanup_fake_LDADD = $(PLATFORM_LDADD) - -test_cleanup_linux_SOURCES = $(TEST_SOURCES) test-cleanup.c -test_cleanup_linux_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DSETUP=nm_linux_platform_setup \ - -DKERNEL_HACKS=1 -test_cleanup_linux_LDADD = $(PLATFORM_LDADD) - -test_nmp_object_SOURCES = \ - test-nmp-object.c -test_nmp_object_LDADD = \ - $(top_builddir)/src/libNetworkManagerTest.la - -test_general_SOURCES = \ - test-general.c -test_general_LDADD = \ - $(top_builddir)/src/libNetworkManagerTest.la - - -@VALGRIND_RULES@ -TESTS = \ - test-address-fake \ - test-address-linux \ - test-cleanup-fake \ - test-cleanup-linux \ - test-general \ - test-link-fake \ - test-link-linux \ - test-nmp-object \ - test-route-fake \ - test-route-linux - diff --git a/src/platform/tests/test-address.c b/src/platform/tests/test-address.c index 05a1444814..4c139ef007 100644 --- a/src/platform/tests/test-address.c +++ b/src/platform/tests/test-address.c @@ -354,6 +354,8 @@ test_ip4_address_peer_zero (void) /*****************************************************************************/ +NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; + void _nmtstp_init_tests (int *argc, char ***argv) { diff --git a/src/platform/tests/test-cleanup.c b/src/platform/tests/test-cleanup.c index 3b52487a56..4ac4929895 100644 --- a/src/platform/tests/test-cleanup.c +++ b/src/platform/tests/test-cleanup.c @@ -106,6 +106,8 @@ test_cleanup_internal (void) g_array_unref (routes6); } +NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; + void _nmtstp_init_tests (int *argc, char ***argv) { diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c index 1ae2c7f40a..5a1bc6736f 100644 --- a/src/platform/tests/test-common.c +++ b/src/platform/tests/test-common.c @@ -32,12 +32,18 @@ /*****************************************************************************/ +void +nmtstp_setup_platform (void) +{ + g_assert (_nmtstp_setup_platform_func); + _nmtstp_setup_platform_func (); +} + gboolean nmtstp_is_root_test (void) { - NM_PRAGMA_WARNING_DISABLE("-Wtautological-compare") - return (SETUP == nm_linux_platform_setup); - NM_PRAGMA_WARNING_REENABLE + g_assert (_nmtstp_setup_platform_func); + return _nmtstp_setup_platform_func == nm_linux_platform_setup; } gboolean @@ -1663,7 +1669,7 @@ main (int argc, char **argv) } } - SETUP (); + nmtstp_setup_platform (); _nmtstp_setup_tests (); diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index 153592cf3c..c3af382ada 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -207,8 +207,12 @@ void nmtstp_link_del (NMPlatform *platform, int ifindex, const char *name); +typedef void (*NMTstpSetupFunc) (void); +extern NMTstpSetupFunc const _nmtstp_setup_platform_func; + +void nmtstp_setup_platform (void); + /*****************************************************************************/ void _nmtstp_init_tests (int *argc, char ***argv); void _nmtstp_setup_tests (void); - diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index bc6e5775f3..0877824fa5 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -1883,8 +1883,7 @@ _test_netns_setup (gpointer fixture, gconstpointer test_data) static void _test_netns_teardown (gpointer fixture, gconstpointer test_data) { - /* re-create platform instance */ - SETUP (); + nmtstp_setup_platform (); } static NMPlatform * @@ -2323,6 +2322,8 @@ test_netns_bind_to_path (gpointer fixture, gconstpointer test_data) /*****************************************************************************/ +NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; + void _nmtstp_init_tests (int *argc, char ***argv) { diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index 360404e944..8174167bc5 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -328,6 +328,8 @@ test_ip4_zero_gateway (void) /*****************************************************************************/ +NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; + void _nmtstp_init_tests (int *argc, char ***argv) { diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am deleted file mode 100644 index 3026dab442..0000000000 --- a/src/ppp-manager/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -if WITH_PPP - -AM_CPPFLAGS = \ - -I${top_srcdir}/shared \ - -I${top_builddir}/shared \ - -I${top_srcdir}/libnm-core \ - -I${top_srcdir}/src \ - -I${top_builddir}/libnm-core \ - -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) - -pppd_plugindir = $(PPPD_PLUGIN_DIR) -pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la - -nm_pppd_plugin_la_SOURCES = \ - nm-pppd-plugin.c \ - nm-pppd-plugin.h \ - nm-ppp-status.h - -nm_pppd_plugin_la_LDFLAGS = -module -avoid-version - -nm_pppd_plugin_la_LIBADD = \ - $(GLIB_LIBS) \ - $(DL_LIBS) \ - $(NULL) - -endif diff --git a/src/rdisc/Makefile.am b/src/rdisc/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/src/rdisc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am deleted file mode 100644 index b054179e8b..0000000000 --- a/src/rdisc/tests/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -AM_CPPFLAGS = \ - -I${top_srcdir} \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/platform \ - -I${top_srcdir}/libnm-core \ - -I${top_builddir}/libnm-core \ - -I${srcdir}/.. \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(LIBNDP_CFLAGS) - -AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) -AM_LDFLAGS = \ - $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) - -@GNOME_CODE_COVERAGE_RULES@ - -noinst_PROGRAMS = test-rdisc-linux test-rdisc-fake - -test_rdisc_linux_SOURCES = \ - test-rdisc-linux.c -test_rdisc_linux_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -test_rdisc_fake_SOURCES = \ - test-rdisc-fake.c -test_rdisc_fake_LDADD = \ - $(top_builddir)/src/libNetworkManagerTest.la - -@VALGRIND_RULES@ -TESTS = test-rdisc-fake - diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index fa5c59d54a..24ecf07991 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -30,7 +30,7 @@ #include "nm-secret-agent.h" #include "nm-auth-utils.h" #include "nm-setting-vpn.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" #include "nm-auth-manager.h" #include "nm-bus-manager.h" #include "nm-session-monitor.h" diff --git a/src/settings/plugins/Makefile.am b/src/settings/plugins/Makefile.am deleted file mode 100644 index 278d455d3a..0000000000 --- a/src/settings/plugins/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -SUBDIRS=keyfile - -@GNOME_CODE_COVERAGE_RULES@ - -if CONFIG_PLUGIN_IBFT -SUBDIRS+=ibft -endif - -if CONFIG_PLUGIN_IFCFG_RH -SUBDIRS+=ifcfg-rh -endif - -if CONFIG_PLUGIN_IFUPDOWN -SUBDIRS+=ifupdown -endif - -if CONFIG_PLUGIN_IFNET -SUBDIRS+=ifnet -endif diff --git a/src/settings/plugins/ibft/Makefile.am b/src/settings/plugins/ibft/Makefile.am deleted file mode 100644 index ece08dc358..0000000000 --- a/src/settings/plugins/ibft/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -SUBDIRS = . tests - -@GNOME_CODE_COVERAGE_RULES@ - -include $(top_srcdir)/nm.mk - -pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.la - -noinst_LTLIBRARIES = libnms-ibft-core.la - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DSBINDIR=\"$(sbindir)\" - -############################################################################### - -libnms_ibft_core_la_SOURCES = \ - nms-ibft-reader.c \ - nms-ibft-reader.h - -############################################################################### - -libnm_settings_plugin_ibft_la_SOURCES = \ - nms-ibft-plugin.c \ - nms-ibft-plugin.h \ - nms-ibft-connection.c \ - nms-ibft-connection.h - -libnm_settings_plugin_ibft_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" - -libnm_settings_plugin_ibft_la_LIBADD = \ - libnms-ibft-core.la - -############################################################################### - -check-local: - $(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ibft.so) - -############################################################################### - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am deleted file mode 100644 index 79ae507eb0..0000000000 --- a/src/settings/plugins/ibft/tests/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -if ENABLE_TESTS - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/settings \ - -I$(srcdir)/../ \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DTEST_IBFT_DIR=\"$(abs_srcdir)\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" - -AM_LDFLAGS = \ - $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) - -noinst_PROGRAMS = test-ibft - -test_ibft_SOURCES = \ - test-ibft.c - -test_ibft_LDADD = \ - $(top_builddir)/src/settings/plugins/ibft/libnms-ibft-core.la \ - $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-ibft - -endif - -EXTRA_DIST = \ - iscsiadm-test-dhcp \ - iscsiadm-test-static \ - iscsiadm-test-bad-ipaddr \ - iscsiadm-test-bad-gateway \ - iscsiadm-test-bad-dns1 \ - iscsiadm-test-bad-dns2 \ - iscsiadm-test-bad-entry \ - iscsiadm-test-bad-record \ - iscsiadm-test-vlan - diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am deleted file mode 100644 index 8308f739b8..0000000000 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -SUBDIRS = . tests - -@GNOME_CODE_COVERAGE_RULES@ - -include $(top_srcdir)/nm.mk - -pkglib_LTLIBRARIES = \ - libnm-settings-plugin-ifcfg-rh.la - -noinst_LTLIBRARIES = \ - libnmdbus-ifcfg-rh.la \ - libnms-ifcfg-rh-core.la - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(NSS_CFLAGS) \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DSBINDIR=\"$(sbindir)\" - -BUILT_SOURCES = \ - nmdbus-ifcfg-rh.h \ - nmdbus-ifcfg-rh.c - -############################################################################### - -nodist_libnmdbus_ifcfg_rh_la_SOURCES = \ - nmdbus-ifcfg-rh.c \ - nmdbus-ifcfg-rh.h - -libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS)) - -nmdbus-ifcfg-rh.h: nm-ifcfg-rh.xml - $(AM_V_GEN) gdbus-codegen \ - --generate-c-code $(basename $@) \ - --c-namespace NMDBus \ - --interface-prefix com.redhat \ - $< - -nmdbus-ifcfg-rh.c: nmdbus-ifcfg-rh.h - @true - -############################################################################### - -libnms_ifcfg_rh_core_la_SOURCES = \ - nms-ifcfg-rh-common.h \ - shvar.c \ - shvar.h \ - nms-ifcfg-rh-utils.c \ - nms-ifcfg-rh-utils.h \ - nms-ifcfg-rh-reader.c \ - nms-ifcfg-rh-reader.h \ - nms-ifcfg-rh-writer.c \ - nms-ifcfg-rh-writer.h - -############################################################################### - -libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ - nms-ifcfg-rh-connection.c \ - nms-ifcfg-rh-connection.h \ - nms-ifcfg-rh-plugin.c \ - nms-ifcfg-rh-plugin.h - -libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" - -libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ - libnms-ifcfg-rh-core.la \ - libnmdbus-ifcfg-rh.la - -############################################################################### - -check-local: - $(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifcfg-rh.so) - -############################################################################### - -dbusservicedir = $(DBUS_SYS_DIR) -dbusservice_DATA = nm-ifcfg-rh.conf - -EXTRA_DIST = \ - $(dbusservice_DATA) \ - nm-ifcfg-rh.xml - -CLEANFILES = $(BUILT_SOURCES) - - diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am deleted file mode 100644 index 299843833e..0000000000 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -if ENABLE_TESTS - -SUBDIRS=network-scripts - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/settings \ - -I$(srcdir)/../ \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \ - -DSYSCONFDIR=\"nonexistent\" \ - -DSBINDIR=\"nonexistent\" - -AM_LDFLAGS = \ - $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) - -noinst_PROGRAMS = test-ifcfg-rh - -test_ifcfg_rh_SOURCES = \ - test-ifcfg-rh.c - -test_ifcfg_rh_LDADD = \ - $(top_builddir)/src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ - $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-ifcfg-rh - -endif diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am deleted file mode 100644 index de9c1ed73f..0000000000 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am +++ /dev/null @@ -1,170 +0,0 @@ -EXTRA_DIST = \ - ifcfg-test-minimal \ - ifcfg-test-misc-variables \ - ifcfg-test-variables-corner-cases-1 \ - ifcfg-test-nm-controlled \ - ifcfg-test-nm-controlled-unrecognized \ - ifcfg-test-unrecognized \ - ifcfg-test-wired-static \ - ifcfg-test-wired-static-bootproto \ - ifcfg-test-wired-dhcp \ - ifcfg-test-wired-dhcp-plus-ip \ - ifcfg-test-wired-shared-plus-ip \ - ifcfg-test-wired-dhcp-send-hostname \ - ifcfg-test-wired-dhcp6-only \ - ifcfg-test-wired-autoip \ - ifcfg-test-wired-global-gateway \ - network-test-wired-global-gateway \ - ifcfg-test-wired-global-gateway-ignore \ - network-test-wired-global-gateway-ignore \ - ifcfg-test-wired-obsolete-gateway-n \ - ifcfg-test-wired-never-default \ - network-test-wired-never-default \ - ifcfg-test-wired-defroute-no \ - ifcfg-test-wired-defroute-no-gatewaydev-yes \ - network-test-wired-defroute-no-gatewaydev-yes \ - ifcfg-test-wired-8021x-peap-mschapv2 \ - keys-test-wired-8021x-peap-mschapv2 \ - ifcfg-test-wired-8021x-tls-agent \ - ifcfg-test-wired-8021x-tls-always \ - ifcfg-test-wired-802-1X-subj-matches \ - ifcfg-test-wired-802-1x-ttls-eapgtc \ - ifcfg-test-onboot-no \ - ifcfg-test-noip \ - ifcfg-test-wifi-open \ - ifcfg-test-wifi-open-auto \ - ifcfg-test-wifi-open-ssid-quoted \ - ifcfg-test-wifi-open-ssid-long-quoted \ - ifcfg-test-wifi-open-ssid-hex \ - ifcfg-test-wifi-open-ssid-long-hex \ - ifcfg-test-wifi-open-ssid-bad-hex \ - ifcfg-test-wifi-wep \ - keys-test-wifi-wep \ - ifcfg-test-wifi-wep-adhoc \ - keys-test-wifi-wep-adhoc \ - ifcfg-test-wifi-wep-eap-ttls-chap \ - keys-test-wifi-wep-eap-ttls-chap \ - ifcfg-test-wifi-leap \ - keys-test-wifi-leap \ - ifcfg-test-wifi-leap-agent \ - ifcfg-test-wifi-leap-always-ask \ - ifcfg-test-wifi-wpa-psk \ - keys-test-wifi-wpa-psk \ - ifcfg-test-wifi-wpa-psk-2 \ - keys-test-wifi-wpa-psk-2 \ - ifcfg-test-wifi-wpa-psk-unquoted \ - keys-test-wifi-wpa-psk-unquoted \ - ifcfg-test-wifi-wpa-psk-unquoted2 \ - keys-test-wifi-wpa-psk-unquoted2 \ - ifcfg-test-wifi-wpa-psk-adhoc \ - keys-test-wifi-wpa-psk-adhoc \ - ifcfg-test-wifi-wpa-psk-hex \ - keys-test-wifi-wpa-psk-hex \ - ifcfg-test-wifi-wpa-eap-tls \ - keys-test-wifi-wpa-eap-tls \ - ifcfg-test-wifi-wpa-eap-ttls-tls \ - keys-test-wifi-wpa-eap-ttls-tls \ - ifcfg-test-wifi-hidden \ - ifcfg-test-wifi-band-a \ - ifcfg-test-wifi-band-a-channel-mismatch \ - ifcfg-test-wifi-band-bg-channel-mismatch \ - ifcfg-test-wifi-mac-random-always \ - ifcfg-test-wifi-mac-random-never \ - ifcfg-test-wifi-mac-random-default \ - ifcfg-test-wifi-mac-random-missing \ - test_ca_cert.pem \ - test1_key_and_cert.pem \ - ifcfg-test-ibft \ - ifcfg-test-static-routes-legacy \ - route-test-static-routes-legacy \ - ifcfg-test-sit-ignore \ - ifcfg-test-wired-static-routes \ - route-test-wired-static-routes \ - ifcfg-test-wired-static-routes-legacy \ - route-test-wired-static-routes-legacy \ - ifcfg-test-wired-ipv4-manual-1 \ - ifcfg-test-wired-ipv4-manual-2 \ - ifcfg-test-wired-ipv4-manual-3 \ - ifcfg-test-wired-ipv4-manual-4 \ - ifcfg-test-wired-ipv6-manual \ - route6-test-wired-ipv6-manual \ - ifcfg-test-wired-static-no-prefix-8 \ - ifcfg-test-wired-static-no-prefix-16 \ - ifcfg-test-wired-static-no-prefix-24 \ - ifcfg-test-wired-ipv6-only \ - ifcfg-test-wifi-wep-passphrase \ - keys-test-wifi-wep-passphrase \ - ifcfg-test-wifi-wep-40-ascii \ - keys-test-wifi-wep-40-ascii \ - ifcfg-test-wifi-wep-104-ascii \ - keys-test-wifi-wep-104-ascii \ - ifcfg-test-wired-qeth-static \ - ifcfg-test-wired-ctc-static \ - ifcfg-test-bridge-main \ - ifcfg-test-bridge-component \ - ifcfg-test-bridge-missing-stp \ - ifcfg-test-vlan-interface \ - ifcfg-test-vlan-only-vlanid \ - ifcfg-test-vlan-only-device \ - ifcfg-test-vlan-physdev \ - ifcfg-test-vlan-reorder-hdr-1 \ - ifcfg-test-vlan-reorder-hdr-2 \ - ifcfg-test-vlan-flags-1 \ - ifcfg-test-vlan-flags-2 \ - ifcfg-test-wifi-wep-no-keys \ - ifcfg-test-permissions \ - ifcfg-test-wifi-wep-agent-keys \ - ifcfg-test-wifi-dynamic-wep-leap \ - keys-test-wifi-dynamic-wep-leap \ - ifcfg-test-infiniband \ - ifcfg-test-bond-main \ - ifcfg-test-bond-slave \ - ifcfg-test-bond-slave-ib \ - ifcfg-test-bond-mode-numeric \ - ifcfg-test-dcb \ - ifcfg-test-dcb-default-app-priorities \ - ifcfg-test-dcb-bad-booleans \ - ifcfg-test-dcb-short-booleans \ - ifcfg-test-dcb-bad-uints \ - ifcfg-test-dcb-short-uints \ - ifcfg-test-dcb-bad-percent \ - ifcfg-test-dcb-short-percent \ - ifcfg-test-dcb-pgpct-not-100 \ - ifcfg-test-fcoe-fabric \ - ifcfg-test-fcoe-vn2vn \ - ifcfg-test-team-master-1 \ - ifcfg-test-team-master-2 \ - ifcfg-test-team-master-invalid \ - ifcfg-test-team-port-1 \ - ifcfg-test-team-port-2 \ - ifcfg-test-team-port-empty-config \ - ifcfg-test-vlan-trailing-spaces \ - ifcfg-test-dns-options \ - ifcfg-test-wired-wake-on-lan \ - ifcfg-test-wired-ipv6-only-1 - -# make target dependencies can't have colons in their names, which ends up -# meaning that we can't add the alias files to EXTRA_DIST -ALIAS_FILES = \ - ifcfg-aliasem0 \ - ifcfg-aliasem0:1 \ - ifcfg-aliasem0:2 \ - ifcfg-aliasem0:99 \ - ifcfg-aliasem1 \ - ifcfg-aliasem1:1 \ - ifcfg-aliasem2 \ - ifcfg-aliasem2:1 - -dist-hook: - @for f in $(ALIAS_FILES); do \ - cp $(abs_srcdir)/$$f $(distdir)/; \ - done - -check-local: - @for f in $(EXTRA_DIST) $(ALIAS_FILES); do \ - chmod 0600 $(abs_srcdir)/$$f; \ - done - -# Make the special temp dir for some written connections - mkdir -p $(abs_builddir)/tmp - diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 2359852f08..df332b2407 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -8982,6 +8982,9 @@ int main (int argc, char **argv) { nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT"); + if (g_mkdir_with_parents (TEST_SCRATCH_DIR"/network-scripts/tmp", 0755) != 0) + g_error ("failure to create test directory \"%s\": %s", TEST_SCRATCH_DIR"/network-scripts/tmp", g_strerror (errno)); + g_test_add_func (TPATH "svUnescape", test_svUnescape); g_test_add_func (TPATH "vlan-trailing-spaces", test_read_vlan_trailing_spaces); diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am deleted file mode 100644 index c3e0dee41f..0000000000 --- a/src/settings/plugins/ifnet/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -SUBDIRS = . tests - -@GNOME_CODE_COVERAGE_RULES@ - -include $(top_srcdir)/nm.mk - -pkglib_LTLIBRARIES = \ - libnm-settings-plugin-ifnet.la - -noinst_LTLIBRARIES = \ - libnms-ifnet-core.la - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" - -DSBINDIR=\"$(sbindir)\" - -############################################################################### - -libnms_ifnet_core_la_SOURCES = \ - nms-ifnet-net-parser.c\ - nms-ifnet-net-parser.h\ - nms-ifnet-connection-parser.c \ - nms-ifnet-connection-parser.h \ - nms-ifnet-net-utils.h\ - nms-ifnet-net-utils.c\ - nms-ifnet-wpa-parser.h\ - nms-ifnet-wpa-parser.c - -############################################################################### - -libnm_settings_plugin_ifnet_la_SOURCES = \ - nms-ifnet-connection.c \ - nms-ifnet-connection.h \ - nms-ifnet-plugin.c \ - nms-ifnet-plugin.h - -libnm_settings_plugin_ifnet_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" - -libnm_settings_plugin_ifnet_la_LIBADD = \ - libnms-ifnet-core.la - -############################################################################### - -check-local: - $(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifnet.so) diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am deleted file mode 100644 index 283c758942..0000000000 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -if ENABLE_TESTS - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS= \ - -I$(srcdir)/../ \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(CHECK_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -DTEST_IFNET_DIR=\"$(abs_srcdir)\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \ - -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"' \ - -DSYSCONFDIR=\"nonexistent\" - -noinst_PROGRAMS = test-ifnet - -test_ifnet_SOURCES = \ - test-ifnet.c - -test_ifnet_LDFLAGS = \ - $(GLIB_LDFLAGS) - $(CODE_COVERAGE_LDFLAGS) - -test_ifnet_LDADD = \ - $(top_builddir)/src/settings/plugins/ifnet/libnms-ifnet-core.la \ - $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-ifnet - -endif - -EXTRA_DIST = \ - net \ - net.all \ - nm-system-settings.conf \ - wpa_supplicant.conf \ - test_ca_cert.pem diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am deleted file mode 100644 index 547834ff6a..0000000000 --- a/src/settings/plugins/ifupdown/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -SUBDIRS = . tests - -@GNOME_CODE_COVERAGE_RULES@ - -include $(top_srcdir)/nm.mk - -pkglib_LTLIBRARIES = \ - libnm-settings-plugin-ifupdown.la - -noinst_LTLIBRARIES = \ - libnms-ifupdown-core.la - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/settings \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(GUDEV_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" - -############################################################################### - -libnms_ifupdown_core_la_SOURCES = \ - nms-ifupdown-interface-parser.c \ - nms-ifupdown-interface-parser.h \ - nms-ifupdown-parser.c \ - nms-ifupdown-parser.h - -############################################################################### - -libnm_settings_plugin_ifupdown_la_SOURCES = \ - nms-ifupdown-connection.c \ - nms-ifupdown-connection.h \ - nms-ifupdown-plugin.c \ - nms-ifupdown-plugin.h - -libnm_settings_plugin_ifupdown_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" - -libnm_settings_plugin_ifupdown_la_LIBADD = \ - libnms-ifupdown-core.la - -############################################################################### - -check-local: - $(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifupdown.so) diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am deleted file mode 100644 index d8d13c3b2d..0000000000 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -if ENABLE_TESTS - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/settings \ - -I$(srcdir)/../ \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DTEST_ENI_DIR=\"$(abs_srcdir)\" - -noinst_PROGRAMS = test-ifupdown - -test_ifupdown_SOURCES = \ - test-ifupdown.c - -test_ifupdown_LDFLAGS = \ - $(GLIB_LDFLAGS) - $(CODE_COVERAGE_LDFLAGS) - -test_ifupdown_LDADD = \ - $(top_builddir)/src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ - $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-ifupdown - -endif - -EXTRA_DIST = \ - test1 test2 test3 test4 test5 test6 test7 test8 test9 test11 test12 \ - test13 test14 test15 test16 test17-wired-static-verify-ip4 \ - test18-wired-static-verify-ip6 test19-wired-static-verify-ip4-plen \ - test20-source-stanza test20-source-stanza.eth0 test20-source-stanza.eth1 \ - test21-source-dir-stanza test21-source-dir-stanza.d diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am deleted file mode 100644 index 3c6155b9c6..0000000000 --- a/src/settings/plugins/keyfile/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = tests diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.c b/src/settings/plugins/keyfile/nms-keyfile-reader.c index c09e68c03f..39a0148021 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-reader.c +++ b/src/settings/plugins/keyfile/nms-keyfile-reader.c @@ -102,14 +102,14 @@ nms_keyfile_reader_from_file (const char *filename, GError **error) return NULL; } - if (statbuf.st_mode & 0077) { - g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, - "File permissions (%o) were insecure", - statbuf.st_mode); - return NULL; - } - if (!NM_FLAGS_HAS (nm_utils_get_testing (), NM_UTILS_TEST_NO_KEYFILE_OWNER_CHECK)) { + if (statbuf.st_mode & 0077) { + g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, + "File permissions (%o) were insecure", + statbuf.st_mode); + return NULL; + } + if (statbuf.st_uid != 0) { g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "File owner (%o) is insecure", diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am deleted file mode 100644 index c0b67d1595..0000000000 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -if ENABLE_TESTS - -SUBDIRS=keyfiles - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/settings \ - -I$(srcdir)/../ \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \ - -DNMCONFDIR=\"nonexistent\" - -AM_LDFLAGS = \ - $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) - -noinst_PROGRAMS = test-keyfile - -test_keyfile_SOURCES = \ - test-keyfile.c - -test_keyfile_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-keyfile - -endif diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am deleted file mode 100644 index be431067f0..0000000000 --- a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -KEYFILES = \ - Test_Wired_Connection \ - Test_GSM_Connection \ - Test_Wireless_Connection \ - Test_Wired_Connection_MAC_Case \ - Test_MAC_Old_Format \ - Test_MAC_IB_Old_Format \ - Test_Wired_Connection_IP6 \ - ATT_Data_Connect_BT \ - ATT_Data_Connect_Plain \ - Test_String_SSID \ - Test_Intlist_SSID \ - Test_Intlike_SSID \ - Test_Intlike_SSID_2 \ - Test_Wired_TLS_Old \ - Test_Wired_TLS_New \ - Test_Wired_TLS_Blob \ - Test_Wired_TLS_Path_Missing \ - Test_InfiniBand_Connection \ - Test_Bridge_Main \ - Test_Bridge_Component \ - Test_New_Wired_Group_Name \ - Test_New_Wireless_Group_Names \ - Test_minimal_1 \ - Test_minimal_2 \ - Test_minimal_slave_1 \ - Test_minimal_slave_2 \ - Test_minimal_slave_3 \ - Test_minimal_slave_4 \ - Test_Missing_Vlan_Setting \ - Test_Missing_Vlan_Flags \ - Test_Missing_ID_UUID \ - Test_Enum_Property \ - Test_Flags_Property - -CERTS = \ - test-ca-cert.pem \ - test-key-and-cert.pem - -EXTRA_DIST = $(KEYFILES) $(CERTS) - -check-local: - @for f in $(KEYFILES); do \ - chmod 0600 $(abs_srcdir)/$$f; \ - done - diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index d9d70437bb..68a4ba1532 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -204,7 +204,8 @@ test_read_valid_wired_connection (void) "*ipv6.routes*semicolon at the end*routes1*"); g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*ipv6.route*semicolon at the end*route6*"); - connection = nms_keyfile_reader_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection", NULL); + connection = nms_keyfile_reader_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection", &error); + g_assert_no_error (error); g_test_assert_expected_messages (); g_assert (connection); @@ -2578,6 +2579,9 @@ int main (int argc, char **argv) _nm_utils_set_testing (NM_UTILS_TEST_NO_KEYFILE_OWNER_CHECK); nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT"); + if (g_mkdir_with_parents (TEST_SCRATCH_DIR, 0755) != 0) + g_error ("failure to create test directory \"%s\": %s", TEST_SCRATCH_DIR, g_strerror (errno)); + /* The tests */ g_test_add_func ("/keyfile/test_read_valid_wired_connection", test_read_valid_wired_connection); g_test_add_func ("/keyfile/test_write_wired_connection", test_write_wired_connection); diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am deleted file mode 100644 index 3ab9122e81..0000000000 --- a/src/supplicant-manager/tests/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -SUBDIRS=certs - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/supplicant-manager \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/certs\" \ - $(GLIB_CFLAGS) - -noinst_PROGRAMS = test-supplicant-config - -test_supplicant_config_SOURCES = \ - test-supplicant-config.c - -test_supplicant_config_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -@VALGRIND_RULES@ -TESTS = test-supplicant-config diff --git a/src/supplicant-manager/tests/certs/Makefile.am b/src/supplicant-manager/tests/certs/Makefile.am deleted file mode 100644 index f2e889f7ca..0000000000 --- a/src/supplicant-manager/tests/certs/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -CERTS = \ - test-ca-cert.pem \ - test-cert.p12 - -EXTRA_DIST = $(CERTS) - diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am deleted file mode 100644 index 35c70d2103..0000000000 --- a/src/tests/Makefile.am +++ /dev/null @@ -1,170 +0,0 @@ -SUBDIRS = config - -@GNOME_CODE_COVERAGE_RULES@ - -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/platform \ - -I$(top_srcdir)/src/dhcp-manager \ - -I$(top_srcdir)/src/devices \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) - -AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) - -noinst_PROGRAMS = \ - test-general \ - test-general-with-expect \ - test-ip4-config \ - test-ip6-config \ - test-route-manager-linux \ - test-route-manager-fake \ - test-dcb \ - test-systemd \ - test-resolvconf-capture \ - test-wired-defname \ - test-utils - -####### ip4 config test ####### - -test_ip4_config_SOURCES = \ - test-ip4-config.c - -test_ip4_config_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### ip6 config test ####### - -test_ip6_config_SOURCES = \ - test-ip6-config.c - -test_ip6_config_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### route manager test ####### - -test_route_manager_fake_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src/platform/tests \ - -DSETUP=nm_fake_platform_setup \ - -DKERNEL_HACKS=0 - -test_route_manager_fake_SOURCES = \ - $(top_srcdir)/src/platform/tests/test-common.c \ - test-route-manager.c - -test_route_manager_fake_LDADD = \ - $(top_builddir)/src/libNetworkManagerTest.la - -test_route_manager_linux_SOURCES = \ - $(top_srcdir)/src/platform/tests/test-common.c \ - test-route-manager.c - -test_route_manager_linux_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(GUDEV_CFLAGS) \ - -I$(top_srcdir)/src/platform/tests \ - -DSETUP=nm_linux_platform_setup \ - -DKERNEL_HACKS=1 - -test_route_manager_linux_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### DCB test ####### - -test_dcb_SOURCES = \ - test-dcb.c - -test_dcb_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### resolv.conf capture test ####### - -test_resolvconf_capture_SOURCES = \ - test-resolvconf-capture.c - -test_resolvconf_capture_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### general test ####### - -test_general_SOURCES = \ - test-general.c - -test_general_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### general-with-expect test ####### - -test_general_with_expect_SOURCES = \ - test-general-with-expect.c - -test_general_with_expect_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### wired defname test ####### - -test_wired_defname_SOURCES = \ - test-wired-defname.c - -test_wired_defname_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### systemd test ####### - -test_systemd_CFLAGS = \ - "-I$(srcdir)/../" \ - "-I$(srcdir)/../platform" \ - $(NULL) - -test_systemd_SOURCES = \ - test-systemd.c - -test_systemd_LDADD = \ - $(top_builddir)/src/libsystemd-nm.la - -####### utils test ####### - -test_utils_SOURCES = \ - test-utils.c - -test_utils_DEPENDENCIES = \ - $(top_srcdir)/src/NetworkManagerUtils.c - -test_utils_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DPREFIX=\"/nonexistent\" \ - -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -DNMSTATEDIR=\"/nonsense\" - -test_utils_LDADD = \ - $(top_builddir)/src/libNetworkManager.la - -####### secret agent interface test ####### - -EXTRA_DIST = test-secret-agent.py - -########################################### - -@VALGRIND_RULES@ -TESTS = \ - test-ip4-config \ - test-ip6-config \ - test-route-manager-fake \ - test-route-manager-linux \ - test-dcb \ - test-resolvconf-capture \ - test-general \ - test-general-with-expect \ - test-systemd \ - test-wired-defname \ - test-utils - diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am deleted file mode 100644 index d0cb797d15..0000000000 --- a/src/tests/config/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/shared \ - -I$(top_builddir)/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/src/ \ - -I$(top_srcdir)/src/devices \ - -I${top_srcdir}/src/platform \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DSRCDIR=\""$(abs_srcdir)"\" \ - -DBUILDDIR=\""$(abs_builddir)"\" - -noinst_PROGRAMS = \ - test-config - -test_config_SOURCES = \ - nm-test-device.c \ - nm-test-device.h \ - test-config.c - -test_config_LDADD = \ - $(top_builddir)/src/libNetworkManagerTest.la - -@VALGRIND_RULES@ -TESTS = test-config - -EXTRA_DIST = \ - NetworkManager.conf \ - NetworkManager.state \ - bad.conf \ - global-dns-invalid.conf \ - conf.d/00-overrides.conf \ - conf.d/10-more.conf \ - conf.d/20-config-enable-1.conf \ - conf.d/90-last.conf diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c index b81c263c08..c42544aa16 100644 --- a/src/tests/test-route-manager.c +++ b/src/tests/test-route-manager.c @@ -912,6 +912,8 @@ fixture_teardown (test_fixture *fixture, gconstpointer user_data) /*****************************************************************************/ +NMTstpSetupFunc const _nmtstp_setup_platform_func = SETUP; + void _nmtstp_init_tests (int *argc, char ***argv) { diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c index 000a9d1ef4..cd05a36d9f 100644 --- a/src/tests/test-utils.c +++ b/src/tests/test-utils.c @@ -24,8 +24,6 @@ #include #include -#include "nm-core-utils.c" - #include "nm-test-utils-core.h" static void @@ -34,25 +32,25 @@ test_stable_privacy (void) struct in6_addr addr1; inet_pton (AF_INET6, "1234::", &addr1); - _set_stable_privacy (NM_UTILS_STABLE_TYPE_UUID, &addr1, "eth666", "6b138152-9f3e-4b97-aaf7-e6e553f2a24e", 0, (guint8 *) "key", 3, NULL); + nm_utils_ipv6_addr_set_stable_privacy_impl (NM_UTILS_STABLE_TYPE_UUID, &addr1, "eth666", "6b138152-9f3e-4b97-aaf7-e6e553f2a24e", 0, (guint8 *) "key", 3, NULL); nmtst_assert_ip6_address (&addr1, "1234::4ceb:14cd:3d54:793f"); /* We get an address without the UUID. */ inet_pton (AF_INET6, "1::", &addr1); - _set_stable_privacy (NM_UTILS_STABLE_TYPE_UUID, &addr1, "eth666", NULL, 384, (guint8 *) "key", 3, NULL); + nm_utils_ipv6_addr_set_stable_privacy_impl (NM_UTILS_STABLE_TYPE_UUID, &addr1, "eth666", NULL, 384, (guint8 *) "key", 3, NULL); nmtst_assert_ip6_address (&addr1, "1::11aa:2530:9144:dafa"); /* We get a different address in a different network. */ inet_pton (AF_INET6, "2::", &addr1); - _set_stable_privacy (NM_UTILS_STABLE_TYPE_UUID, &addr1, "eth666", NULL, 384, (guint8 *) "key", 3, NULL); + nm_utils_ipv6_addr_set_stable_privacy_impl (NM_UTILS_STABLE_TYPE_UUID, &addr1, "eth666", NULL, 384, (guint8 *) "key", 3, NULL); nmtst_assert_ip6_address (&addr1, "2::338e:8d:c11:8726"); inet_pton (AF_INET6, "1234::", &addr1); - _set_stable_privacy (NM_UTILS_STABLE_TYPE_STABLE_ID, &addr1, "eth666", "6b138152-9f3e-4b97-aaf7-e6e553f2a24e", 0, (guint8 *) "key", 3, NULL); + nm_utils_ipv6_addr_set_stable_privacy_impl (NM_UTILS_STABLE_TYPE_STABLE_ID, &addr1, "eth666", "6b138152-9f3e-4b97-aaf7-e6e553f2a24e", 0, (guint8 *) "key", 3, NULL); nmtst_assert_ip6_address (&addr1, "1234::ad4c:ae44:3d30:af1e"); inet_pton (AF_INET6, "1234::", &addr1); - _set_stable_privacy (NM_UTILS_STABLE_TYPE_STABLE_ID, &addr1, "eth666", "stable-id-1", 0, (guint8 *) "key", 3, NULL); + nm_utils_ipv6_addr_set_stable_privacy_impl (NM_UTILS_STABLE_TYPE_STABLE_ID, &addr1, "eth666", "stable-id-1", 0, (guint8 *) "key", 3, NULL); nmtst_assert_ip6_address (&addr1, "1234::4944:67b0:7a6c:1cf"); } @@ -77,13 +75,13 @@ _do_test_hw_addr (NMUtilsStableType stable_type, g_assert (nm_utils_hwaddr_valid (*e, ETH_ALEN)); } - generated = _hw_addr_gen_stable_eth (stable_type, - stable_id, - secret_key, - key_len, - ifname, - current_mac_address, - generate_mac_address_mask); + generated = nm_utils_hw_addr_gen_stable_eth_impl (stable_type, + stable_id, + secret_key, + key_len, + ifname, + current_mac_address, + generate_mac_address_mask); g_assert (generated); g_assert (nm_utils_hwaddr_valid (generated, ETH_ALEN)); diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 35f93fd859..0b092a67a1 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -30,7 +30,7 @@ #include "nm-setting-vpn.h" #include "nm-vpn-dbus-interface.h" #include "nm-core-internal.h" -#include "nm-enum-types.h" +#include "nm-src-enum-types.h" typedef struct { GSList *plugins; diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index b59b2a97d0..0000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -EXTRA_DIST = \ - check-exports.sh \ - create-exports-NetworkManager.sh \ - debug-helper.py \ - run-test-valgrind.sh \ - run-test-dbus-session.sh \ - test-networkmanager-service.py \ - test-sudo-wrapper.sh \ - enums-to-docbook.pl diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh new file mode 100755 index 0000000000..34d30aab80 --- /dev/null +++ b/tools/run-nm-test.sh @@ -0,0 +1,183 @@ +#!/bin/bash + +die() { + echo "$@" + exit 5 +} + +SCRIPT_PATH="${SCRIPT_PATH:-$(readlink -f "$(dirname "$0")")}" + +VALGRIND_ERROR=37 + +if [ "$1" == "--called-from-make" ]; then + shift + NMTST_LIBTOOL=($1 --mode=execute); shift + NMTST_VALGRIND="$1"; shift + NMTST_CHANGE_DIRECTORY= + if [[ "$NMTST_VALGRIND" == no ]]; then + NMTST_VALGRIND= + fi + SUPPRESSIONS="$1"; shift + if [ "$1" = "--launch-dbus" ]; then + NMTST_LAUNCH_DBUS=yes + shift + elif [ "$1" = "--launch-dbus=auto" ]; then + NMTST_LAUNCH_DBUS= + shift + else + NMTST_LAUNCH_DBUS=no + fi + TEST="$1"; shift + +else + if [ -n "${NMTST_LIBTOOL-:x}" ]; then + NMTST_LIBTOOL=(sh "$SCRIPT_PATH/../libtool" --mode=execute) + elif [ -n "${NMTST_LIBTOOL-x}" ]; then + NMTST_LIBTOOL=() + else + NMTST_LIBTOOL=($NMTST_LIBTOOL --mode=execute) + fi + for a in "$@"; do + case "$a" in + "--launch-dbus") + NMTST_LAUNCH_DBUS=yes + shift + ;; + "--no-launch-dbus"|"-D") + NMTST_LAUNCH_DBUS=no + shift + ;; + "--no-libtool") + NMTST_LIBTOOL=() + shift + ;; + "--valgrind") + NMTST_NO_VALGRIND= + NMTST_VALGRIND=valgrind + shift; + ;; + "--no-valgrind") + NMTST_NO_VALGRIND=no + NMTST_VALGRIND="" + shift; + ;; + "--") + shift + break + ;; + *) + break + ;; + esac + done + # we support calling the script directly. In this case, + # only pass the path to the test to run. + TEST="$1"; shift + NMTST_VALGRIND="${NMTST_VALGRIND:-valgrind}" + if [ "$SUPPRESSIONS" == "" ]; then + SUPPRESSIONS="$SCRIPT_PATH/../valgrind.suppressions" + fi + +fi + +[ -x "$TEST" ] || die "Test \"$TEST\" does not exist" +TEST_PATH="$(readlink -f "$(dirname "$TEST")")" + +if [ -n "${NMTST_LAUNCH_DBUS:-x}" ]; then + # autodetect whether to launch D-Bus based on the test path. + if [[ $TEST_PATH == */libnm/tests || $TEST_PATH == */libnm-glib/tests ]]; then + NMTST_LAUNCH_DBUS=yes + else + NMTST_LAUNCH_DBUS=no + fi +fi + +# some tests require you to cd into the base directory. +# do that. +if [ "$NMTST_CHANGE_DIRECTORY" != "" ]; then + cd "$TEST_PATH" + TEST="./$(basename "$TEST")" +fi + +NMTST_DBUS_RUN_SESSION=() +if [ "$NMTST_LAUNCH_DBUS" == "yes" ]; then + if ! which dbus-run-session &>/dev/null ; then + eval `dbus-launch --sh-syntax` + trap "kill $DBUS_SESSION_BUS_PID" EXIT + else + NMTST_DBUS_RUN_SESSION=(dbus-run-session --) + fi +fi + +[ -x "$TEST" ] || die "Cannot execute test \"$TEST\"" + + +if [ "$NMTST_NO_VALGRIND" != "" -o "$NMTST_VALGRIND" == "" ]; then + "${NMTST_DBUS_RUN_SESSION[@]}" \ + "$TEST" "$@" + exit $? +fi + + +LOGFILE="${TEST}.valgrind-log" + +export G_SLICE=always-malloc +export G_DEBUG=gc-friendly +"${NMTST_DBUS_RUN_SESSION[@]}" \ +"${NMTST_LIBTOOL[@]}" \ +"$NMTST_VALGRIND" \ + --quiet \ + --error-exitcode=$VALGRIND_ERROR \ + --leak-check=full \ + --gen-suppressions=all \ + --suppressions="$SUPPRESSIONS" \ + --num-callers=100 \ + --log-file="$LOGFILE" \ + "$TEST" \ + "$@" +RESULT=$? + +test -s "$LOGFILE" +HAS_ERRORS=$? + +if [ $RESULT -ne 0 -a $RESULT -ne 77 ]; then + if [ $HAS_ERRORS -ne 0 ]; then + rm -f "$LOGFILE" + elif [ $RESULT -ne $VALGRIND_ERROR ]; then + # the test (probably) didn't fail due to valgrind. + echo "The test failed. Also check the valgrind log at '`realpath "$LOGFILE"`'" >&2 + else + echo "valgrind failed! Check the log at '`realpath "$LOGFILE"`'" >&2 + UNRESOLVED=$(awk -F: '/obj:\// {print $NF}' "$LOGFILE" | sort | uniq) + if [ -n "$UNRESOLVED" ]; then + echo Some addresses could not be resolved into symbols. >&2 + echo The errors might get suppressed when you install the debuging symbols. >&2 + if [ -x /usr/bin/dnf ]; then + echo Hint: dnf debuginfo-install $UNRESOLVED >&2 + elif [ -x /usr/bin/debuginfo-install ]; then + echo Hint: debuginfo-install $UNRESOLVED >&2 + else + echo Files without debugging symbols: $UNRESOLVED >&2 + fi + fi + fi + exit $RESULT +fi + +if [ $HAS_ERRORS -eq 0 ]; then + # valgrind doesn't support setns syscall and spams the logfile. + # hack around it... + if [ "$(basename "$TEST")" = 'test-link-linux' -a -z "$(sed -e '/^--[0-9]\+-- WARNING: unhandled .* syscall: /,/^--[0-9]\+-- it at http.*\.$/d' "$LOGFILE")" ]; then + HAS_ERRORS=1 + fi +fi + +if [ $HAS_ERRORS -eq 0 ]; then + # shouldn't actually happen... + echo "valgrind succeeded, but log is not empty: '`realpath "$LOGFILE"`'" >&2 + exit 1 +fi + +rm -f "$LOGFILE" + +exit $RESULT diff --git a/tools/run-test-dbus-session.sh b/tools/run-test-dbus-session.sh deleted file mode 100755 index c6a94fa6cc..0000000000 --- a/tools/run-test-dbus-session.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if ! which dbus-run-session >/dev/null 2>&1; then - eval `dbus-launch --sh-syntax` - trap "kill $DBUS_SESSION_BUS_PID" EXIT - "$@" - exit $? -fi - -dbus-run-session -- "$@" diff --git a/tools/run-test-valgrind.sh b/tools/run-test-valgrind.sh deleted file mode 100755 index d3dd915bf0..0000000000 --- a/tools/run-test-valgrind.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash - -die() { - echo "$@" - exit 5 -} - -SCRIPT_PATH="${SCRIPT_PATH:-$(readlink -f "$(dirname "$0")")}" - -VALGRIND_ERROR=37 -if [ "$1" == "--called-from-make" ]; then - shift - NMTST_LIBTOOL=($1 --mode=execute); shift - NMTST_VALGRIND="$1"; shift - SUPPRESSIONS="$1"; shift - if [ "$1" = "--launch-dbus" ]; then - NMTST_LAUNCH_DBUS=yes - shift - else - NMTST_LAUNCH_DBUS=no - fi - TEST="$1"; shift -else - if [ -n "${NMTST_LIBTOOL-:x}" ]; then - NMTST_LIBTOOL=(sh "$SCRIPT_PATH/../libtool" --mode=execute) - elif [ -n "${NMTST_LIBTOOL-x}" ]; then - NMTST_LIBTOOL=() - else - NMTST_LIBTOOL=($NMTST_LIBTOOL --mode=execute) - fi - for a in "$@"; do - case "$a" in - "--launch-dbus") - NMTST_LAUNCH_DBUS=yes - shift - ;; - "--no-launch-dbus"|"-D") - NMTST_LAUNCH_DBUS=no - shift - ;; - "--no-libtool") - NMTST_LIBTOOL=() - shift - ;; - "--") - shift - break - ;; - *) - break - ;; - esac - done - # we support calling the script directly. In this case, - # only pass the path to the test to run. - TEST="$1"; shift - NMTST_VALGRIND="${NMTST_VALGRIND:-valgrind}" - if [ "$SUPPRESSIONS" == "" ]; then - SUPPRESSIONS="$SCRIPT_PATH/../valgrind.suppressions" - fi - - [ -x "$TEST" ] || die "Test \"$TEST\" does not exist" - - TEST_PATH="$(readlink -f "$(dirname "$TEST")")" - - if [ -n "${NMTST_LAUNCH_DBUS-x}" ]; then - # autodetect whether to launch D-Bus based on the test path. - if [[ $TEST_PATH == */libnm/tests || $TEST_PATH == */libnm-glib/tests ]]; then - NMTST_LAUNCH_DBUS=yes - else - NMTST_LAUNCH_DBUS=no - fi - fi - - # some tests require you to cd into the base directory. - # do that. - if [ "$NMTST_VALGRIND_NO_CD" == "" ]; then - cd "$TEST_PATH" - TEST="./$(basename "$TEST")" - fi -fi - -NMTST_DBUS_RUN_SESSION=() -if [ "$NMTST_LAUNCH_DBUS" == "yes" ]; then - if ! which dbus-run-session &>/dev/null ; then - eval `dbus-launch --sh-syntax` - trap "kill $DBUS_SESSION_BUS_PID" EXIT - else - NMTST_DBUS_RUN_SESSION=(dbus-run-session --) - fi -fi - -if [ "$NMTST_NO_VALGRIND" != "" ]; then - "$TEST" "$@" - exit $? -fi - -LOGFILE="${TEST}.valgrind-log" - -export G_SLICE=always-malloc -export G_DEBUG=gc-friendly -"${NMTST_DBUS_RUN_SESSION[@]}" \ -"${NMTST_LIBTOOL[@]}" "$NMTST_VALGRIND" \ - --quiet \ - --error-exitcode=$VALGRIND_ERROR \ - --leak-check=full \ - --gen-suppressions=all \ - --suppressions="$SUPPRESSIONS" \ - --num-callers=100 \ - --log-file="$LOGFILE" \ - "$TEST" \ - "$@" -RESULT=$? - -test -s "$LOGFILE" -HAS_ERRORS=$? - -if [ $RESULT -ne 0 -a $RESULT -ne 77 ]; then - if [ $HAS_ERRORS -ne 0 ]; then - rm -f "$LOGFILE" - elif [ $RESULT -ne $VALGRIND_ERROR ]; then - # the test (probably) didn't fail due to valgrind. - echo "The test failed. Also check the valgrind log at '`realpath "$LOGFILE"`'" >&2 - else - echo "valgrind failed! Check the log at '`realpath "$LOGFILE"`'" >&2 - UNRESOLVED=$(awk -F: '/obj:\// {print $NF}' "$LOGFILE" | sort | uniq) - if [ -n "$UNRESOLVED" ]; then - echo Some addresses could not be resolved into symbols. >&2 - echo The errors might get suppressed when you install the debuging symbols. >&2 - if [ -x /usr/bin/dnf ]; then - echo Hint: dnf debuginfo-install $UNRESOLVED >&2 - elif [ -x /usr/bin/debuginfo-install ]; then - echo Hint: debuginfo-install $UNRESOLVED >&2 - else - echo Files without debugging symbols: $UNRESOLVED >&2 - fi - fi - fi - exit $RESULT -fi - -if [ $HAS_ERRORS -eq 0 ]; then - # valgrind doesn't support setns syscall and spams the logfile. - # hack around it... - if [ "$(basename "$TEST")" = 'test-link-linux' -a -z "$(sed -e '/^--[0-9]\+-- WARNING: unhandled .* syscall: /,/^--[0-9]\+-- it at http.*\.$/d' "$LOGFILE")" ]; then - HAS_ERRORS=1 - fi -fi - -if [ $HAS_ERRORS -eq 0 ]; then - # shouldn't actually happen... - echo "valgrind succeeded, but log is not empty: '`realpath "$LOGFILE"`'" >&2 - exit 1 -fi - -rm -f "$LOGFILE" - -exit $RESULT diff --git a/vapi/Makefile.am b/vapi/Makefile.am deleted file mode 100644 index 4913d1a580..0000000000 --- a/vapi/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -EXTRA_DIST = \ - NetworkManager-1.0.metadata \ - NMClient-1.0.metadata \ - libnm-util.deps \ - libnm-glib.deps - -if WITH_LEGACY_LIBRARIES -VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi -endif - -if ENABLE_VAPIGEN -include Makefile.vapigen - -libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir libnm-util.deps NetworkManager-1.0.metadata -libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi - - -libnm_util_vapi_METADATADIRS = $(srcdir) -libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir - -libnm_glib_vapi_METADATADIRS = $(srcdir) -libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir -libnm_glib_vapi_VAPIDIRS = $(builddir) -libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util -libnm_glib_vapi_DEPS = gio-2.0 - -vapidir = $(datadir)/vala/vapi -vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) - -endif - -CLEANFILES = $(VAPIGEN_VAPIS)