[network-manager-openvpn/lr/libnm: 1/13] fixup! build: split the plugin into two halves
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn/lr/libnm: 1/13] fixup! build: split the plugin into two halves
- Date: Wed, 19 Aug 2015 15:34:31 +0000 (UTC)
commit f3ce309732089934320b739790d9f7fc7bf80d90
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Sat Aug 15 20:42:19 2015 +0200
fixup! build: split the plugin into two halves
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
auth-dialog/Makefile.am | 2 +-
common/Makefile.am | 16 ++++++++--------
properties/Makefile.am | 26 +++++++++++++-------------
properties/tests/Makefile.am | 2 +-
4 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index d707cb8..938cfd7 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -20,6 +20,6 @@ nm_openvpn_auth_dialog_LDADD = \
$(NM_LIBS) \
$(NMGTK_LIBS) \
$(LIBSECRET_LIBS) \
- $(top_builddir)/common/libnm-openvpn-common-old.la
+ $(top_builddir)/common/libnm-openvpn-common.la
CLEANFILES = *~
diff --git a/common/Makefile.am b/common/Makefile.am
index 0711e71..8b6f69d 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,26 +1,26 @@
-noinst_LTLIBRARIES=libnm-openvpn-common.la libnm-openvpn-common-old.la
+noinst_LTLIBRARIES=libnm-vpn-plugin-openvpn-common.la libnm-openvpn-common.la
-libnm_openvpn_common_la_CPPFLAGS = \
+libnm_vpn_plugin_openvpn_common_la_CPPFLAGS = \
$(NM_CFLAGS) \
-I$(top_srcdir)/src/
-libnm_openvpn_common_old_la_CPPFLAGS = \
+libnm_openvpn_common_la_CPPFLAGS = \
-DNM_OPENVPN_OLD \
$(NM_CFLAGS) \
-I$(top_srcdir)/src/
-libnm_openvpn_common_la_SOURCES= \
+libnm_vpn_plugin_openvpn_common_la_SOURCES= \
utils.c \
utils.h \
nm-glib-compat.h
-libnm_openvpn_common_old_la_SOURCES = \
- $(libnm_openvpn_common_la_SOURCES)
+libnm_openvpn_common_la_SOURCES = \
+ $(libnm_vpn_plugin_openvpn_common_la_SOURCES)
-libnm_openvpn_common_la_LIBADD = \
+libnm_vpn_plugin_openvpn_common_la_LIBADD = \
$(NM_LIBS)
-libnm_openvpn_common_old_la_LIBADD = \
+libnm_openvpn_common_la_LIBADD = \
$(NM_LIBS)
EXTRA_DIST = nm-glib-compat.h
diff --git a/properties/Makefile.am b/properties/Makefile.am
index fc6372a..d727ec8 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,9 +1,9 @@
SUBDIRS = . tests
plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openvpn-properties.la libnm-openvpn-properties-old.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-openvpn.la libnm-openvpn-properties.la
-libnm_openvpn_properties_la_SOURCES = \
+libnm_vpn_plugin_openvpn_la_SOURCES = \
nm-openvpn.c \
nm-openvpn.h \
auth-helpers.c \
@@ -11,8 +11,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_vpn_plugin_openvpn_la_SOURCES)
uidir = $(datadir)/gnome-vpn-properties/openvpn
ui_DATA = nm-openvpn-dialog.ui
@@ -28,34 +28,34 @@ common_CFLAGS = \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\"
-libnm_openvpn_properties_la_CFLAGS = \
+libnm_vpn_plugin_openvpn_la_CFLAGS = \
$(common_CFLAGS) \
$(NM_CFLAGS) \
$(NMGTK_CFLAGS)
-libnm_openvpn_properties_old_la_CFLAGS = \
+libnm_openvpn_properties_la_CFLAGS = \
-DNM_OPENVPN_OLD \
$(common_CFLAGS) \
$(NM_CFLAGS) \
$(NMGTK_CFLAGS)
-libnm_openvpn_properties_la_LIBADD = \
+libnm_vpn_plugin_openvpn_la_LIBADD = \
$(GTK_LIBS) \
$(NM_LIBS) \
$(NMGTK_LIBS) \
- $(top_builddir)/common/libnm-openvpn-common.la
+ $(top_builddir)/common/libnm-vpn-plugin-openvpn-common.la
-libnm_openvpn_properties_old_la_LIBADD = \
+libnm_openvpn_properties_la_LIBADD = \
$(GTK_LIBS) \
$(NM_LIBS) \
$(NMGTK_LIBS) \
- $(top_builddir)/common/libnm-openvpn-common-old.la
+ $(top_builddir)/common/libnm-openvpn-common.la
-libnm_openvpn_properties_la_LDFLAGS = \
+libnm_vpn_plugin_openvpn_la_LDFLAGS = \
-avoid-version
-libnm_openvpn_properties_old_la_LDFLAGS = \
- $(libnm_openvpn_properties_la_LDFLAGS)
+libnm_openvpn_properties_la_LDFLAGS = \
+ $(libnm_vpn_plugin_openvpn_la_LDFLAGS)
CLEANFILES = *.bak *~
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index bfacb8c..3ebab55 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -18,7 +18,7 @@ test_import_export_LDADD = \
$(GTK_LIBS) \
$(NM_LIBS) \
$(NMGTK_LIBS) \
- $(top_builddir)/properties/libnm-openvpn-properties-old.la
+ $(top_builddir)/properties/libnm-openvpn-properties.la
if WITH_TESTS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]