diff --git a/Makefile.am b/Makefile.am index a79bddca3d..0d52b008ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,7 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ + linker-script-settings.ver \ Makefile.glib \ autogen.sh \ valgrind.suppressions diff --git a/linker-script-settings.ver b/linker-script-settings.ver new file mode 100644 index 0000000000..fef67e8775 --- /dev/null +++ b/linker-script-settings.ver @@ -0,0 +1,6 @@ +{ +global: + nm_settings_plugin_factory; +local: + *; +}; diff --git a/src/settings/plugins/ibft/Makefile.am b/src/settings/plugins/ibft/Makefile.am index 369d64443a..ece08dc358 100644 --- a/src/settings/plugins/ibft/Makefile.am +++ b/src/settings/plugins/ibft/Makefile.am @@ -37,7 +37,8 @@ libnm_settings_plugin_ibft_la_SOURCES = \ nms-ibft-connection.h libnm_settings_plugin_ibft_la_LDFLAGS = \ - -module -avoid-version + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" libnm_settings_plugin_ibft_la_LIBADD = \ libnms-ibft-core.la diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am index 37f0716ada..8308f739b8 100644 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/Makefile.am @@ -11,12 +11,6 @@ noinst_LTLIBRARIES = \ libnmdbus-ifcfg-rh.la \ libnms-ifcfg-rh-core.la -BUILT_SOURCES = \ - nmdbus-ifcfg-rh.h \ - nmdbus-ifcfg-rh.c - -############################################################################### - AM_CPPFLAGS = \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/platform \ @@ -32,6 +26,10 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" +BUILT_SOURCES = \ + nmdbus-ifcfg-rh.h \ + nmdbus-ifcfg-rh.c + ############################################################################### nodist_libnmdbus_ifcfg_rh_la_SOURCES = \ @@ -72,7 +70,8 @@ libnm_settings_plugin_ifcfg_rh_la_SOURCES = \ nms-ifcfg-rh-plugin.h libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ - -module -avoid-version + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ libnms-ifcfg-rh-core.la \ diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am index 207c95f8ae..c3e0dee41f 100644 --- a/src/settings/plugins/ifnet/Makefile.am +++ b/src/settings/plugins/ifnet/Makefile.am @@ -4,6 +4,12 @@ SUBDIRS = . tests 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 \ @@ -18,12 +24,6 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\"$(sysconfdir)\" -DSBINDIR=\"$(sbindir)\" -pkglib_LTLIBRARIES = \ - libnm-settings-plugin-ifnet.la - -noinst_LTLIBRARIES = \ - libnms-ifnet-core.la - ############################################################################### libnms_ifnet_core_la_SOURCES = \ @@ -45,7 +45,8 @@ libnm_settings_plugin_ifnet_la_SOURCES = \ nms-ifnet-plugin.h libnm_settings_plugin_ifnet_la_LDFLAGS = \ - -module -avoid-version + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" libnm_settings_plugin_ifnet_la_LIBADD = \ libnms-ifnet-core.la diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am index 0050aa8657..547834ff6a 100644 --- a/src/settings/plugins/ifupdown/Makefile.am +++ b/src/settings/plugins/ifupdown/Makefile.am @@ -4,6 +4,12 @@ SUBDIRS = . tests 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 \ @@ -17,12 +23,6 @@ AM_CPPFLAGS = \ $(GUDEV_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" -pkglib_LTLIBRARIES = \ - libnm-settings-plugin-ifupdown.la - -noinst_LTLIBRARIES = \ - libnms-ifupdown-core.la - ############################################################################### libnms_ifupdown_core_la_SOURCES = \ @@ -40,7 +40,8 @@ libnm_settings_plugin_ifupdown_la_SOURCES = \ nms-ifupdown-plugin.h libnm_settings_plugin_ifupdown_la_LDFLAGS = \ - -module -avoid-version + -module -avoid-version \ + -Wl,--version-script="$(top_srcdir)/linker-script-settings.ver" libnm_settings_plugin_ifupdown_la_LIBADD = \ libnms-ifupdown-core.la