[network-manager-fortisslvpn] build: split the plugin into two halves

[Lubomir Rintel <lkundrak src gnome org>]

commit 78d4e2b0bd184801921c034067abfa4d6f54b066
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Sep 25 18:23:52 2015 +0200

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

 contrib/fortiserve.pl          |    3 +--
 nm-fortisslvpn-service.name.in |    3 +++
 properties/Makefile.am         |   34 ++++++++++++++++++++++++++++------
 3 files changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/contrib/fortiserve.pl b/contrib/fortiserve.pl
index 6e82d64..dc9b6d0 100644
--- a/contrib/fortiserve.pl
+++ b/contrib/fortiserve.pl
@@ -196,7 +196,6 @@ sub do_ppp
        $client->blocking (0);
 
        exec ($pppd, $pty->ttyname, qw/38400 noipdefault noaccomp noauth
-       # debug logfile chudak
                ms-dns 6.6.6.7 ms-dns 8.8.8.8 noccp
                default-asyncmap nopcomp nodefaultroute :1.1.1.2 nodetach
                lcp-max-configure 40 usepeerdns mru 1024/) or die $! unless $ppp;
@@ -252,7 +251,7 @@ sub serve_request
 
        if ($request->uri eq '/remote/logincheck') {
                $response = new HTTP::Response (200 => 'OK', [], 'something');
-               $response->header ('Set-Cookie' => 'SVPNCOOKIE=something;');
+               #$response->header ('Set-Cookie' => 'SVPNCOOKIE=something;');
        } elsif ($request->uri eq '/remote/index') {
                $response = new HTTP::Response (200 => 'OK', [], 'something');
        } elsif ($request->uri eq '/remote/fortisslvpn') {
diff --git a/nm-fortisslvpn-service.name.in b/nm-fortisslvpn-service.name.in
index 201e784..b0f7a63 100644
--- a/nm-fortisslvpn-service.name.in
+++ b/nm-fortisslvpn-service.name.in
@@ -3,6 +3,9 @@ name=fortisslvpn
 service=org.freedesktop.NetworkManager.fortisslvpn
 program= LIBEXECDIR@/nm-fortisslvpn-service
 
+[libnm]
+plugin= PLUGINDIR@/libnm-vpn-plugin-fortisslvpn.so
+
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-fortisslvpn-auth-dialog
 properties= PLUGINDIR@/libnm-fortisslvpn-properties
diff --git a/properties/Makefile.am b/properties/Makefile.am
index b6164e1..0a8226b 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,32 +1,54 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-fortisslvpn-properties.la
+plugin_LTLIBRARIES =                                   \
+       libnm-vpn-plugin-fortisslvpn.la                 \
+       libnm-fortisslvpn-properties.la
 
-libnm_fortisslvpn_properties_la_SOURCES =              \
+libnm_vpn_plugin_fortisslvpn_la_SOURCES =              \
        nm-fortisslvpn.c                                \
        nm-fortisslvpn.h
 
+libnm_fortisslvpn_properties_la_SOURCES =              \
+       $(libnm_vpn_plugin_fortisslvpn_la_SOURCES)
+
 uidir = $(datadir)/gnome-vpn-properties/fortisslvpn
 ui_DATA = nm-fortisslvpn-dialog.ui
 
-libnm_fortisslvpn_properties_la_CFLAGS =               \
+common_CFLAGS =                                                \
        $(GLIB_CFLAGS)                                  \
        $(GTK_CFLAGS)                                   \
-       $(NM_CFLAGS)                                    \
-       $(NMGTK_CFLAGS)                                 \
        -I$(top_srcdir)                                 \
        -DUIDIR=\""$(uidir)"\"                          \
        -DLOCALEDIR=\""$(datadir)/locale"\"             \
        -DG_DISABLE_DEPRECATED                          \
        -DVERSION=\"$(VERSION)\"
 
+libnm_vpn_plugin_fortisslvpn_la_CFLAGS =               \
+       $(NM_CFLAGS)                                    \
+       $(NMGTK_CFLAGS)                                 \
+       $(common_CFLAGS)
+
+libnm_fortisslvpn_properties_la_CFLAGS =               \
+       -DNM_OPENVPN_OLD                                \
+       $(NM_CFLAGS)                                    \
+       $(NMGTK_CFLAGS)                                 \
+       $(common_CFLAGS)
+
+libnm_vpn_plugin_fortisslvpn_la_LIBADD =               \
+       $(GTK_LIBS)                                     \
+       $(NM_LIBS)                                      \
+       $(NMGTK_LIBS)
+
 libnm_fortisslvpn_properties_la_LIBADD =               \
        $(GTK_LIBS)                                     \
        $(NM_LIBS)                                      \
        $(NMGTK_LIBS)
 
-libnm_fortisslvpn_properties_la_LDFLAGS =              \
+libnm_vpn_plugin_fortisslvpn_la_LDFLAGS =              \
        -avoid-version
 
+libnm_fortisslvpn_properties_la_LDFLAGS =              \
+       $(libnm_vpn_plugin_fortisslvpn_la_LDFLAGS)
+
 CLEANFILES = *.bak *~
 
 EXTRA_DIST =                                           \