[empathy/gnome-2-34] Build an empathy-call binary when we have Call support



commit c605f0006a5a08743fbbf4279e7df9d858381d01
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Fri Feb 18 16:16:33 2011 +0000

    Build an empathy-call binary when we have Call support

 Makefile.am     |    2 +-
 configure.ac    |    6 ++++++
 src/Makefile.am |   26 ++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4d4462d..c1bed60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
+MY_SUBDIRS = tools extensions po data telepathy-yell libempathy libempathy-gtk src help tests
 NST_SUBDIRS = nautilus-sendto-plugin
 
 DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS)
diff --git a/configure.ac b/configure.ac
index 413a244..818d24f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,8 +176,14 @@ AC_ARG_WITH(call,
             [with_call=yes])
 if test "x$with_call" = "xyes" ; then
    PKG_CHECK_MODULES(YELL, [telepathy-yell])
+   PKG_CHECK_MODULES(EMPATHY_CALL,
+   [
+      farsight2-0.10
+      telepathy-farstream
+   ])
    AC_DEFINE(HAVE_CALL, 1, [Define if we have Call interface support])
 fi
+AM_CONDITIONAL(HAVE_CALL, test "x$with_call" = "xyes")
 
 # -----------------------------------------------------------
 # evolution-data-server (about-me)
diff --git a/src/Makefile.am b/src/Makefile.am
index 18a951b..96c5645 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_CFLAGS)				\
+	$(YELL_CFLAGS)					\
 	$(EDS_CFLAGS)					\
 	$(GTK_CFLAGS)					\
 	$(ERROR_CFLAGS)					\
@@ -29,6 +30,7 @@ LDADD =								\
 	$(UNIQUE_LIBS)						\
 	$(EMPATHY_LIBS)						\
 	$(GTK_LIBS)						\
+	$(YELL_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
 	$(WEBKIT_LIBS)
 
@@ -138,6 +140,30 @@ empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS)
 empathy_auth_client_SOURCES =						\
 	empathy-auth-client.c
 
+if HAVE_CALL
+
+libexec_PROGRAMS += empathy-call
+
+empathy_call_SOURCES = \
+       empathy-call.c \
+       empathy-call-factory.c \
+       empathy-call-factory.h \
+       empathy-call-handler.c \
+       empathy-call-handler.h \
+       empathy-call-window.c \
+       empathy-call-window.h \
+       empathy-call-window-fullscreen.c \
+       empathy-call-window-fullscreen.h \
+       empathy-sidebar.c \
+       empathy-sidebar.h
+
+nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
+
+empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
+empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
+
+endif
+
 empathy_handwritten_source = \
 	empathy-about-dialog.c empathy-about-dialog.h			\
 	empathy-chat-window.c empathy-chat-window.h			\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]