diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-28 19:07:03 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-01 23:49:06 +0800 |
| commit | 4110a4bc8b8c2a63e94615594eba3b109dcf97e4 (patch) | |
| tree | d06236f38b94639591d0b89f25c19e543a52ccca /src/Makefile.am | |
| parent | afb9276b8a497e7b9275fb53abafd0cdb18d55fc (diff) | |
| download | gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.gz gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.bz2 gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.lz gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.xz gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.zst gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.zip | |
Revert "Drop empathy-av"
This reverts commit ba0a893b1d31cdb234bae72845e840a895b9d62a.
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1857eb578..ffc74e7fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ bin_PROGRAMS = \ libexec_PROGRAMS = \ empathy-auth-client \ + empathy-av \ empathy-chat empathy_accounts_SOURCES = \ @@ -68,6 +69,33 @@ empathy_debugger_SOURCES = \ empathy-debugger.c \ $(NULL) +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 \ + 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 \ + empathy-video-src.c \ + empathy-video-src.h \ + empathy-video-widget.c \ + empathy-video-widget.h \ + ev-sidebar.c \ + ev-sidebar.h \ + empathy-mic-monitor.c \ + empathy-mic-monitor.h + $(NULL) + +empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS) +empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS) $(LIBM) + empathy_auth_client_SOURCES = \ empathy-auth-client.c \ $(NULL) @@ -171,6 +199,7 @@ ui_DATA = \ empathy-accounts-dialog.ui \ empathy-call-window-fullscreen.ui \ empathy-call-window.ui \ + empathy-streamed-media-window.ui \ empathy-chat-window.ui \ empathy-chatrooms-window.ui \ empathy-ft-manager.ui \ |