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

[Lubomir Rintel <lkundrak src gnome org>]

commit c6e2e57e534042ee3bcc1c633715d506191c0df6
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Jul 16 12:10:39 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-openvpn-service.name.in |    6 ++++--
 properties/Makefile.am     |   40 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)
---
diff --git a/nm-openvpn-service.name.in b/nm-openvpn-service.name.in
index f4cce87..5d2aedd 100644
--- a/nm-openvpn-service.name.in
+++ b/nm-openvpn-service.name.in
@@ -3,9 +3,11 @@ name=openvpn
 service=org.freedesktop.NetworkManager.openvpn
 program= LIBEXECDIR@/nm-openvpn-service
 
+[libnm]
+properties= PLUGINDIR@/libnm-openvpn-properties-new
+
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openvpn-auth-dialog
-properties= PLUGINDIR@/libnm-openvpn-properties
+properties= PLUGINDIR@/libnm-openvpn-properties-old
 supports-external-ui-mode=true
 supports-hints=true
-
diff --git a/properties/Makefile.am b/properties/Makefile.am
index a8d9395..58e808f 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,9 +1,17 @@
 SUBDIRS = . tests
 
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openvpn-properties.la
+plugin_LTLIBRARIES = libnm-openvpn-properties-new.la libnm-openvpn-properties-old.la
 
-libnm_openvpn_properties_la_SOURCES = \
+libnm_openvpn_properties_new_la_SOURCES = \
+       nm-openvpn.c \
+       nm-openvpn.h \
+       auth-helpers.c \
+       auth-helpers.h \
+       import-export.c \
+       import-export.h
+
+libnm_openvpn_properties_old_la_SOURCES = \
        nm-openvpn.c \
        nm-openvpn.h \
        auth-helpers.c \
@@ -14,7 +22,20 @@ libnm_openvpn_properties_la_SOURCES = \
 uidir = $(datadir)/gnome-vpn-properties/openvpn
 ui_DATA = nm-openvpn-dialog.ui
 
-libnm_openvpn_properties_la_CFLAGS =                    \
+libnm_openvpn_properties_new_la_CFLAGS =                \
+        -DNM_OPENVPN_NEW                                \
+        $(GLIB_CFLAGS)                                  \
+        $(GTK_CFLAGS)                                   \
+        $(NM_CFLAGS)                                    \
+        $(NMGTK_CFLAGS)                                 \
+        -I$(top_srcdir)/src                             \
+        -DICONDIR=\""$(datadir)/pixmaps"\"              \
+        -DUIDIR=\""$(uidir)"\"                          \
+        -DLOCALEDIR=\"$(datadir)/locale\"               \
+        -DVERSION=\"$(VERSION)\"
+
+libnm_openvpn_properties_old_la_CFLAGS =                \
+        -DNM_OPENVPN_OLD                                \
         $(GLIB_CFLAGS)                                  \
         $(GTK_CFLAGS)                                   \
         $(NM_CFLAGS)                                    \
@@ -25,13 +46,22 @@ libnm_openvpn_properties_la_CFLAGS =                    \
         -DLOCALEDIR=\"$(datadir)/locale\"               \
         -DVERSION=\"$(VERSION)\"
 
-libnm_openvpn_properties_la_LIBADD = \
+libnm_openvpn_properties_new_la_LIBADD = \
+        $(GTK_LIBS) \
+        $(NM_LIBS) \
+        $(NMGTK_LIBS) \
+        $(top_builddir)/common/libnm-openvpn-common.la
+
+libnm_openvpn_properties_old_la_LIBADD = \
         $(GTK_LIBS) \
         $(NM_LIBS) \
         $(NMGTK_LIBS) \
         $(top_builddir)/common/libnm-openvpn-common.la
 
-libnm_openvpn_properties_la_LDFLAGS =   \
+libnm_openvpn_properties_new_la_LDFLAGS =   \
+        -avoid-version
+
+libnm_openvpn_properties_old_la_LDFLAGS =   \
         -avoid-version
 
 CLEANFILES = *.bak *~