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

[Lubomir Rintel <lkundrak src gnome org>]

commit db482c0871f56f9a08ca97a191a1976b9fe467ba
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sat Aug 15 20:37: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-openconnect-service.name.in |    4 ++--
 properties/Makefile.am         |   24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/nm-openconnect-service.name.in b/nm-openconnect-service.name.in
index db9bd61..e12ae52 100644
--- a/nm-openconnect-service.name.in
+++ b/nm-openconnect-service.name.in
@@ -4,8 +4,8 @@ service=org.freedesktop.NetworkManager.openconnect
 program= LIBEXECDIR@/nm-openconnect-service
 
 [libnm]
-plugin= PLUGINDIR@/libnm-openconnect-properties
+plugin= PLUGINDIR@/libnm-openconnect
 
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openconnect-auth-dialog
-properties= PLUGINDIR@/libnm-openconnect-properties-old
+properties= PLUGINDIR@/libnm-openconnect-properties
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 566b004..1414f45 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,17 +1,17 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openconnect-properties.la
+plugin_LTLIBRARIES = libnm-openconnect.la
 if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += libnm-openconnect-properties-old.la
+plugin_LTLIBRARIES += libnm-openconnect-properties.la
 endif
 
-libnm_openconnect_properties_la_SOURCES = \
+libnm_openconnect_la_SOURCES = \
        auth-helpers.c \
        auth-helpers.h \
        nm-openconnect.c \
        nm-openconnect.h
 
-libnm_openconnect_properties_old_la_SOURCES = \
-       $(libnm_openconnect_properties_la_SOURCES)
+libnm_openconnect_properties_la_SOURCES = \
+       $(libnm_openconnect_la_SOURCES)
 
 uidir = $(datadir)/gnome-vpn-properties/openconnect
 ui_DATA = nm-openconnect-dialog.ui
@@ -28,30 +28,30 @@ common_CFLAGS =                                         \
        -DLOCALEDIR=\"$(datadir)/locale\"               \
        -DVERSION=\"$(VERSION)\"
 
-libnm_openconnect_properties_la_CFLAGS =                \
+libnm_openconnect_la_CFLAGS =                \
        $(common_CFLAGS)                                \
        $(LIBNM_CFLAGS)
 
-libnm_openconnect_properties_old_la_CFLAGS =            \
+libnm_openconnect_properties_la_CFLAGS =            \
        -DNM_OPENCONNECT_OLD                            \
        $(common_CFLAGS)                                \
        $(LIBNM_GLIB_CFLAGS)
 
-libnm_openconnect_properties_la_LIBADD = \
+libnm_openconnect_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS) \
        $(OPENCONNECT_LIBS)
 
-libnm_openconnect_properties_old_la_LIBADD = \
+libnm_openconnect_properties_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_GLIB_LIBS) \
        $(OPENCONNECT_LIBS)
 
-libnm_openconnect_properties_la_LDFLAGS = \
+libnm_openconnect_la_LDFLAGS = \
        -avoid-version
 
-libnm_openconnect_properties_old_la_LDFLAGS = \
-       $(libnm_openconnect_properties_la_LDFLAGS)
+libnm_openconnect_properties_la_LDFLAGS = \
+       $(libnm_openconnect_la_LDFLAGS)
 
 CLEANFILES = *.bak *~