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

[Lubomir Rintel <lkundrak src gnome org>]

commit f3813490d2c011ba52fb7316deb294d224abeca7
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/libnm\(.\)\([^-_]*\).properties/libnm\1vpn\1plugin\1\2/;s/vpn.plugin\(.\)\([^-_]*\).old/\2\1properties/g;s/libnm\(.\)\([^-_]*\).common/libnm\1vpn\1plugin\1\2\1common/;s/vpn.plugin\(.\)\([^-_]*\).common.old/\2\1common/g'
 -i *.name.in

 nm-openswan-service.name.in |    4 ++--
 properties/Makefile.am      |   24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/nm-openswan-service.name.in b/nm-openswan-service.name.in
index e26371a..795669f 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-vpn-plugin-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 3d7a0cf..b2c45a9 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,7 +1,7 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openswan-properties.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-openswan.la
 if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += libnm-openswan-properties-old.la
+plugin_LTLIBRARIES += libnm-openswan-properties.la
 endif
 
 common_CFLAGS = \
@@ -15,35 +15,35 @@ common_CFLAGS = \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DVERSION=\"$(VERSION)\"
 
-libnm_openswan_properties_la_CFLAGS = \
+libnm_vpn_plugin_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_vpn_plugin_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_vpn_plugin_openswan_la_SOURCES)
 
-libnm_openswan_properties_la_LIBADD = \
+libnm_vpn_plugin_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_vpn_plugin_openswan_la_LDFLAGS = \
         -avoid-version
 
-libnm_openswan_properties_old_la_LDFLAGS = \
-       $(libnm_openswan_properties_la_LDFLAGS)
+libnm_openswan_properties_la_LDFLAGS = \
+       $(libnm_vpn_plugin_openswan_la_LDFLAGS)
 
 uidir = $(datadir)/gnome-vpn-properties/openswan
 ui_DATA = nm-openswan-dialog.ui