diff options
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/Makefile.am | 12 | ||||
| -rw-r--r-- | libnm-glib/Makefile.in | 46 | ||||
| -rw-r--r-- | libnm-glib/libnm-glib.ver | 26 |
3 files changed, 43 insertions, 41 deletions
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 0c5fa137f..165977cfa 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -129,7 +129,9 @@ libnm_glib_la_LIBADD = \ $(DBUS_LIBS) \ $(GUDEV_LIBS) -libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \ +SYMBOL_VIS_FILE=$(srcdir)/libnm-glib.ver + +libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ -version-info "6:3:4" noinst_PROGRAMS = libnm-glib-test @@ -208,3 +210,11 @@ 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) + +if WITH_TESTS + +check-local: + $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE) + +endif + diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in index 822974dc4..be259d7e7 100644 --- a/libnm-glib/Makefile.in +++ b/libnm-glib/Makefile.in @@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -491,7 +491,8 @@ libnm_glib_la_LIBADD = \ $(DBUS_LIBS) \ $(GUDEV_LIBS) -libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \ +SYMBOL_VIS_FILE = $(srcdir)/libnm-glib.ver +libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ -version-info "6:3:4" libnm_glib_test_SOURCES = libnm-glib-test.c @@ -1055,7 +1056,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done +@WITH_TESTS_FALSE@check-local: check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) @@ -1164,24 +1167,24 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES uninstall-libnmincludeHEADERS \ uninstall-pkgconfigDATA -.MAKE: all check install install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-libnmincludeHEADERS install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-libnmincludeHEADERS \ - uninstall-pkgconfigDATA +.MAKE: all check check-am install install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libnmincludeHEADERS install-man \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libnmincludeHEADERS uninstall-pkgconfigDATA nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml @@ -1238,6 +1241,9 @@ nm-ip6-config-bindings.h: $(top_srcdir)/introspection/nm-ip6-config.xml nm-dhcp6-config-bindings.h: $(top_srcdir)/introspection/nm-dhcp6-config.xml $(AM_V_GEN) dbus-binding-tool --prefix=nm_dhcp6_config --mode=glib-client --output=$@ $< +@WITH_TESTS_TRUE@check-local: +@WITH_TESTS_TRUE@ $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libnm-glib/libnm-glib.ver b/libnm-glib/libnm-glib.ver index 22fc0e240..69c07a647 100644 --- a/libnm-glib/libnm-glib.ver +++ b/libnm-glib/libnm-glib.ver @@ -17,8 +17,8 @@ global: nm_access_point_get_wpa_flags; nm_access_point_new; nm_active_connection_get_connection; - nm_active_connection_get_default; nm_active_connection_get_default6; + nm_active_connection_get_default; nm_active_connection_get_devices; nm_active_connection_get_scope; nm_active_connection_get_service_name; @@ -47,20 +47,12 @@ global: nm_client_wwan_get_enabled; nm_client_wwan_hardware_get_enabled; nm_client_wwan_set_enabled; - nm_dbus_settings_get_connection_by_path; - nm_dbus_settings_get_type; - nm_dbus_settings_new; - nm_dbus_settings_system_add_connection; - nm_dbus_settings_system_get_can_modify; - nm_dbus_settings_system_get_type; - nm_dbus_settings_system_get_unmanaged_devices; - nm_dbus_settings_system_new; - nm_device_disconnect; - nm_device_bt_new; nm_device_bt_get_capabilities; nm_device_bt_get_hw_address; nm_device_bt_get_name; nm_device_bt_get_type; + nm_device_bt_new; + nm_device_disconnect; nm_device_ethernet_get_carrier; nm_device_ethernet_get_hw_address; nm_device_ethernet_get_permanent_hw_address; @@ -88,8 +80,8 @@ global: nm_device_wifi_get_bitrate; nm_device_wifi_get_capabilities; nm_device_wifi_get_hw_address; - nm_device_wifi_get_permanent_hw_address; nm_device_wifi_get_mode; + nm_device_wifi_get_permanent_hw_address; nm_device_wifi_get_type; nm_device_wifi_new; nm_dhcp4_config_get_one_option; @@ -100,7 +92,6 @@ global: nm_dhcp6_config_get_options; nm_dhcp6_config_get_type; nm_dhcp6_config_new; - nm_exported_connection_export; nm_exported_connection_get_type; nm_exported_connection_new; nm_gsm_device_get_type; @@ -109,9 +100,9 @@ global: nm_ip4_config_get_domains; nm_ip4_config_get_hostname; nm_ip4_config_get_nameservers; - nm_ip4_config_get_wins_servers; nm_ip4_config_get_routes; nm_ip4_config_get_type; + nm_ip4_config_get_wins_servers; nm_ip4_config_new; nm_ip6_address_array_get_type; nm_ip6_address_object_array_get_type; @@ -150,14 +141,9 @@ global: nm_settings_service_export_connection; nm_settings_service_get_connection_by_path; nm_settings_service_get_type; - nm_settings_system_interface_get_type; - nm_settings_system_interface_add_connection; nm_settings_system_interface_get_permissions; + nm_settings_system_interface_get_type; nm_settings_system_interface_save_hostname; - nm_settings_error_quark; - nm_settings_get_type; - nm_settings_list_connections; - nm_settings_signal_new_connection; nm_ssid_get_type; nm_string_array_get_type; nm_uint_array_get_type; |