[network-manager-openvpn] build: add symbol version file for shared library of vpn plugin



commit 84d463fed3a523e7d5c351edf28d7c9eae28c820
Author: Thomas Haller <thaller redhat com>
Date:   Mon Apr 18 01:06:57 2016 +0200

    build: add symbol version file for shared library of vpn plugin

 properties/Makefile.am                  |   52 +++++++++++++++++++++++--------
 properties/libnm-openvpn-properties.ver |    6 +++
 properties/libnm-vpn-plugin-openvpn.ver |    6 +++
 properties/tests/Makefile.am            |    4 +-
 4 files changed, 53 insertions(+), 15 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 726db2e..9a98370 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -6,16 +6,19 @@ if WITH_LIBNM_GLIB
 plugin_LTLIBRARIES += libnm-openvpn-properties.la
 endif
 
-libnm_vpn_plugin_openvpn_la_SOURCES =                   \
-        nm-openvpn.c                                    \
-        nm-openvpn.h                                    \
-        auth-helpers.c                                  \
-        auth-helpers.h                                  \
-        import-export.c                                 \
+plugin_sources = \
+        nm-openvpn.c \
+        nm-openvpn.h \
+        auth-helpers.c \
+        auth-helpers.h \
+        import-export.c \
         import-export.h
 
-libnm_openvpn_properties_la_SOURCES =               \
-        $(libnm_vpn_plugin_openvpn_la_SOURCES)
+libnm_vpn_plugin_openvpn_la_SOURCES = \
+        $(plugin_sources)
+
+libnm_openvpn_properties_la_SOURCES = \
+        $(plugin_sources)
 
 uidir = $(datadir)/gnome-vpn-properties/openvpn
 ui_DATA = nm-openvpn-dialog.ui
@@ -52,13 +55,36 @@ libnm_openvpn_properties_la_LIBADD =                \
         $(LIBNM_GTK_LIBS)                               \
         $(top_builddir)/shared/libnm-openvpn-shared.la
 
-libnm_vpn_plugin_openvpn_la_LDFLAGS =                   \
-        -avoid-version
+libnm_vpn_plugin_openvpn_la_LDFLAGS = \
+        -avoid-version \
+        -Wl,--version-script=libnm-vpn-plugin-openvpn.ver
+
+libnm_openvpn_properties_la_LDFLAGS = \
+        -avoid-version \
+        -Wl,--version-script=libnm-openvpn-properties.ver
 
-libnm_openvpn_properties_la_LDFLAGS =               \
-        $(libnm_vpn_plugin_openvpn_la_LDFLAGS)
+libnm_vpn_plugin_openvpn_test_la_SOURCES = $(libnm_vpn_plugin_openvpn_la_SOURCES)
+libnm_vpn_plugin_openvpn_test_la_CFLAGS = $(libnm_vpn_plugin_openvpn_la_CFLAGS)
+libnm_vpn_plugin_openvpn_test_la_LIBADD = $(libnm_vpn_plugin_openvpn_la_LIBADD)
+libnm_vpn_plugin_openvpn_test_la_LDFLAGS = \
+    -avoid-version
+
+libnm_openvpn_properties_test_la_SOURCES = $(libnm_openvpn_properties_la_SOURCES)
+libnm_openvpn_properties_test_la_CFLAGS = $(libnm_openvpn_properties_la_CFLAGS)
+libnm_openvpn_properties_test_la_LIBADD = $(libnm_openvpn_properties_la_LIBADD)
+libnm_openvpn_properties_test_la_LDFLAGS = \
+    -avoid-version
+
+noinst_LTLIBRARIES = \
+    libnm-vpn-plugin-openvpn-test.la
+if WITH_LIBNM_GLIB
+noinst_LTLIBRARIES += libnm-openvpn-properties-test.la
+endif
 
 CLEANFILES = *.bak *~
 
-EXTRA_DIST =                            \
+EXTRA_DIST = \
+        libnm-vpn-plugin-openvpn.ver \
+        libnm-openvpn-properties.ver \
         $(ui_DATA)
+
diff --git a/properties/libnm-openvpn-properties.ver b/properties/libnm-openvpn-properties.ver
new file mode 100644
index 0000000..271c506
--- /dev/null
+++ b/properties/libnm-openvpn-properties.ver
@@ -0,0 +1,6 @@
+{
+global:
+       nm_vpn_plugin_ui_factory;
+local:
+       *;
+};
diff --git a/properties/libnm-vpn-plugin-openvpn.ver b/properties/libnm-vpn-plugin-openvpn.ver
new file mode 100644
index 0000000..92a7b14
--- /dev/null
+++ b/properties/libnm-vpn-plugin-openvpn.ver
@@ -0,0 +1,6 @@
+{
+global:
+       nm_vpn_editor_plugin_factory;
+local:
+       *;
+};
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 7eecb26..62a991a 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -27,7 +27,7 @@ test_import_export_LDADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS) \
        $(LIBNMA_LIBS) \
-       $(top_builddir)/properties/libnm-vpn-plugin-openvpn.la
+       $(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la
 
 
 test_import_export_glib_SOURCES = \
@@ -45,7 +45,7 @@ test_import_export_glib_LDADD = \
        $(GTK_LIBS) \
        $(LIBNM_GLIB_LIBS) \
        $(LIBNM_GTK_LIBS) \
-       $(top_builddir)/properties/libnm-openvpn-properties.la
+       $(top_builddir)/properties/libnm-openvpn-properties-test.la
 
 
 TESTS = \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]