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

[Lubomir Rintel <lkundrak src gnome org>]

commit 74c4048da1603b891579c5f51eca96d5f41f7742
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 |    5 ++++-
 properties/Makefile.am      |   24 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/nm-openswan-service.name.in b/nm-openswan-service.name.in
index 6607c12..e26371a 100644
--- a/nm-openswan-service.name.in
+++ b/nm-openswan-service.name.in
@@ -3,8 +3,11 @@ name=openswan
 service=org.freedesktop.NetworkManager.openswan
 program= LIBEXECDIR@/nm-openswan-service
 
+[libnm]
+plugin= PLUGINDIR@/libnm-openswan-properties
+
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openswan-auth-dialog
-properties= PLUGINDIR@/libnm-openswan-properties
+properties= PLUGINDIR@/libnm-openswan-properties-old
 supports-external-ui-mode=true
 supports-hints=true
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 2d02d5b..9381cdc 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-openswan-properties.la libnm-openswan-properties-old.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_CFLAGS = \
+       $(common_CFLAGS) \
+       $(NM_CFLAGS)
+
+libnm_openswan_properties_old_la_CFLAGS = \
+       -DNM_OPENSWAN_OLD \
+       $(common_CFLAGS) \
+       $(NM_CFLAGS)
+
 libnm_openswan_properties_la_SOURCES = \
        nm-openswan.c \
        nm-openswan.h
 
+libnm_openswan_properties_old_la_SOURCES = \
+       $(libnm_openswan_properties_la_SOURCES)
+
 libnm_openswan_properties_la_LIBADD = \
        $(GTK_LIBS) \
+       $(LIBNM_LIBS)
+
+libnm_openswan_properties_old_la_LIBADD = \
+       $(GTK_LIBS) \
        $(NM_LIBS)
 
 libnm_openswan_properties_la_LDFLAGS = \
         -avoid-version
 
+libnm_openswan_properties_old_la_LDFLAGS = \
+       $(libnm_openswan_properties_la_LDFLAGS)
+
 uidir = $(datadir)/gnome-vpn-properties/openswan
 ui_DATA = nm-openswan-dialog.ui