← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to daemon/src/audio/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/audio/Makefile.am
2
2
 
3
3
noinst_LTLIBRARIES = libaudio.la
4
4
 
5
 
SUBDIRS = codecs audiortp sound alsa
 
5
SUBDIRS = codecs audiortp sound
 
6
 
 
7
if BUILD_ALSA
 
8
SUBDIRS += alsa
 
9
endif
6
10
 
7
11
if BUILD_PULSE
8
12
SUBDIRS += pulseaudio
9
13
endif
10
14
 
11
15
if BUILD_SPEEXDSP
12
 
SFL_SPEEXDSP_SRC=noisesuppress.cpp
13
 
SFL_SPEEXDSP_HEAD=noisesuppress.h
 
16
SFL_SPEEXDSP_SRC=dsp.cpp
 
17
SFL_SPEEXDSP_HEAD=dsp.h
14
18
endif
15
19
 
16
20
libaudio_la_SOURCES = \
 
21
                audiobuffer.cpp \
17
22
                audioloop.cpp \
18
23
                ringbuffer.cpp \
19
24
                mainbuffer.cpp \
22
27
                recordable.cpp \
23
28
                audiolayer.cpp \
24
29
                samplerateconverter.cpp \
25
 
                delaydetection.cpp \
26
30
                $(SFL_SPEEXDSP_SRC) \
27
 
                gaincontrol.cpp \
28
31
                dcblocker.cpp
29
32
 
30
33
noinst_HEADERS = \
 
34
                audiobuffer.h \
31
35
                audioloop.h \
32
36
                ringbuffer.h \
33
37
                mainbuffer.h \
35
39
                audiorecorder.h \
36
40
                audiolayer.h \
37
41
                recordable.h \
38
 
                delaydetection.h \
39
42
                $(SFL_SPEEXDSP_HEAD) \
40
 
                gaincontrol.h \
41
43
                dcblocker.h \
42
44
                samplerateconverter.h
43
45
 
44
46
libaudio_la_LIBADD = \
45
47
        ./audiortp/libaudiortp.la \
46
48
        ./codecs/libcodecdescriptor.la \
47
 
        ./alsa/libalsalayer.la \
48
49
        ./sound/libsound.la
49
50
 
50
51
if BUILD_PULSE
51
52
libaudio_la_LIBADD += ./pulseaudio/libpulselayer.la
52
53
endif
 
54
 
 
55
if BUILD_ALSA
 
56
libaudio_la_LIBADD += ./alsa/libalsalayer.la
 
57
endif