[network-manager-openswan/lr/libnm] fixup! properties: build separate libnm-based and libnm-glib-based plugins

[Lubomir Rintel <lkundrak src gnome org>]

commit 7ecda5f64230eb7ad40d91a601129d223ff7b6ed
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sat Aug 15 20:36:39 2015 +0200

    fixup! properties: build separate libnm-based and libnm-glib-based plugins
    
    find -name Makefile.am |xargs sed 's/-properties$//;s/.properties\(.la\)/\1/;s/.old//' -i *.name.in

 nm-openswan-service.name.in |    4 ++--
 properties/Makefile.am      |   22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/nm-openswan-service.name.in b/nm-openswan-service.name.in
index e26371a..5f9746a 100644
--- a/nm-openswan-service.name.in
+++ b/nm-openswan-service.name.in
@@ -4,10 +4,10 @@ service=org.freedesktop.NetworkManager.openswan
 program= LIBEXECDIR@/nm-openswan-service
 
 [libnm]
-plugin= PLUGINDIR@/libnm-openswan-properties
+plugin= PLUGINDIR@/libnm-openswan
 
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openswan-auth-dialog
-properties= PLUGINDIR@/libnm-openswan-properties-old
+properties= PLUGINDIR@/libnm-openswan-properties
 supports-external-ui-mode=true
 supports-hints=true
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 28582e0..458419f 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,5 +1,5 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openswan-properties.la libnm-openswan-properties-old.la
+plugin_LTLIBRARIES = libnm-openswan.la libnm-openswan-properties.la
 
 common_CFLAGS = \
        $(GLIB_CFLAGS) \
@@ -12,35 +12,35 @@ common_CFLAGS = \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DVERSION=\"$(VERSION)\"
 
-libnm_openswan_properties_la_CFLAGS = \
+libnm_openswan_la_CFLAGS = \
        $(common_CFLAGS) \
        $(LIBNM_CFLAGS)
 
-libnm_openswan_properties_old_la_CFLAGS = \
+libnm_openswan_properties_la_CFLAGS = \
        -DNM_OPENSWAN_OLD \
        $(common_CFLAGS) \
        $(LIBNM_GLIB_CFLAGS)
 
-libnm_openswan_properties_la_SOURCES = \
+libnm_openswan_la_SOURCES = \
        nm-openswan.c \
        nm-openswan.h
 
-libnm_openswan_properties_old_la_SOURCES = \
-       $(libnm_openswan_properties_la_SOURCES)
+libnm_openswan_properties_la_SOURCES = \
+       $(libnm_openswan_la_SOURCES)
 
-libnm_openswan_properties_la_LIBADD = \
+libnm_openswan_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS)
 
-libnm_openswan_properties_old_la_LIBADD = \
+libnm_openswan_properties_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_GLIB_LIBS)
 
-libnm_openswan_properties_la_LDFLAGS = \
+libnm_openswan_la_LDFLAGS = \
         -avoid-version
 
-libnm_openswan_properties_old_la_LDFLAGS = \
-       $(libnm_openswan_properties_la_LDFLAGS)
+libnm_openswan_properties_la_LDFLAGS = \
+       $(libnm_openswan_la_LDFLAGS)
 
 uidir = $(datadir)/gnome-vpn-properties/openswan
 ui_DATA = nm-openswan-dialog.ui