[gnome-online-accounts/wip/modules: 12/12] telepathy
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts/wip/modules: 12/12] telepathy
- Date: Mon, 19 May 2014 16:22:46 +0000 (UTC)
commit efabda61277b70afb6f6c741139a67517b755877
Author: Debarshi Ray <debarshir gnome org>
Date: Wed May 7 17:40:40 2014 +0200
telepathy
configure.ac | 1 +
src/goabackend/Makefile.am | 31 +++++++++++++++++++++++++------
2 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d007752..c680fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,6 +318,7 @@ AC_ARG_ENABLE([telepathy],
if test "$enable_telepathy" != "no"; then
AC_DEFINE(GOA_TELEPATHY_ENABLED, 1, [Enable Telepathy data provider])
fi
+AM_CONDITIONAL(BUILD_TELEPATHY, [test x$enable_telepathy != xno])
PKG_CHECK_MODULES(TP, telepathy-glib)
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index fc853c4..c0fe342 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -81,8 +81,6 @@ libgoa_backend_1_0_la_SOURCES = \
goamailclient.h goamailclient.c \
goaoauthprovider.h goaoauthprovider.c \
goaoauth2provider.h goaoauth2provider.c \
- goatelepathyfactory.h goatelepathyfactory.c \
- goatelepathyprovider.h goatelepathyprovider.c \
goautils.h goautils.c \
goawebview.h goawebview.c \
nautilus-floating-bar.h nautilus-floating-bar.c \
@@ -270,6 +268,31 @@ libgoapocket_la_LIBADD = \
libgoapocket_la_LDFLAGS = $(module_flags)
endif
+if BUILD_TELEPATHY
+goamodule_LTLIBRARIES += libgoatelepathy.la
+libgoatelepathy_la_SOURCES = \
+ goatelepathyfactory.c \
+ goatelepathyfactory.h \
+ goatelepathymodule.c \
+ goatelepathyprovider.c \
+ goatelepathyprovider.h \
+ $(NULL)
+libgoatelepathy_la_CFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(TP_CFLAGS) \
+ $(TPAW_CFLAGS) \
+ $(NULL)
+libgoatelepathy_la_LIBADD = \
+ $(builddir)/libgoa-backend-1.0.la \
+ $(GLIB_LIBS) \
+ $(GTK_LIBS) \
+ $(TP_LIBS) \
+ $(TPAW_LIBS) \
+ $(NULL)
+libgoatelepathy_la_LDFLAGS = $(module_flags)
+endif
+
if BUILD_WINDOWS_LIVE
goamodule_LTLIBRARIES += libgoawindowslive.la
libgoawindowslive_la_SOURCES = \
@@ -329,8 +352,6 @@ libgoa_backend_1_0_la_CFLAGS = \
$(SECRET_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(LIBXML_CFLAGS) \
- $(TP_CFLAGS) \
- $(TPAW_CFLAGS) \
$(NULL)
libgoa_backend_1_0_la_LIBADD = \
@@ -343,8 +364,6 @@ libgoa_backend_1_0_la_LIBADD = \
$(SECRET_LIBS) \
$(LIBSOUP_LIBS) \
$(LIBXML_LIBS) \
- $(TP_LIBS) \
- $(TPAW_LIBS) \
$(NULL)
libgoa_backend_1_0_la_LDFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]