|
 |
af4a053 |
From adfd0573a1d63272277e688dbd42f93fc56596ff Mon Sep 17 00:00:00 2001
|
|
|
af4a053 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
af4a053 |
Date: Wed, 21 Oct 2015 10:36:54 +0200
|
|
|
af4a053 |
Subject: [PATCH 04/10] nm: split the plugin into two halves
|
|
|
af4a053 |
|
|
|
af4a053 |
They're both the same now. We'll port the new one to libnm in follow-up commits.
|
|
|
af4a053 |
|
|
|
af4a053 |
NetworkManager 1.2 (which is currently versioned as 1.1.0) is going to bring
|
|
|
af4a053 |
some new ABI while still supporting the old one. There's new VPN service and UI
|
|
|
af4a053 |
plugin APIs in libnm.
|
|
|
af4a053 |
|
|
|
af4a053 |
There's one difficulty though -- the connection editor 1.2 will be linked
|
|
|
af4a053 |
against libnm and a new libnma library it will provide (as opposed to
|
|
|
af4a053 |
libnm-glib and libnm-gtk), thus will be incapable of loading of property
|
|
|
af4a053 |
plugins that are linked with the old libraries (due to glib type system
|
|
|
af4a053 |
limitations).
|
|
|
af4a053 |
|
|
|
af4a053 |
However, we must not break support for other connection editors (GNOME control
|
|
|
af4a053 |
center, older versions of nm-connection-editor, etc.) therefore we need
|
|
|
af4a053 |
to build two versions of the property plugin. NetworkManager 1.2's libnm will
|
|
|
af4a053 |
provide a shim that makes it easy.
|
|
|
af4a053 |
---
|
|
|
af4a053 |
properties/Makefile.am | 34 ++++++++++++++++++++++++++--------
|
|
|
af4a053 |
1 file changed, 26 insertions(+), 8 deletions(-)
|
|
|
af4a053 |
|
|
|
af4a053 |
diff --git a/properties/Makefile.am b/properties/Makefile.am
|
|
|
af4a053 |
index 1b7fbb9..8233ccb 100644
|
|
|
af4a053 |
--- a/properties/Makefile.am
|
|
|
af4a053 |
+++ b/properties/Makefile.am
|
|
|
af4a053 |
@@ -1,26 +1,44 @@
|
|
|
af4a053 |
plugindir = $(libdir)/NetworkManager
|
|
|
af4a053 |
-plugin_LTLIBRARIES = libnm-strongswan-properties.la
|
|
|
af4a053 |
+plugin_LTLIBRARIES = libnm-vpn-plugin-strongswan.la
|
|
|
af4a053 |
+plugin_LTLIBRARIES += libnm-strongswan-properties.la
|
|
|
af4a053 |
|
|
|
af4a053 |
-libnm_strongswan_properties_la_SOURCES = \
|
|
|
af4a053 |
+libnm_vpn_plugin_strongswan_la_SOURCES = \
|
|
|
af4a053 |
nm-strongswan.c \
|
|
|
af4a053 |
nm-strongswan.h
|
|
|
af4a053 |
|
|
|
af4a053 |
+libnm_strongswan_properties_la_SOURCES = \
|
|
|
af4a053 |
+ $(libnm_vpn_plugin_strongswan_la_SOURCES)
|
|
|
af4a053 |
+
|
|
|
af4a053 |
uidir = $(datadir)/gnome-vpn-properties/strongswan
|
|
|
af4a053 |
ui_DATA = nm-strongswan-dialog.ui
|
|
|
af4a053 |
|
|
|
af4a053 |
-libnm_strongswan_properties_la_CFLAGS = \
|
|
|
af4a053 |
+common_CFLAGS = \
|
|
|
af4a053 |
$(GTK_CFLAGS) \
|
|
|
af4a053 |
- $(NM_UTILS_CFLAGS) \
|
|
|
af4a053 |
-DUIDIR=\""$(uidir)"\" \
|
|
|
af4a053 |
-DG_DISABLE_DEPRECATED \
|
|
|
af4a053 |
- -DGDK_DISABLE_DEPRECATED \
|
|
|
af4a053 |
- -DVERSION=\"$(VERSION)\"
|
|
|
af4a053 |
+ -DGDK_DISABLE_DEPRECATED
|
|
|
af4a053 |
+
|
|
|
af4a053 |
+libnm_vpn_plugin_strongswan_la_CFLAGS = \
|
|
|
af4a053 |
+ $(NM_UTILS_CFLAGS) \
|
|
|
af4a053 |
+ $(common_CFLAGS)
|
|
|
af4a053 |
|
|
|
af4a053 |
-libnm_strongswan_properties_la_LIBADD = \
|
|
|
af4a053 |
+libnm_strongswan_properties_la_CFLAGS = \
|
|
|
af4a053 |
+ -DNM_STRONGSWAN_OLD \
|
|
|
af4a053 |
+ $(NM_UTILS_CFLAGS) \
|
|
|
af4a053 |
+ $(common_CFLAGS)
|
|
|
af4a053 |
+
|
|
|
af4a053 |
+libnm_vpn_plugin_strongswan_la_LIBADD = \
|
|
|
af4a053 |
$(GTK_LIBS) \
|
|
|
af4a053 |
$(NM_UTILS_LIBS)
|
|
|
af4a053 |
|
|
|
af4a053 |
-libnm_strongswan_properties_la_LDFLAGS = \
|
|
|
af4a053 |
+libnm_strongswan_properties_la_LIBADD = \
|
|
|
af4a053 |
+ $(GTK_LIBS) \
|
|
|
af4a053 |
+ $(NM_UTILS_LIBS)
|
|
|
af4a053 |
+
|
|
|
af4a053 |
+libnm_vpn_plugin_strongswan_la_LDFLAGS = \
|
|
|
af4a053 |
-avoid-version
|
|
|
af4a053 |
|
|
|
af4a053 |
+libnm_strongswan_properties_la_LDFLAGS = \
|
|
|
af4a053 |
+ $(libnm_vpn_plugin_strongswan_la_LDFLAGS)
|
|
|
af4a053 |
+
|
|
|
af4a053 |
EXTRA_DIST = $(ui_DATA)
|
|
|
af4a053 |
--
|
|
|
af4a053 |
2.4.3
|
|
|
af4a053 |
|