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

[Lubomir Rintel <lkundrak src gnome org>]

commit f66f3bffd56f80553b8fa2ea75d1648532c43523
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sat Aug 15 20:34:25 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 
nm-vpnc-service.name.in

 nm-vpnc-service.name.in      |    4 ++--
 properties/Makefile.am       |   18 +++++++++---------
 properties/tests/Makefile.am |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/nm-vpnc-service.name.in b/nm-vpnc-service.name.in
index 4f72642..1952c67 100644
--- a/nm-vpnc-service.name.in
+++ b/nm-vpnc-service.name.in
@@ -4,10 +4,10 @@ service=org.freedesktop.NetworkManager.vpnc
 program= LIBEXECDIR@/nm-vpnc-service
 
 [libnm]
-plugin= PLUGINDIR@/libnm-vpnc-properties
+plugin= PLUGINDIR@/libnm-vpnc
 
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-vpnc-auth-dialog
-properties= PLUGINDIR@/libnm-vpnc-properties-old
+properties= PLUGINDIR@/libnm-vpnc-properties
 supports-external-ui-mode=true
 supports-hints=true
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 85edfa4..1b597b6 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,19 +1,19 @@
 SUBDIRS=. tests
 
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-vpnc-properties.la
+plugin_LTLIBRARIES = libnm-vpnc.la
 if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += libnm-vpnc-properties-old.la
+plugin_LTLIBRARIES += libnm-vpnc-properties.la
 endif
 
-libnm_vpnc_properties_la_SOURCES = \
+libnm_vpnc_la_SOURCES = \
        nm-vpnc.c \
        nm-vpnc.h \
        nm-vpnc-helper.c \
        nm-vpnc-helper.h
 
-libnm_vpnc_properties_old_la_SOURCES = \
-       $(libnm_vpnc_properties_la_SOURCES)
+libnm_vpnc_properties_la_SOURCES = \
+       $(libnm_vpnc_la_SOURCES)
 
 uidir = $(datadir)/gnome-vpn-properties/vpnc
 ui_DATA = nm-vpnc-dialog.ui
@@ -27,18 +27,18 @@ common_CFLAGS = \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DVERSION=\"$(VERSION)\"
 
-libnm_vpnc_properties_la_CFLAGS = \
+libnm_vpnc_la_CFLAGS = \
        $(common_CFLAGS) \
        $(LIBNM_CFLAGS) \
        $(LIBNMA_CFLAGS)
 
-libnm_vpnc_properties_old_la_CFLAGS = \
+libnm_vpnc_properties_la_CFLAGS = \
        -DNM_VPNC_OLD \
        $(common_CFLAGS) \
        $(LIBNM_GLIB_CFLAGS) \
        $(LIBNM_GTK_CFLAGS)
 
-libnm_vpnc_properties_old_la_LIBADD = \
+libnm_vpnc_properties_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNM_GLIB_LIBS) \
        $(LIBNM_GTK_LIBS)
@@ -46,7 +46,7 @@ libnm_vpnc_properties_old_la_LIBADD = \
 libnm_vpnc_properties_new_la_LDFLAGS = \
        -avoid-version
 
-libnm_vpnc_properties_old_la_LDFLAGS = \
+libnm_vpnc_properties_la_LDFLAGS = \
        $(libnm_vpnc_properties_new_la_LDFLAGS)
 
 CLEANFILES = *.bak *~
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index ac1785d..8ef74e7 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -18,7 +18,7 @@ test_import_export_LDADD = \
        $(DBUS_LIBS) \
        $(LIBNM_LIBS) \
        $(LIBNMA_LIBS) \
-       $(top_builddir)/properties/libnm-vpnc-properties.la
+       $(top_builddir)/properties/libnm-vpnc.la
 
 if WITH_TESTS