colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Haller
2016-10-13 13:02:49 +02:00
parent a8284c57f9
commit 92f4185575
12 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -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 \

0
src/devices/adsl/exports.ver → linker-script-devices.ver
View File

8
src/devices/adsl/Makefile.am
View File

@@ -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)

7
src/devices/bluetooth/Makefile.am
View File

@@ -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)

6
src/devices/bluetooth/exports.ver
View File

@@ -1,6 +0,0 @@
{
global:
nm_device_factory_create;
local:
*;
};

8
src/devices/team/Makefile.am
View File

@@ -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)

6
src/devices/team/exports.ver
View File

@@ -1,6 +0,0 @@
{
global:
nm_device_factory_create;
local:
*;
};

8
src/devices/wifi/Makefile.am
View File

@@ -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)

6
src/devices/wifi/exports.ver
View File

@@ -1,6 +0,0 @@
{
global:
nm_device_factory_create;
local:
*;
};

17
src/devices/wwan/Makefile.am
View File

@@ -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)

6
src/devices/wwan/exports.ver
View File

@@ -1,6 +0,0 @@
{
global:
nm_device_factory_create;
local:
*;
};

0
src/devices/wwan/wwan-exports.ver → src/devices/wwan/libnm-wwan.ver
View File