Build an empathy-call binary when we have Call support

Conflicts:

	src/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4d4462d2eb63a305c053b9a66490dfb734978558..c1bed60f6a37a96b60a5da004bdaa7775f8f9ca2 100644 (file)
--- 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 714133eacc6b3f821744e6f357c3e7330c461f0f..3d0437532bcade783e46d9ff9d815105fd61523b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -186,8 +186,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 cf3efb0b3ec5553afdc298bbac2f0227eb415893..82226162562b3878e86b9a0c5bfb94e8a65e1e0e 100644 (file)
--- 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)                                   \
        $(ERROR_CFLAGS)                                 \
        -I$(top_srcdir)                                 \
@@ -24,6 +25,7 @@ LDADD =                                                               \
        $(top_builddir)/extensions/libemp-extensions.la         \
        $(GCR_LIBS)                                             \
        $(EMPATHY_LIBS)                                         \
+       $(YELL_LIBS)                                            \
        $(LIBCHAMPLAIN_LIBS)                                    \
        $(WEBKIT_LIBS)
 
@@ -143,6 +145,38 @@ empathy_chat_SOURCES =                                             \
        gedit-close-button.c gedit-close-button.h \
        $(NULL)
 
+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-audio-sink.c \
+       empathy-audio-sink.h \
+       empathy-audio-src.c \
+       empathy-audio-src.h \
+       empathy-video-src.c \
+       empathy-video-src.h \
+       empathy-video-widget.c \
+       empathy-video-widget.h \
+       ev-sidebar.c \
+       ev-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                     \