Only build the EmpathyStreamedMedia* classes for empathy-av

So the other binaries don't need to link against farsight.

8 files changed, 29 insertions, 28 deletions

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index b2d88885f..45c09f078 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -52,8 +52,6 @@ libempathy_headers =				\
 	empathy-server-sasl-handler.h		\
 	empathy-server-tls-handler.h		\
 	empathy-status-presets.h		\
-	empathy-streamed-media-factory.h	\
-	empathy-streamed-media-handler.h	\
 	empathy-time.h				\
 	empathy-tls-certificate.h		\
 	empathy-tls-verifier.h			\
@@ -92,8 +90,6 @@ libempathy_la_SOURCES =					\
 	empathy-server-sasl-handler.c			\
 	empathy-server-tls-handler.c			\
 	empathy-status-presets.c			\
-	empathy-streamed-media-factory.c		\
-	empathy-streamed-media-handler.c		\
 	empathy-time.c					\
 	empathy-tls-certificate.c			\
 	empathy-tls-verifier.c				\
diff --git a/src/Makefile.am b/src/Makefile.am
index d2b7f013d..5f086ef40 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,8 +80,8 @@ bin_PROGRAMS =			\
 	$(NULL)
 
 libexec_PROGRAMS = \
-	empathy-av \
 	empathy-auth-client \
+	empathy-av \
 	empathy-chat
 
 BUILT_SOURCES = \
@@ -103,16 +103,21 @@ empathy_debugger_SOURCES =						\
 	empathy-debugger.c		 				\
 	$(NULL)
 
-empathy_handwritten_av_source = \
+empathy_av_SOURCES = \
 	empathy-av.c \
-	empathy-streamed-media-window-fullscreen.c empathy-streamed-media-window-fullscreen.h	\
-	empathy-streamed-media-window.c empathy-streamed-media-window.h	\
-	$(NULL)
-
-empathy_av_SOURCES =						\
-	$(empathy_handwritten_av_source) \
-	ev-sidebar.c ev-sidebar.h \
-	$(NULL)
+	empathy-streamed-media-factory.c \
+	empathy-streamed-media-factory.h \
+	empathy-streamed-media-handler.c \
+	empathy-streamed-media-handler.h \
+	empathy-streamed-media-window-fullscreen.c \
+	empathy-streamed-media-window-fullscreen.h \
+	empathy-streamed-media-window.c \
+	empathy-streamed-media-window.h \
+	ev-sidebar.c \
+	ev-sidebar.h \
+	$(NULL)
+
+nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
 
 empathy_auth_client_SOURCES =						\
 	empathy-auth-client.c \
diff --git a/src/empathy-av.c b/src/empathy-av.c
index cfe71d1a5..37438fe32 100644
--- a/src/empathy-av.c
+++ b/src/empathy-av.c
@@ -28,10 +28,10 @@
 
 #include <telepathy-glib/debug-sender.h>
 
-#include <libempathy/empathy-streamed-media-factory.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-streamed-media-window.h"
+#include "empathy-streamed-media-factory.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy/empathy-streamed-media-factory.c b/src/empathy-streamed-media-factory.c
index 7c4dca763..70b237941 100644
--- a/libempathy/empathy-streamed-media-factory.c
+++ b/src/empathy-streamed-media-factory.c
@@ -27,10 +27,11 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>
 
-#include "empathy-dispatcher.h"
-#include "empathy-marshal.h"
+#include <libempathy/empathy-utils.h>
+
 #include "empathy-streamed-media-factory.h"
-#include "empathy-utils.h"
+#include "empathy-streamed-media-handler.h"
+#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -171,7 +172,7 @@ empathy_streamed_media_factory_class_init (
       G_TYPE_FROM_CLASS (empathy_streamed_media_factory_class),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__OBJECT_BOOLEAN,
+      _src_marshal_VOID__OBJECT_BOOLEAN,
       G_TYPE_NONE,
       2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN);
 }
diff --git a/libempathy/empathy-streamed-media-factory.h b/src/empathy-streamed-media-factory.h
index b1fbfaf1e..c69073ec4 100644
--- a/libempathy/empathy-streamed-media-factory.h
+++ b/src/empathy-streamed-media-factory.h
@@ -23,9 +23,6 @@
 
 #include <glib-object.h>
 
-#include <libempathy/empathy-streamed-media-handler.h>
-#include <libempathy/empathy-dispatcher.h>
-
 G_BEGIN_DECLS
 
 typedef struct _EmpathyStreamedMediaFactory EmpathyStreamedMediaFactory;
diff --git a/libempathy/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index 6172376a0..75007f1ab 100644
--- a/libempathy/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.c
@@ -29,9 +29,10 @@
 #include <telepathy-farsight/channel.h>
 #include <telepathy-farsight/stream.h>
 
+#include <libempathy/empathy-utils.h>
+
 #include "empathy-streamed-media-handler.h"
-#include "empathy-marshal.h"
-#include "empathy-utils.h"
+#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -346,14 +347,14 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
   signals[SRC_PAD_ADDED] =
     g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _empathy_marshal_BOOLEAN__OBJECT_UINT,
+      _src_marshal_BOOLEAN__OBJECT_UINT,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_ADDED] =
     g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _empathy_marshal_BOOLEAN__OBJECT_UINT,
+      _src_marshal_BOOLEAN__OBJECT_UINT,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
@@ -361,7 +362,7 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
     g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       g_signal_accumulator_true_handled, NULL,
-      _empathy_marshal_BOOLEAN__UINT_UINT,
+      _src_marshal_BOOLEAN__UINT_UINT,
       G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   signals[CLOSED] =
diff --git a/libempathy/empathy-streamed-media-handler.h b/src/empathy-streamed-media-handler.h
index ab655b8e4..ab655b8e4 100644
--- a/libempathy/empathy-streamed-media-handler.h
+++ b/src/empathy-streamed-media-handler.h
diff --git a/src/empathy-streamed-media-window.h b/src/empathy-streamed-media-window.h
index 3de80eb28..aae56d882 100644
--- a/src/empathy-streamed-media-window.h
+++ b/src/empathy-streamed-media-window.h
@@ -23,7 +23,8 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <libempathy/empathy-streamed-media-handler.h>
+
+#include "empathy-streamed-media-handler.h"
 
 G_BEGIN_DECLS