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

[Lubomir Rintel <lkundrak src gnome org>]

commit b4883fd8955c5acd9e42c329f1a91ad33adc87ce
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sun Aug 16 01:02:58 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-pptp-service.name.in |    4 ++--
 properties/Makefile.am  |   24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
index 7aab477..4c6c562 100644
--- a/nm-pptp-service.name.in
+++ b/nm-pptp-service.name.in
@@ -4,9 +4,9 @@ service=org.freedesktop.NetworkManager.pptp
 program= LIBEXECDIR@/nm-pptp-service
 
 [libnm]
-plugin= PLUGINDIR@/libnm-pptp-properties
+plugin= PLUGINDIR@/libnm-vpn-plugin-pptp
 
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-pptp-auth-dialog
-properties= PLUGINDIR@/libnm-pptp-properties-old
+properties= PLUGINDIR@/libnm-pptp-properties
 supports-external-ui-mode=true
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 65f8eb0..36ab8b9 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,12 +1,12 @@
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-pptp-properties.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-pptp.la
 if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += libnm-pptp-properties-old.la
+plugin_LTLIBRARIES += libnm-pptp-properties.la
 endif
 
 AM_CPPFLAGS = -I${top_srcdir}
 
-libnm_pptp_properties_la_SOURCES = \
+libnm_vpn_plugin_pptp_la_SOURCES = \
        nm-pptp.c \
        nm-pptp.h \
        advanced-dialog.c \
@@ -14,8 +14,8 @@ libnm_pptp_properties_la_SOURCES = \
        import-export.c \
        import-export.h
 
-libnm_pptp_properties_old_la_SOURCES = \
-       $(libnm_pptp_properties_la_SOURCES)
+libnm_pptp_properties_la_SOURCES = \
+       $(libnm_vpn_plugin_pptp_la_SOURCES)
 
 uidir = $(datadir)/gnome-vpn-properties/pptp
 ui_DATA = nm-pptp-dialog.ui
@@ -30,32 +30,32 @@ common_CFLAGS =                                         \
         -DG_DISABLE_DEPRECATED                          \
         -DVERSION=\"$(VERSION)\"
 
-libnm_pptp_properties_la_CFLAGS =                       \
+libnm_vpn_plugin_pptp_la_CFLAGS =                       \
         $(common_CFLAGS)                                \
         $(LIBNM_CFLAGS)                                 \
         $(LIBNMA_CFLAGS)
 
-libnm_pptp_properties_old_la_CFLAGS =                   \
+libnm_pptp_properties_la_CFLAGS =                   \
         -DNM_PPTP_OLD                                   \
         $(common_CFLAGS)                                \
         $(LIBNM_GLIB_CFLAGS)                            \
         $(LIBNM_GTK_CFLAGS)
 
-libnm_pptp_properties_la_LIBADD = \
+libnm_vpn_plugin_pptp_la_LIBADD = \
         $(GTK_LIBS) \
         $(LIBNM_LIBS) \
         $(LIBNMA_LIBS)
 
-libnm_pptp_properties_old_la_LIBADD = \
+libnm_pptp_properties_la_LIBADD = \
         $(GTK_LIBS) \
         $(LIBNM_GLIB_LIBS) \
         $(LIBNM_GTK_LIBS)
 
-libnm_pptp_properties_la_LDFLAGS =   \
+libnm_vpn_plugin_pptp_la_LDFLAGS =   \
         -avoid-version
 
-libnm_pptp_properties_old_la_LDFLAGS =   \
-        $(libnm_pptp_properties_la_LDFLAGS)
+libnm_pptp_properties_la_LDFLAGS =   \
+        $(libnm_vpn_plugin_pptp_la_LDFLAGS)
 
 CLEANFILES = *.bak *~