devices/build: use one linker-script-devices.ver for all device plugins

12 files changed, 16 insertions, 57 deletions

diff --git a/Makefile.am b/Makefile.am
index 80eade9459..170ca656d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ EXTRA_DIST = \
 	intltool-merge.in \
 	intltool-update.in \
 	linker-script-binary.ver \
+	linker-script-devices.ver \
 	linker-script-settings.ver \
 	Makefile.glib \
 	autogen.sh \
diff --git a/src/devices/adsl/exports.ver b/linker-script-devices.ver
index 24cd848ce1..24cd848ce1 100644
--- a/src/devices/adsl/exports.ver
+++ b/linker-script-devices.ver
diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
index bf7f974275..573f19a8c3 100644
--- a/src/devices/adsl/Makefile.am
+++ b/src/devices/adsl/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
 
 pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la
 
-SYMBOL_VIS_FILE=$(srcdir)/exports.ver
-
 libnm_device_plugin_adsl_la_SOURCES = \
 	nm-atm-manager.c \
 	nm-device-adsl.c \
@@ -29,14 +27,12 @@ libnm_device_plugin_adsl_la_SOURCES = \
 
 libnm_device_plugin_adsl_la_LDFLAGS = \
 	-module -avoid-version \
-	-Wl,--version-script=$(SYMBOL_VIS_FILE)
+	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
 
 libnm_device_plugin_adsl_la_LIBADD = \
 	$(top_builddir)/introspection/libnmdbus.la \
 	$(GUDEV_LIBS)
 
-EXTRA_DIST = $(SYMBOL_VIS_FILE)
-
 check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-adsl.so $(SYMBOL_VIS_FILE)
+	$(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/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am
index d1a833a3c5..79418558fe 100644
--- a/src/devices/bluetooth/Makefile.am
+++ b/src/devices/bluetooth/Makefile.am
@@ -29,8 +29,6 @@ BUILT_SOURCES = $(GLIB_GENERATED)
 
 pkglib_LTLIBRARIES = libnm-device-plugin-bluetooth.la
 
-SYMBOL_VIS_FILE=$(srcdir)/exports.ver
-
 libnm_device_plugin_bluetooth_la_SOURCES = \
 	nm-bluez-manager.c \
 	nm-bluez-common.h \
@@ -52,7 +50,7 @@ libnm_device_plugin_bluetooth_la_SOURCES = \
 
 libnm_device_plugin_bluetooth_la_LDFLAGS = \
 	-module -avoid-version \
-	-Wl,--version-script=$(SYMBOL_VIS_FILE)
+	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
 
 libnm_device_plugin_bluetooth_la_LIBADD = \
 	$(top_builddir)/introspection/libnmdbus.la \
@@ -71,8 +69,7 @@ libnm_device_plugin_bluetooth_la_LIBADD += $(BLUEZ5_LIBS)
 endif
 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(SYMBOL_VIS_FILE)
 
 check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-bluetooth.so $(SYMBOL_VIS_FILE)
+	$(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/bluetooth/exports.ver b/src/devices/bluetooth/exports.ver
deleted file mode 100644
index 24cd848ce1..0000000000
--- a/src/devices/bluetooth/exports.ver
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-global:
-	nm_device_factory_create;
-local:
-	*;
-};
diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am
index 350cf0c7c4..2810c494c0 100644
--- a/src/devices/team/Makefile.am
+++ b/src/devices/team/Makefile.am
@@ -25,8 +25,6 @@ endif
 
 pkglib_LTLIBRARIES = libnm-device-plugin-team.la
 
-SYMBOL_VIS_FILE=$(srcdir)/exports.ver
-
 libnm_device_plugin_team_la_SOURCES = \
 	nm-team-factory.c \
 	nm-device-team.c \
@@ -34,7 +32,7 @@ libnm_device_plugin_team_la_SOURCES = \
 
 libnm_device_plugin_team_la_LDFLAGS = \
 	-module -avoid-version \
-	-Wl,--version-script=$(SYMBOL_VIS_FILE)
+	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
 
 libnm_device_plugin_team_la_LIBADD = \
 	$(top_builddir)/introspection/libnmdbus.la \
@@ -45,8 +43,6 @@ if WITH_TEAMDCTL
 libnm_device_plugin_team_la_LIBADD += $(LIBTEAMDCTL_LIBS)
 endif
 
-EXTRA_DIST = $(SYMBOL_VIS_FILE)
-
 check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-team.so $(SYMBOL_VIS_FILE)
+	$(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/exports.ver b/src/devices/team/exports.ver
deleted file mode 100644
index 24cd848ce1..0000000000
--- a/src/devices/team/exports.ver
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-global:
-	nm_device_factory_create;
-local:
-	*;
-};
diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index 72863bc4a6..45c0ef7399 100644
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -35,19 +35,15 @@ libnm_device_plugin_wifi_la_SOURCES = \
 	nm-device-olpc-mesh.c \
 	nm-device-olpc-mesh.h
 
-SYMBOL_VIS_FILE=$(srcdir)/exports.ver
-
 libnm_device_plugin_wifi_la_LDFLAGS = \
 	-module -avoid-version \
-	 -Wl,--version-script=$(SYMBOL_VIS_FILE)
+	 -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
 
 libnm_device_plugin_wifi_la_LIBADD = \
 	$(top_builddir)/introspection/libnmdbus.la \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS)
 
