aboutsummaryrefslogtreecommitdiffstats
path: root/modules/Makefile.am
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-03-24 18:24:56 +0800
committerMichael Meeks <michael.meeks@novell.com>2010-04-07 19:22:09 +0800
commit6416086f149ee7d3f267bd67d3019ef26122c07a (patch)
treec090e390a59a5d0e062271364129f2d2595263bb /modules/Makefile.am
parent6823af7d0b96a72a27159836b533e5d22130b7f2 (diff)
downloadgsoc2013-evolution-6416086f149ee7d3f267bd67d3019ef26122c07a.tar
gsoc2013-evolution-6416086f149ee7d3f267bd67d3019ef26122c07a.tar.gz
gsoc2013-evolution-6416086f149ee7d3f267bd67d3019ef26122c07a.tar.bz2
gsoc2013-evolution-6416086f149ee7d3f267bd67d3019ef26122c07a.tar.lz
gsoc2013-evolution-6416086f149ee7d3f267bd67d3019ef26122c07a.tar.xz
gsoc2013-evolution-6416086f149ee7d3f267bd67d3019ef26122c07a.tar.zst
gsoc2013-evolution-6416086f149ee7d3f267bd67d3019ef26122c07a.zip
Add ConnMan support (words fail me ...)
Conflicts: configure.ac modules/Makefile.am
Diffstat (limited to 'modules/Makefile.am')
-rw-r--r--modules/Makefile.am5
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 0b6ccf22ec..c38f26b24a 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -10,6 +10,10 @@ if ENABLE_NETWORK_MANAGER
NETWORK_MANAGER_DIR = network-manager
endif
+if ENABLE_CONNMAN
+CONNMAN_DIR = connman
+endif
+
SUBDIRS = \
addressbook \
calendar \
@@ -18,5 +22,6 @@ SUBDIRS = \
$(MONO_DIR) \
$(PYTHON_DIR) \
$(NETWORK_MANAGER_DIR)
+ $(CONNMAN_DIR)
-include $(top_srcdir)/git.mk