[network-manager-openconnect/lr/libnm: 1/9] build: split the plugin into two halves

[Lubomir Rintel <lkundrak src gnome org>]

commit c80a63c264516ac207340a725924d6ee2566fea2
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Jul 24 17:30:24 2015 +0200

    build: split the plugin into two halves
    
    They're both the same now. We'll later port the new one to libnm.

 nm-openconnect-service.name.in |    3 +++
 properties/Makefile.am         |   31 +++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/nm-openconnect-service.name.in b/nm-openconnect-service.name.in
index 992837a..943b1ec 100644
--- a/nm-openconnect-service.name.in
+++ b/nm-openconnect-service.name.in
@@ -3,6 +3,9 @@ name=openconnect
 service=org.freedesktop.NetworkManager.openconnect
 program= LIBEXECDIR@/nm-openconnect-service
 
+[libnm]
+plugin= PLUGINDIR@/libnm-vpn-plugin-openconnect.so
+
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openconnect-auth-dialog
 properties= PLUGINDIR@/libnm-openconnect-properties
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 885cb24..bc154f8 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,21 +1,23 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openconnect-properties.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-openconnect.la libnm-openconnect-properties.la
 
-libnm_openconnect_properties_la_SOURCES = \
+libnm_vpn_plugin_openconnect_la_SOURCES = \
        auth-helpers.c \
        auth-helpers.h \
        nm-openconnect.c \
        nm-openconnect.h
 
+libnm_openconnect_properties_la_SOURCES = \
+       $(libnm_vpn_plugin_openconnect_la_SOURCES)
+
 uidir = $(datadir)/gnome-vpn-properties/openconnect
 ui_DATA = nm-openconnect-dialog.ui
 
-libnm_openconnect_properties_la_CFLAGS =                \
+common_CFLAGS =                                         \
        $(GLIB_CFLAGS)                                  \
        $(GTK_CFLAGS)                                   \
-       $(NM_CFLAGS)                                    \
        $(OPENCONNECT_CFLAGS)                           \
-       -I$(top_srcdir)/src                             \
+       -I$(top_srcdir)/src                             \
        -DICONDIR=\""$(datadir)/pixmaps"\"              \
        -DUIDIR=\""$(uidir)"\"                          \
        -DG_DISABLE_DEPRECATED                          \
@@ -23,14 +25,31 @@ libnm_openconnect_properties_la_CFLAGS =                \
        -DLOCALEDIR=\"$(datadir)/locale\"               \
        -DVERSION=\"$(VERSION)\"
 
+libnm_vpn_plugin_openconnect_la_CFLAGS =                \
+       $(common_CFLAGS)                                \
+       $(NM_CFLAGS)
+
+libnm_openconnect_properties_la_CFLAGS =            \
+       -DNM_OPENCONNECT_OLD                            \
+       $(common_CFLAGS)                                \
+       $(NM_CFLAGS)
+
+libnm_vpn_plugin_openconnect_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(NM_LIBS) \
+       $(OPENCONNECT_LIBS)
+
 libnm_openconnect_properties_la_LIBADD = \
        $(GTK_LIBS) \
        $(NM_LIBS) \
        $(OPENCONNECT_LIBS)
 
-libnm_openconnect_properties_la_LDFLAGS = \
+libnm_vpn_plugin_openconnect_la_LDFLAGS = \
        -avoid-version
 
+libnm_openconnect_properties_la_LDFLAGS = \
+       $(libnm_vpn_plugin_openconnect_la_LDFLAGS)
+
 CLEANFILES = *.bak *~
 
 EXTRA_DIST =                            \