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

[Lubomir Rintel <lkundrak src gnome org>]

commit d90e4efd9b35484e0614192cc95d0d2172d9fe21
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Jul 16 15:36:12 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 |    5 ++++-
 properties/Makefile.am         |   39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 6 deletions(-)
---
diff --git a/nm-openconnect-service.name.in b/nm-openconnect-service.name.in
index 992837a..ad74b19 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]
+properties= PLUGINDIR@/libnm-openvpn-properties-new
+
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openconnect-auth-dialog
-properties= PLUGINDIR@/libnm-openconnect-properties
+properties= PLUGINDIR@/libnm-openconnect-properties-old
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 885cb24..3c45d17 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,7 +1,13 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openconnect-properties.la
+plugin_LTLIBRARIES = libnm-openconnect-properties-new.la libnm-openconnect-properties-old.la
 
-libnm_openconnect_properties_la_SOURCES = \
+libnm_openconnect_properties_new_la_SOURCES = \
+       auth-helpers.c \
+       auth-helpers.h \
+       nm-openconnect.c \
+       nm-openconnect.h
+
+libnm_openconnect_properties_old_la_SOURCES = \
        auth-helpers.c \
        auth-helpers.h \
        nm-openconnect.c \
@@ -10,7 +16,8 @@ libnm_openconnect_properties_la_SOURCES = \
 uidir = $(datadir)/gnome-vpn-properties/openconnect
 ui_DATA = nm-openconnect-dialog.ui
 
-libnm_openconnect_properties_la_CFLAGS =                \
+libnm_openconnect_properties_new_la_CFLAGS =            \
+       -DNM_OPENCONNECT_NEW                            \
        $(GLIB_CFLAGS)                                  \
        $(GTK_CFLAGS)                                   \
        $(NM_CFLAGS)                                    \
@@ -23,12 +30,34 @@ libnm_openconnect_properties_la_CFLAGS =                \
        -DLOCALEDIR=\"$(datadir)/locale\"               \
        -DVERSION=\"$(VERSION)\"
 
-libnm_openconnect_properties_la_LIBADD = \
+libnm_openconnect_properties_old_la_CFLAGS =            \
+       -DNM_OPENCONNECT_OLD                            \
+       $(GLIB_CFLAGS)                                  \
+       $(GTK_CFLAGS)                                   \
+       $(NM_CFLAGS)                                    \
+       $(OPENCONNECT_CFLAGS)                           \
+       -I$(top_srcdir)/src                             \
+       -DICONDIR=\""$(datadir)/pixmaps"\"              \
+       -DUIDIR=\""$(uidir)"\"                          \
+       -DG_DISABLE_DEPRECATED                          \
+       -DGDK_DISABLE_DEPRECATED                        \
+       -DLOCALEDIR=\"$(datadir)/locale\"               \
+       -DVERSION=\"$(VERSION)\"
+
+libnm_openconnect_properties_new_la_LIBADD = \
        $(GTK_LIBS) \
        $(NM_LIBS) \
        $(OPENCONNECT_LIBS)
 
-libnm_openconnect_properties_la_LDFLAGS = \
+libnm_openconnect_properties_old_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(NM_LIBS) \
+       $(OPENCONNECT_LIBS)
+
+libnm_openconnect_properties_new_la_LDFLAGS = \
+       -avoid-version
+
+libnm_openconnect_properties_old_la_LDFLAGS = \
        -avoid-version
 
 CLEANFILES = *.bak *~