[network-manager-openvpn: 15/16] build: enable building base plugin also for --without-gnome
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn: 15/16] build: enable building base plugin also for --without-gnome
- Date: Fri, 6 May 2016 13:09:02 +0000 (UTC)
commit 79bd0ae1d6372c6e2c888711a8603c7c82c7b2d2
Author: Thomas Haller <thaller redhat com>
Date: Sat Apr 30 01:32:18 2016 +0200
build: enable building base plugin also for --without-gnome
Building the base plugin and its tests still makes sense
--without-gnome.
Makefile.am | 4 ++--
properties/Makefile.am | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b6f9cab..e5ea3f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = shared src
+SUBDIRS = shared src properties
if WITH_GNOME
-SUBDIRS += auth-dialog properties po
+SUBDIRS += auth-dialog po
endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 228c854..2699568 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,12 +1,13 @@
SUBDIRS = . tests
plugindir = $(libdir)/NetworkManager
-plugin_LTLIBRARIES = \
- libnm-vpn-plugin-openvpn.la \
- libnm-vpn-plugin-openvpn-editor.la
+plugin_LTLIBRARIES = libnm-vpn-plugin-openvpn.la
+if WITH_GNOME
+plugin_LTLIBRARIES += libnm-vpn-plugin-openvpn-editor.la
if WITH_LIBNM_GLIB
plugin_LTLIBRARIES += libnm-openvpn-properties.la
endif
+endif
plugin_sources = \
nm-openvpn-editor-plugin.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]