[network-manager-openswan/lr/libnm: 5/6] !fixup build: split the plugin into two halves

[Lubomir Rintel <lkundrak src gnome org>]

commit 60509a4fc7053c1514aea9c9cdeb7689dc5eb469
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Jul 16 17:19:37 2015 +0200

    !fixup build: split the plugin into two halves

 nm-openswan-service.name.in |    2 +-
 properties/Makefile.am      |   40 ++++++++++++++++------------------------
 properties/nm-openswan.c    |    6 +++---
 3 files changed, 20 insertions(+), 28 deletions(-)
---
diff --git a/nm-openswan-service.name.in b/nm-openswan-service.name.in
index 7059560..50efa92 100644
--- a/nm-openswan-service.name.in
+++ b/nm-openswan-service.name.in
@@ -4,7 +4,7 @@ service=org.freedesktop.NetworkManager.openswan
 program= LIBEXECDIR@/nm-openswan-service
 
 [libnm]
-properties= PLUGINDIR@/libnm-openswan-properties-new
+properties= PLUGINDIR@/libnm-openswan-properties
 
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openswan-auth-dialog
diff --git a/properties/Makefile.am b/properties/Makefile.am
index c2e5550..de4e7e6 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,11 +1,9 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openswan-properties-new.la libnm-openswan-properties-old.la
+plugin_LTLIBRARIES = libnm-openswan-properties.la libnm-openswan-properties-old.la
 
-libnm_openswan_properties_new_la_CPPFLAGS = \
-       -DNM_OPENSWAN_NEW \
+common_CFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(LIBNM_CFLAGS) \
        -I$(top_srcdir)/src \
        -DICONDIR=\""$(datadir)/pixmaps"\" \
        -DUIDIR=\""$(uidir)"\" \
@@ -14,41 +12,35 @@ libnm_openswan_properties_new_la_CPPFLAGS = \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DVERSION=\"$(VERSION)\"
 
-libnm_openswan_properties_old_la_CPPFLAGS = \
+libnm_openswan_properties_la_CFLAGS = \
+       $(common_CFLAGS) \
+       $(LIBNM_CFLAGS)
+
+libnm_openswan_properties_old_la_CFLAGS = \
        -DNM_OPENSWAN_OLD \
-       $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(NM_CFLAGS) \
-       -I$(top_srcdir)/src \
-       -DICONDIR=\""$(datadir)/pixmaps"\" \
-       -DUIDIR=\""$(uidir)"\" \
-       -DG_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED \
-       -DLOCALEDIR=\"$(datadir)/locale\" \
-       -DVERSION=\"$(VERSION)\" \
-       -I${top_srcdir}
+       $(common_CFLAGS) \
+       $(NM_CFLAGS)
 
-libnm_openswan_properties_new_la_SOURCES = \
+libnm_openswan_properties_la_SOURCES = \
        nm-openswan.c \
        nm-openswan.h
 
 libnm_openswan_properties_old_la_SOURCES = \
-       nm-openswan.c \
-       nm-openswan.h
+       $(libnm_openswan_properties_la_SOURCES)
 
-libnm_openswan_properties_new_la_LIBADD = \
+libnm_openswan_properties_la_LIBADD = \
        $(GTK_LIBS) \
-       $(NM_LIBS)
+       $(LIBNM_LIBS)
 
 libnm_openswan_properties_old_la_LIBADD = \
        $(GTK_LIBS) \
        $(NM_LIBS)
 
-libnm_openswan_properties_new_la_LDFLAGS = \
-        -avoid-version
+libnm_openswan_properties_la_LDFLAGS = \
+       -avoid-version
 
 libnm_openswan_properties_old_la_LDFLAGS = \
-        -avoid-version
+       $(libnm_openswan_properties_la_LDFLAGS)
 
 uidir = $(datadir)/gnome-vpn-properties/openswan
 ui_DATA = nm-openswan-dialog.ui
diff --git a/properties/nm-openswan.c b/properties/nm-openswan.c
index b6109e8..e47d121 100644
--- a/properties/nm-openswan.c
+++ b/properties/nm-openswan.c
@@ -61,9 +61,9 @@
 
 #define OPENSWAN_EDITOR_PLUGIN_ERROR                  NM_SETTING_VPN_ERROR
 #define OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
-#endif
 
-#ifdef NM_OPENSWAN_NEW
+#else /* !NM_OPENSWAN_OLD */
+
 #include <NetworkManager.h>
 #define OPENSWAN_EDITOR_PLUGIN_ERROR                  NM_CONNECTION_ERROR
 #define OPENSWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_CONNECTION_ERROR_INVALID_PROPERTY
@@ -86,7 +86,7 @@
 
 /************** plugin class **************/
 
-#ifdef NM_OPENSWAN_NEW
+#ifndef NM_OPENSWAN_OLD
 enum {
        PROP_0,
        PROP_NAME,