From f80ac5a563fe7e7b88f7c3f3b737907792dae355 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Mon, 21 Feb 2011 10:59:56 +0000 Subject: [PATCH] Move farsight-using sources to src And only build them for empathy-av, since they use farsight. --- libempathy-gtk/Makefile.am | 12 ++---------- src/Makefile.am | 8 ++++++++ {libempathy-gtk => src}/empathy-audio-sink.c | 0 {libempathy-gtk => src}/empathy-audio-sink.h | 0 {libempathy-gtk => src}/empathy-audio-src.c | 0 {libempathy-gtk => src}/empathy-audio-src.h | 0 src/empathy-streamed-media-window.c | 8 ++++---- {libempathy-gtk => src}/empathy-video-src.c | 0 {libempathy-gtk => src}/empathy-video-src.h | 0 {libempathy-gtk => src}/empathy-video-widget.c | 0 {libempathy-gtk => src}/empathy-video-widget.h | 0 11 files changed, 14 insertions(+), 14 deletions(-) rename {libempathy-gtk => src}/empathy-audio-sink.c (100%) rename {libempathy-gtk => src}/empathy-audio-sink.h (100%) rename {libempathy-gtk => src}/empathy-audio-src.c (100%) rename {libempathy-gtk => src}/empathy-audio-src.h (100%) rename {libempathy-gtk => src}/empathy-video-src.c (100%) rename {libempathy-gtk => src}/empathy-video-src.h (100%) rename {libempathy-gtk => src}/empathy-video-widget.c (100%) rename {libempathy-gtk => src}/empathy-video-widget.h (100%) diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index b6d68041..47b416fa 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -31,8 +31,6 @@ libempathy_gtk_handwritten_source = \ empathy-account-widget-private.h \ empathy-account-widget-sip.c \ empathy-account-widget.c \ - empathy-audio-sink.c \ - empathy-audio-src.c \ empathy-avatar-chooser.c \ empathy-avatar-image.c \ empathy-cell-renderer-activatable.c \ @@ -85,17 +83,13 @@ libempathy_gtk_handwritten_source = \ empathy-theme-irc.c \ empathy-theme-manager.c \ empathy-tls-dialog.c \ - empathy-ui-utils.c \ - empathy-video-src.c \ - empathy-video-widget.c + empathy-ui-utils.c libempathy_gtk_headers = \ empathy-account-chooser.h \ empathy-account-widget-irc.h \ empathy-account-widget-sip.h \ empathy-account-widget.h \ - empathy-audio-sink.h \ - empathy-audio-src.h \ empathy-avatar-chooser.h \ empathy-avatar-image.h \ empathy-cell-renderer-activatable.h \ @@ -149,9 +143,7 @@ libempathy_gtk_headers = \ empathy-theme-irc.h \ empathy-theme-manager.h \ empathy-tls-dialog.h \ - empathy-ui-utils.h \ - empathy-video-src.h \ - empathy-video-widget.h + empathy-ui-utils.h libempathy_gtk_la_SOURCES = \ $(libempathy_gtk_handwritten_source) \ diff --git a/src/Makefile.am b/src/Makefile.am index 86aff82d..4b1b4c41 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,6 +105,10 @@ empathy_debugger_SOURCES = \ empathy_av_SOURCES = \ empathy-av.c \ + empathy-audio-sink.c \ + empathy-audio-sink.h \ + empathy-audio-src.c \ + empathy-audio-src.h \ empathy-streamed-media-factory.c \ empathy-streamed-media-factory.h \ empathy-streamed-media-handler.c \ @@ -113,6 +117,10 @@ empathy_av_SOURCES = \ empathy-streamed-media-window-fullscreen.h \ empathy-streamed-media-window.c \ empathy-streamed-media-window.h \ + empathy-video-src.c \ + empathy-video-src.h \ + empathy-video-widget.c \ + empathy-video-widget.h \ ev-sidebar.c \ ev-sidebar.h \ $(NULL) diff --git a/libempathy-gtk/empathy-audio-sink.c b/src/empathy-audio-sink.c similarity index 100% rename from libempathy-gtk/empathy-audio-sink.c rename to src/empathy-audio-sink.c diff --git a/libempathy-gtk/empathy-audio-sink.h b/src/empathy-audio-sink.h similarity index 100% rename from libempathy-gtk/empathy-audio-sink.h rename to src/empathy-audio-sink.h diff --git a/libempathy-gtk/empathy-audio-src.c b/src/empathy-audio-src.c similarity index 100% rename from libempathy-gtk/empathy-audio-src.c rename to src/empathy-audio-src.c diff --git a/libempathy-gtk/empathy-audio-src.h b/src/empathy-audio-src.h similarity index 100% rename from libempathy-gtk/empathy-audio-src.h rename to src/empathy-audio-src.h diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index 2408f975..3d022451 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -38,10 +38,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include @@ -52,6 +48,10 @@ #include "empathy-streamed-media-window.h" #include "empathy-streamed-media-window-fullscreen.h" +#include "empathy-video-widget.h" +#include "empathy-audio-src.h" +#include "empathy-audio-sink.h" +#include "empathy-video-src.h" #include "ev-sidebar.h" #define BUTTON_ID "empathy-call-dtmf-button-id" diff --git a/libempathy-gtk/empathy-video-src.c b/src/empathy-video-src.c similarity index 100% rename from libempathy-gtk/empathy-video-src.c rename to src/empathy-video-src.c diff --git a/libempathy-gtk/empathy-video-src.h b/src/empathy-video-src.h similarity index 100% rename from libempathy-gtk/empathy-video-src.h rename to src/empathy-video-src.h diff --git a/libempathy-gtk/empathy-video-widget.c b/src/empathy-video-widget.c similarity index 100% rename from libempathy-gtk/empathy-video-widget.c rename to src/empathy-video-widget.c diff --git a/libempathy-gtk/empathy-video-widget.h b/src/empathy-video-widget.h similarity index 100% rename from libempathy-gtk/empathy-video-widget.h rename to src/empathy-video-widget.h -- 2.39.2