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

[Lubomir Rintel <lkundrak src gnome org>]

commit 587f494169a20cb204d4c171b5df8b7664b6097e
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Jul 15 17:49:41 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      |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 6 deletions(-)
---
diff --git a/nm-openswan-service.name.in b/nm-openswan-service.name.in
index 6607c12..7059560 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]
+properties= PLUGINDIR@/libnm-openswan-properties-new
+
 [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 214f478..89be795 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,7 +1,8 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openswan-properties.la
+plugin_LTLIBRARIES = libnm-openswan-properties-new.la libnm-openswan-properties-old.la
 
-AM_CPPFLAGS = \
+libnm_openswan_properties_new_la_CPPFLAGS = \
+       -DNM_VPNC_NEW \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(NM_CFLAGS) \
@@ -13,15 +14,39 @@ AM_CPPFLAGS = \
        -DVERSION=\"$(VERSION)\" \
        -I${top_srcdir}
 
-libnm_openswan_properties_la_SOURCES = \
+libnm_openswan_properties_old_la_CPPFLAGS = \
+       -DNM_VPNC_OLD \
+       $(GLIB_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(NM_CFLAGS) \
+       -DICONDIR=\""$(datadir)/pixmaps"\" \
+       -DUIDIR=\""$(uidir)"\" \
+       -DG_DISABLE_DEPRECATED \
+       -DGDK_DISABLE_DEPRECATED \
+       -DLOCALEDIR=\"$(datadir)/locale\" \
+       -DVERSION=\"$(VERSION)\" \
+       -I${top_srcdir}
+
+libnm_openswan_properties_new_la_SOURCES = \
        nm-openswan.c \
        nm-openswan.h
 
-libnm_openswan_properties_la_LIBADD = \
+libnm_openswan_properties_old_la_SOURCES = \
+       nm-openswan.c \
+       nm-openswan.h
+
+libnm_openswan_properties_new_la_LIBADD = \
        $(GTK_LIBS) \
        $(NM_LIBS)
 
-libnm_openswan_properties_la_LDFLAGS = \
+libnm_openswan_properties_old_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(NM_LIBS)
+
+libnm_openswan_properties_new_la_LDFLAGS = \
+        -avoid-version
+
+libnm_openswan_properties_old_la_LDFLAGS = \
         -avoid-version
 
 uidir = $(datadir)/gnome-vpn-properties/openswan