diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2011-08-01 20:48:32 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2011-08-01 20:48:32 +0800 |
| commit | 7876debb7bc9b6232817e68f00eb2d7484fd034a (patch) | |
| tree | bd4ca2a3e5416d8668dc04acba1ce85d13f2b340 /src/Makefile.am | |
| parent | 4651fb354e601f34dc9df08f2b506f765e455ead (diff) | |
| parent | e17e6184ca30b2164e7b30d1a35f504b87973400 (diff) | |
| download | gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.gz gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.bz2 gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.lz gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.xz gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.tar.zst gsoc2013-empathy-7876debb7bc9b6232817e68f00eb2d7484fd034a.zip | |
Merge branch 'change-audio'
Conflicts:
src/empathy-call-window.c
src/empathy-call-window.ui
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2a34494eb..c232652c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -168,7 +168,9 @@ empathy_call_SOURCES = \ empathy-video-widget.c \ empathy-video-widget.h \ ev-sidebar.c \ - ev-sidebar.h + ev-sidebar.h \ + empathy-mic-menu.c \ + empathy-mic-menu.h nodist_empathy_call_SOURCES = $(BUILT_SOURCES) @@ -262,10 +264,10 @@ dist_man_MANS = \ empathy.1 \ empathy-accounts.1 -src-marshal.list: $(empathy_SOURCES) Makefile.am +src-marshal.list: $(empathy_SOURCES) $(empathy_call_SOURCES) Makefile.am $(AM_V_GEN)( cd $(srcdir) && \ sed -n -e 's/.*src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ - $(empathy_SOURCES) $(empathy_av_SOURCES) ) \ + $(empathy_SOURCES) $(empathy_av_SOURCES) $(empathy_call_SOURCES) ) \ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp @if cmp -s $@.tmp $@; then \ rm $@.tmp; \ |