[network-manager-iodine/lr/libnm: 3/11] build: split the plugin into two halves
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-iodine/lr/libnm: 3/11] build: split the plugin into two halves
- Date: Mon, 24 Aug 2015 16:14:16 +0000 (UTC)
commit c8698c331ddaad9e7aec57e949432e887f9d8aa1
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Mon Aug 24 16:55:36 2015 +0200
build: split the plugin into two halves
They're both the same now. We'll later port the new one to libnm.
nm-iodine-service.name.in | 3 +++
properties/Makefile.am | 33 +++++++++++++++++++++++++--------
2 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/nm-iodine-service.name.in b/nm-iodine-service.name.in
index e17f938..4061b43 100644
--- a/nm-iodine-service.name.in
+++ b/nm-iodine-service.name.in
@@ -3,6 +3,9 @@ name=iodine
service=org.freedesktop.NetworkManager.iodine
program= LIBEXECDIR@/nm-iodine-service
+[libnm]
+plugin= PLUGINDIR@/libnm-vpn-plugin-iodine.so
+
[GNOME]
auth-dialog=nm-iodine-auth-dialog
properties=libnm-iodine-properties
diff --git a/properties/Makefile.am b/properties/Makefile.am
index ab4cd44..2787295 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,14 +1,17 @@
plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-iodine-properties.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-iodine.la libnm-iodine-properties.la
-libnm_iodine_properties_la_SOURCES = \
- nm-iodine.c \
- nm-iodine.h
+libnm_vpn_plugin_iodine_la_SOURCES = \
+ nm-iodine.c \
+ nm-iodine.h
+
+libnm_iodine_properties_la_SOURCES = \
+ $(libnm_vpn_plugin_iodine_la_SOURCES)
uidir = $(datadir)/gnome-vpn-properties/iodine
ui_DATA = nm-iodine-dialog.ui
-libnm_iodine_properties_la_CFLAGS = \
+common_CFLAGS = \
$(GTK_CFLAGS) \
$(NM_CFLAGS) \
-I$(top_srcdir)/src \
@@ -20,13 +23,27 @@ libnm_iodine_properties_la_CFLAGS = \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\"
-libnm_iodine_properties_la_LIBADD = \
- $(GTK_LIBS) \
+libnm_vpn_plugin_iodine_la_CFLAGS = \
+ $(common_CFLAGS)
+
+libnm_iodine_properties_la_CFLAGS = \
+ -DNM_IODINE_OLD \
+ $(common_CFLAGS)
+
+libnm_vpn_plugin_iodine_la_LIBADD = \
+ $(GTK_LIBS) \
$(NM_LIBS)
-libnm_iodine_properties_la_LDFLAGS = \
+libnm_iodine_properties_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(NM_LIBS)
+
+libnm_vpn_plugin_iodine_la_LDFLAGS = \
-avoid-version
+libnm_iodine_properties_la_LDFLAGS = \
+ $(libnm_vpn_plugin_iodine_la_LDFLAGS)
+
CLEANFILES = *.bak *~
EXTRA_DIST = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]