[network-manager-openvpn/lr/libnm: 1/13] build: split the plugin into two halves
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn/lr/libnm: 1/13] build: split the plugin into two halves
- Date: Sun, 16 Aug 2015 13:46:44 +0000 (UTC)
commit 78b34110e6f5b6e0639643d4bc6adbecdad3a18d
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Jul 24 16:34:04 2015 +0200
build: split the plugin into two halves
They're both the same now. We'll later port the new one to libnm.
auth-dialog/Makefile.am | 2 +-
common/Makefile.am | 13 ++++++++++-
properties/Makefile.am | 51 ++++++++++++++++++++++++++++++-----------
properties/tests/Makefile.am | 2 +-
4 files changed, 51 insertions(+), 17 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 938cfd7..d707cb8 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.la
+ $(top_builddir)/common/libnm-openvpn-common-old.la
CLEANFILES = *~
diff --git a/common/Makefile.am b/common/Makefile.am
index 35aada5..0711e71 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,15 +1,26 @@
-noinst_LTLIBRARIES=libnm-openvpn-common.la
+noinst_LTLIBRARIES=libnm-openvpn-common.la libnm-openvpn-common-old.la
libnm_openvpn_common_la_CPPFLAGS = \
$(NM_CFLAGS) \
-I$(top_srcdir)/src/
+libnm_openvpn_common_old_la_CPPFLAGS = \
+ -DNM_OPENVPN_OLD \
+ $(NM_CFLAGS) \
+ -I$(top_srcdir)/src/
+
libnm_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_LIBADD = \
$(NM_LIBS)
+libnm_openvpn_common_old_la_LIBADD = \
+ $(NM_LIBS)
+
EXTRA_DIST = nm-glib-compat.h
diff --git a/properties/Makefile.am b/properties/Makefile.am
index a8d9395..fc6372a 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,20 +1,23 @@
SUBDIRS = . tests
plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-openvpn-properties.la
+plugin_LTLIBRARIES = libnm-openvpn-properties.la libnm-openvpn-properties-old.la
-libnm_openvpn_properties_la_SOURCES = \
- nm-openvpn.c \
- nm-openvpn.h \
- auth-helpers.c \
- auth-helpers.h \
- import-export.c \
- import-export.h
+libnm_openvpn_properties_la_SOURCES = \
+ nm-openvpn.c \
+ nm-openvpn.h \
+ auth-helpers.c \
+ auth-helpers.h \
+ import-export.c \
+ import-export.h
+
+libnm_openvpn_properties_old_la_SOURCES = \
+ $(libnm_openvpn_properties_la_SOURCES)
uidir = $(datadir)/gnome-vpn-properties/openvpn
ui_DATA = nm-openvpn-dialog.ui
-libnm_openvpn_properties_la_CFLAGS = \
+common_CFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(NM_CFLAGS) \
@@ -25,15 +28,35 @@ libnm_openvpn_properties_la_CFLAGS = \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\"
-libnm_openvpn_properties_la_LIBADD = \
- $(GTK_LIBS) \
- $(NM_LIBS) \
- $(NMGTK_LIBS) \
+libnm_openvpn_properties_la_CFLAGS = \
+ $(common_CFLAGS) \
+ $(NM_CFLAGS) \
+ $(NMGTK_CFLAGS)
+
+libnm_openvpn_properties_old_la_CFLAGS = \
+ -DNM_OPENVPN_OLD \
+ $(common_CFLAGS) \
+ $(NM_CFLAGS) \
+ $(NMGTK_CFLAGS)
+
+libnm_openvpn_properties_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(NM_LIBS) \
+ $(NMGTK_LIBS) \
$(top_builddir)/common/libnm-openvpn-common.la
-libnm_openvpn_properties_la_LDFLAGS = \
+libnm_openvpn_properties_old_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(NM_LIBS) \
+ $(NMGTK_LIBS) \
+ $(top_builddir)/common/libnm-openvpn-common-old.la
+
+libnm_openvpn_properties_la_LDFLAGS = \
-avoid-version
+libnm_openvpn_properties_old_la_LDFLAGS = \
+ $(libnm_openvpn_properties_la_LDFLAGS)
+
CLEANFILES = *.bak *~
EXTRA_DIST = \
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 3ebab55..bfacb8c 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.la
+ $(top_builddir)/properties/libnm-openvpn-properties-old.la
if WITH_TESTS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]