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

[Lubomir Rintel <lkundrak src gnome org>]

commit 68c4bf806c8c3275776d7255d0b3edbe4f3b13ed
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Jul 24 18:55:06 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-openswan-service.name.in |    3 +++
 properties/Makefile.am      |   28 +++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/nm-openswan-service.name.in b/nm-openswan-service.name.in
index 6607c12..13149d3 100644
--- a/nm-openswan-service.name.in
+++ b/nm-openswan-service.name.in
@@ -3,6 +3,9 @@ name=openswan
 service=org.freedesktop.NetworkManager.openswan
 program= LIBEXECDIR@/nm-openswan-service
 
+[libnm]
+plugin= PLUGINDIR@/libnm-vpn-plugin-openswan.so
+
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openswan-auth-dialog
 properties= PLUGINDIR@/libnm-openswan-properties
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 2d02d5b..c31055d 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,10 +1,9 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openswan-properties.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-openswan.la libnm-openswan-properties.la
 
-AM_CPPFLAGS = \
+common_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(NM_CFLAGS) \
        -I$(top_srcdir)/src \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DUIDIR=\""$(uidir)"\" \
@@ -13,17 +12,36 @@ AM_CPPFLAGS = \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DVERSION=\"$(VERSION)\"
 
-libnm_openswan_properties_la_SOURCES = \
+libnm_vpn_plugin_openswan_la_CFLAGS = \
+       $(common_CFLAGS) \
+       $(NM_CFLAGS)
+
+libnm_openswan_properties_la_CFLAGS = \
+       -DNM_OPENSWAN_OLD \
+       $(common_CFLAGS) \
+       $(NM_CFLAGS)
+
+libnm_vpn_plugin_openswan_la_SOURCES = \
        nm-openswan.c \
        nm-openswan.h
 
+libnm_openswan_properties_la_SOURCES = \
+       $(libnm_vpn_plugin_openswan_la_SOURCES)
+
+libnm_vpn_plugin_openswan_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS)
+
 libnm_openswan_properties_la_LIBADD = \
        $(GTK_LIBS) \
        $(NM_LIBS)
 
-libnm_openswan_properties_la_LDFLAGS = \
+libnm_vpn_plugin_openswan_la_LDFLAGS = \
         -avoid-version
 
+libnm_openswan_properties_la_LDFLAGS = \
+       $(libnm_vpn_plugin_openswan_la_LDFLAGS)
+
 uidir = $(datadir)/gnome-vpn-properties/openswan
 ui_DATA = nm-openswan-dialog.ui