-EXTRA_DIST = $(SYMBOL_VIS_FILE)
-
 check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wifi.so $(SYMBOL_VIS_FILE)
+	$(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/exports.ver b/src/devices/wifi/exports.ver
deleted file mode 100644
index 24cd848ce1..0000000000
--- a/src/devices/wifi/exports.ver
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-global:
-	nm_device_factory_create;
-local:
-	*;
-};
diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am
index a118a5545c..8efd9a27d2 100644
--- a/src/devices/wwan/Makefile.am
+++ b/src/devices/wwan/Makefile.am
@@ -51,11 +51,9 @@ libnm_wwan_la_SOURCES += \
 	$(NULL)
 endif
 
-WWAN_SYMBOL_VIS_FILE=$(srcdir)/wwan-exports.ver
-
 libnm_wwan_la_LDFLAGS = \
 	-avoid-version \
-	-Wl,--version-script=$(WWAN_SYMBOL_VIS_FILE)
+	-Wl,--version-script="$(srcdir)/libnm-wwan.ver"
 libnm_wwan_la_LIBADD = \
 	$(top_builddir)/introspection/libnmdbus.la \
 	$(GLIB_LIBS) \
@@ -64,8 +62,6 @@ libnm_wwan_la_LIBADD = \
 
 ###########################################################
 
-SYMBOL_VIS_FILE=$(srcdir)/exports.ver
-
 libnm_device_plugin_wwan_la_SOURCES = \
 	nm-wwan-factory.c \
 	nm-device-modem.c \
@@ -73,7 +69,7 @@ libnm_device_plugin_wwan_la_SOURCES = \
 
 libnm_device_plugin_wwan_la_LDFLAGS = \
 	-module -avoid-version \
-	-Wl,--version-script=$(SYMBOL_VIS_FILE)
+	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
 
 libnm_device_plugin_wwan_la_LIBADD = \
 	$(top_builddir)/introspection/libnmdbus.la \
@@ -83,11 +79,12 @@ libnm_device_plugin_wwan_la_LIBADD = \
 ###########################################################
 
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(SYMBOL_VIS_FILE) $(WWAN_SYMBOL_VIS_FILE)
+
+EXTRA_DIST = \
+	libnm-wwan.ver
 
 check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wwan.so $(SYMBOL_VIS_FILE)
+	$(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 $(WWAN_SYMBOL_VIS_FILE)
+	$(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/devices/wwan/exports.ver b/src/devices/wwan/exports.ver
deleted file mode 100644
index 24cd848ce1..0000000000
--- a/src/devices/wwan/exports.ver
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-global:
-	nm_device_factory_create;
-local:
-	*;
-};
diff --git a/src/devices/wwan/wwan-exports.ver b/src/devices/wwan/libnm-wwan.ver
index 23412de627..23412de627 100644
--- a/src/devices/wwan/wwan-exports.ver
+++ b/src/devices/wwan/libnm-wwan.ver