[network-manager-vpnc/lr/libnm: 8/8] fixup! properties: build separate libnm-based and libnm-glib-based plugins
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-vpnc/lr/libnm: 8/8] fixup! properties: build separate libnm-based and libnm-glib-based plugins
- Date: Sat, 15 Aug 2015 23:09:25 +0000 (UTC)
commit b994cdf50337c3441845322104ac57d1c5991cd8
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/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-vpnc-service.name.in | 4 ++--
properties/Makefile.am | 22 +++++++++++-----------
properties/tests/Makefile.am | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/nm-vpnc-service.name.in b/nm-vpnc-service.name.in
index 4f72642..7ab5f72 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-vpn-plugin-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..0e4def3 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-vpn-plugin-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_vpn_plugin_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_vpn_plugin_vpnc_la_SOURCES)
uidir = $(datadir)/gnome-vpn-properties/vpnc
ui_DATA = nm-vpnc-dialog.ui
@@ -27,27 +27,27 @@ common_CFLAGS = \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\"
-libnm_vpnc_properties_la_CFLAGS = \
+libnm_vpn_plugin_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)
-libnm_vpnc_properties_new_la_LDFLAGS = \
+libnm_vpn_plugin_vpnc_new_la_LDFLAGS = \
-avoid-version
-libnm_vpnc_properties_old_la_LDFLAGS = \
- $(libnm_vpnc_properties_new_la_LDFLAGS)
+libnm_vpnc_properties_la_LDFLAGS = \
+ $(libnm_vpn_plugin_vpnc_new_la_LDFLAGS)
CLEANFILES = *.bak *~
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index ac1785d..d3ae761 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-vpn-plugin-vpnc.la
if WITH_TESTS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]