[network-manager-pptp/lr/libnm: 4/8] build: split the plugin into two halves
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-pptp/lr/libnm: 4/8] build: split the plugin into two halves
- Date: Mon, 31 Aug 2015 09:28:29 +0000 (UTC)
commit aab9f785f0e663258cbd4c860fb7ced24ed208b4
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Aug 21 11:53:52 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-pptp-service.name.in | 3 +++
properties/Makefile.am | 34 ++++++++++++++++++++++++++--------
2 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
index af69a5f..90b4e34 100644
--- a/nm-pptp-service.name.in
+++ b/nm-pptp-service.name.in
@@ -3,6 +3,9 @@ name=pptp
service=org.freedesktop.NetworkManager.pptp
program= LIBEXECDIR@/nm-pptp-service
+[libnm]
+plugin= PLUGINDIR@/libnm-vpn-plugin-pptp.so
+
[GNOME]
auth-dialog= LIBEXECDIR@/nm-pptp-auth-dialog
properties= PLUGINDIR@/libnm-pptp-properties
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 190dbcd..33f050d 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,9 +1,9 @@
plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = libnm-pptp-properties.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-pptp.la libnm-pptp-properties.la
AM_CPPFLAGS = -I${top_srcdir}
-libnm_pptp_properties_la_SOURCES = \
+libnm_vpn_plugin_pptp_la_SOURCES = \
nm-pptp.c \
nm-pptp.h \
advanced-dialog.c \
@@ -11,29 +11,47 @@ libnm_pptp_properties_la_SOURCES = \
import-export.c \
import-export.h
+libnm_pptp_properties_la_SOURCES = \
+ $(libnm_vpn_plugin_pptp_la_SOURCES)
+
uidir = $(datadir)/gnome-vpn-properties/pptp
ui_DATA = nm-pptp-dialog.ui
-libnm_pptp_properties_la_CFLAGS = \
+common_CFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(NM_CFLAGS) \
$(NMGTK_CFLAGS) \
- -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
-DG_DISABLE_DEPRECATED \
-DVERSION=\"$(VERSION)\"
-libnm_pptp_properties_la_LIBADD = \
- $(GTK_LIBS) \
- $(NM_LIBS) \
+libnm_vpn_plugin_pptp_la_CFLAGS = \
+ $(common_CFLAGS)
+
+libnm_pptp_properties_la_CFLAGS = \
+ -DNM_PPTP_OLD \
+ $(common_CFLAGS)
+
+libnm_vpn_plugin_pptp_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(NM_LIBS) \
$(NMGTK_LIBS)
-libnm_pptp_properties_la_LDFLAGS = \
+libnm_pptp_properties_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(NM_LIBS) \
+ $(NMGTK_LIBS)
+
+libnm_vpn_plugin_pptp_la_LDFLAGS = \
-avoid-version
+libnm_pptp_properties_la_LDFLAGS = \
+ $(libnm_vpn_plugin_pptp_la_LDFLAGS)
+
CLEANFILES = *.bak *~
EXTRA_DIST = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]