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

[Lubomir Rintel <lkundrak src gnome org>]

commit dcc09b11166f0f1a01b1f16f726571d2f984d432
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sat Aug 15 20:42:19 2015 +0200

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

 common/Makefile.am           |    8 ++++----
 nm-openvpn-service.name.in   |    4 ++--
 properties/Makefile.am       |   26 +++++++++++++-------------
 properties/tests/Makefile.am |    2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 9f663ab..4f64ed5 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,13 +1,13 @@
 noinst_LTLIBRARIES=libnm-openvpn-common.la
 if WITH_LIBNM_GLIB
-noinst_LTLIBRARIES += libnm-openvpn-common-old.la
+noinst_LTLIBRARIES += libnm-openvpn-properties-common.la
 endif
 
 libnm_openvpn_common_la_CPPFLAGS = \
        $(LIBNM_CFLAGS) \
         -I$(top_srcdir)/src/
 
-libnm_openvpn_common_old_la_CPPFLAGS = \
+libnm_openvpn_properties_common_la_CPPFLAGS = \
        -DNM_OPENVPN_OLD \
        $(LIBNM_GLIB_CFLAGS) \
         -I$(top_srcdir)/src/
@@ -17,13 +17,13 @@ libnm_openvpn_common_la_SOURCES= \
        utils.h \
        nm-glib-compat.h
 
-libnm_openvpn_common_old_la_SOURCES = \
+libnm_openvpn_properties_common_la_SOURCES = \
        $(libnm_openvpn_common_la_SOURCES)
 
 libnm_openvpn_common_la_LIBADD = \
        $(LIBNM_LIBS)
 
-libnm_openvpn_common_old_la_LIBADD = \
+libnm_openvpn_properties_common_la_LIBADD = \
        $(LIBNM_GLIB_LIBS)
 
 EXTRA_DIST = nm-glib-compat.h
diff --git a/nm-openvpn-service.name.in b/nm-openvpn-service.name.in
index 6329b1b..4dacee9 100644
--- a/nm-openvpn-service.name.in
+++ b/nm-openvpn-service.name.in
@@ -4,10 +4,10 @@ service=org.freedesktop.NetworkManager.openvpn
 program= LIBEXECDIR@/nm-openvpn-service
 
 [libnm]
-plugin= PLUGINDIR@/libnm-openvpn-properties
+plugin= PLUGINDIR@/libnm-openvpn
 
 [GNOME]
 auth-dialog= LIBEXECDIR@/nm-openvpn-auth-dialog
-properties= PLUGINDIR@/libnm-openvpn-properties-old
+properties= PLUGINDIR@/libnm-openvpn-properties
 supports-external-ui-mode=true
 supports-hints=true
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 18ccf70..2ed6b03 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS = . tests
 
 plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openvpn-properties.la
+plugin_LTLIBRARIES = libnm-openvpn.la
 if WITH_LIBNM_GLIB
-plugin_LTLIBRARIES += libnm-openvpn-properties-old.la
+plugin_LTLIBRARIES += libnm-openvpn-properties.la
 endif
 
-libnm_openvpn_properties_la_SOURCES =                   \
+libnm_openvpn_la_SOURCES =                   \
         nm-openvpn.c                                    \
         nm-openvpn.h                                    \
         auth-helpers.c                                  \
@@ -14,8 +14,8 @@ libnm_openvpn_properties_la_SOURCES =                   \
         import-export.c                                 \
         import-export.h
 
-libnm_openvpn_properties_old_la_SOURCES =               \
-        $(libnm_openvpn_properties_la_SOURCES)
+libnm_openvpn_properties_la_SOURCES =               \
+        $(libnm_openvpn_la_SOURCES)
 
 uidir = $(datadir)/gnome-vpn-properties/openvpn
 ui_DATA = nm-openvpn-dialog.ui
@@ -29,34 +29,34 @@ common_CFLAGS =                                         \
         -DLOCALEDIR=\"$(datadir)/locale\"               \
         -DVERSION=\"$(VERSION)\"
 
-libnm_openvpn_properties_la_CFLAGS =                    \
+libnm_openvpn_la_CFLAGS =                    \
         $(common_CFLAGS)                                \
         $(LIBNM_CFLAGS)                                 \
         $(LIBNMA_CFLAGS)
 
-libnm_openvpn_properties_old_la_CFLAGS =                \
+libnm_openvpn_properties_la_CFLAGS =                \
         -DNM_OPENVPN_OLD                                \
         $(common_CFLAGS)                                \
         $(LIBNM_GLIB_CFLAGS)                            \
         $(LIBNM_GTK_CFLAGS)
 
-libnm_openvpn_properties_la_LIBADD =                    \
+libnm_openvpn_la_LIBADD =                    \
         $(GTK_LIBS)                                     \
         $(LIBNM_LIBS)                                   \
         $(LIBNMA_LIBS)                                  \
         $(top_builddir)/common/libnm-openvpn-common.la
 
-libnm_openvpn_properties_old_la_LIBADD =                \
+libnm_openvpn_properties_la_LIBADD =                \
         $(GTK_LIBS)                                     \
         $(LIBNM_GLIB_LIBS)                              \
         $(LIBNM_GTK_LIBS)                               \
-        $(top_builddir)/common/libnm-openvpn-common-old.la
+        $(top_builddir)/common/libnm-openvpn-properties-common.la
 
-libnm_openvpn_properties_la_LDFLAGS =                   \
+libnm_openvpn_la_LDFLAGS =                   \
         -avoid-version
 
-libnm_openvpn_properties_old_la_LDFLAGS =               \
-        $(libnm_openvpn_properties_la_LDFLAGS)
+libnm_openvpn_properties_la_LDFLAGS =               \
+        $(libnm_openvpn_la_LDFLAGS)
 
 CLEANFILES = *.bak *~
 
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 214b3a5..c215988 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -18,7 +18,7 @@ test_import_export_LDADD = \
        $(GTK_LIBS) \
        $(LIBNM_LIBS) \
        $(LIBNMA_LIBS) \
-       $(top_builddir)/properties/libnm-openvpn-properties.la
+       $(top_builddir)/properties/libnm-openvpn.la
 
 if WITH_TESTS