[network-manager-vpnc/th/vpn-editor-split-bgo766170: 14/20] properties: add linker version script to libnm plugin
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-vpnc/th/vpn-editor-split-bgo766170: 14/20] properties: add linker version script to libnm plugin
- Date: Tue, 10 May 2016 14:44:10 +0000 (UTC)
commit 4865214b83d5f07ba9ba98e2ab8b4d523e972b48
Author: Thomas Haller <thaller redhat com>
Date: Mon May 9 12:42:21 2016 +0200
properties: add linker version script to libnm plugin
properties/Makefile.am | 107 ++++++++++++++++++++++------------
properties/libnm-vpn-plugin-vpnc.ver | 6 ++
properties/libnm-vpnc-properties.ver | 6 ++
properties/tests/Makefile.am | 4 +-
4 files changed, 83 insertions(+), 40 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 348f5f3..619646d 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -6,56 +6,87 @@ if WITH_LIBNM_GLIB
plugin_LTLIBRARIES += libnm-vpnc-properties.la
endif
-libnm_vpn_plugin_vpnc_la_SOURCES = \
- nm-vpnc-editor-plugin.c \
- nm-vpnc-editor-plugin.h \
- nm-vpnc.c \
- nm-vpnc.h \
- nm-vpnc-helper.c \
- nm-vpnc-helper.h
-
-libnm_vpnc_properties_la_SOURCES = \
- $(libnm_vpn_plugin_vpnc_la_SOURCES)
-
uidir = $(datadir)/gnome-vpn-properties/vpnc
ui_DATA = nm-vpnc-dialog.ui
common_CFLAGS = \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- -I"$(top_srcdir)/shared/" \
- -DICONDIR=\""$(datadir)/pixmaps"\" \
- -DUIDIR=\""$(uidir)"\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ -I"$(top_srcdir)/shared/" \
+ -DICONDIR=\""$(datadir)/pixmaps"\" \
+ -DUIDIR=\""$(uidir)"\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB
-libnm_vpn_plugin_vpnc_la_CFLAGS = \
- $(common_CFLAGS) \
- $(LIBNM_CFLAGS) \
- $(LIBNMA_CFLAGS)
+###############################################################################
-libnm_vpnc_properties_la_CFLAGS = \
- -DNM_VPNC_OLD \
- $(common_CFLAGS) \
- $(LIBNM_GLIB_CFLAGS) \
- $(LIBNM_GTK_CFLAGS)
+libnm_vpn_plugin_vpnc_la_SOURCES = \
+ nm-vpnc-editor-plugin.c \
+ nm-vpnc-editor-plugin.h \
+ nm-vpnc.c \
+ nm-vpnc.h \
+ nm-vpnc-helper.c \
+ nm-vpnc-helper.h
-libnm_vpn_plugin_vpnc_la_LIBADD = \
- $(GTK_LIBS) \
- $(LIBNM_LIBS) \
- $(LIBNMA_LIBS)
+libnm_vpn_plugin_vpnc_la_CFLAGS = \
+ $(common_CFLAGS) \
+ $(LIBNM_CFLAGS) \
+ $(LIBNMA_CFLAGS)
-libnm_vpnc_properties_la_LIBADD = \
- $(GTK_LIBS) \
- $(LIBNM_GLIB_LIBS) \
- $(LIBNM_GTK_LIBS)
+libnm_vpn_plugin_vpnc_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(LIBNM_LIBS) \
+ $(LIBNMA_LIBS)
libnm_vpn_plugin_vpnc_la_LDFLAGS = \
- -avoid-version
+ -avoid-version \
+ -Wl,--version-script=$(srcdir)/libnm-vpn-plugin-vpnc.ver
+
+###############################################################################
+
+libnm_vpnc_properties_la_SOURCES = \
+ $(libnm_vpn_plugin_vpnc_la_SOURCES)
+
+libnm_vpnc_properties_la_CFLAGS = \
+ -DNM_VPNC_OLD \
+ $(common_CFLAGS) \
+ $(LIBNM_GLIB_CFLAGS) \
+ $(LIBNM_GTK_CFLAGS)
+
+libnm_vpnc_properties_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(LIBNM_GLIB_LIBS) \
+ $(LIBNM_GTK_LIBS)
libnm_vpnc_properties_la_LDFLAGS = \
- $(libnm_vpn_plugin_vpnc_la_LDFLAGS)
+ -avoid-version \
+ -Wl,--version-script=$(srcdir)/libnm-vpnc-properties.ver
+
+###############################################################################
+
+libnm_vpn_plugin_vpnc_test_la_SOURCES = $(libnm_vpn_plugin_vpnc_la_SOURCES)
+libnm_vpn_plugin_vpnc_test_la_CFLAGS = $(libnm_vpn_plugin_vpnc_la_CFLAGS)
+libnm_vpn_plugin_vpnc_test_la_LIBADD = $(libnm_vpn_plugin_vpnc_la_LIBADD)
+libnm_vpn_plugin_vpnc_test_la_LDFLAGS = \
+ -avoid-version
+
+libnm_vpnc_properties_test_la_SOURCES = $(libnm_vpnc_properties_la_SOURCES)
+libnm_vpnc_properties_test_la_CFLAGS = $(libnm_vpnc_properties_la_CFLAGS)
+libnm_vpnc_properties_test_la_LIBADD = $(libnm_vpnc_properties_la_LIBADD)
+libnm_vpnc_properties_test_la_LDFLAGS = \
+ -avoid-version
+
+###############################################################################
+
+noinst_LTLIBRARIES = \
+ libnm-vpn-plugin-vpnc-test.la
+if WITH_LIBNM_GLIB
+noinst_LTLIBRARIES += libnm-vpnc-properties-test.la
+endif
CLEANFILES = *.bak *~
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = \
+ libnm-vpn-plugin-vpnc.ver \
+ libnm-vpnc-properties.ver \
+ $(ui_DATA)
diff --git a/properties/libnm-vpn-plugin-vpnc.ver b/properties/libnm-vpn-plugin-vpnc.ver
new file mode 100644
index 0000000..92a7b14
--- /dev/null
+++ b/properties/libnm-vpn-plugin-vpnc.ver
@@ -0,0 +1,6 @@
+{
+global:
+ nm_vpn_editor_plugin_factory;
+local:
+ *;
+};
diff --git a/properties/libnm-vpnc-properties.ver b/properties/libnm-vpnc-properties.ver
new file mode 100644
index 0000000..271c506
--- /dev/null
+++ b/properties/libnm-vpnc-properties.ver
@@ -0,0 +1,6 @@
+{
+global:
+ nm_vpn_plugin_ui_factory;
+local:
+ *;
+};
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 1275dbf..db74617 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-vpnc.la
+ $(top_builddir)/properties/libnm-vpn-plugin-vpnc-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-vpnc-properties.la
+ $(top_builddir)/properties/libnm-vpnc-properties-test.la
TESTS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]