← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Francois Marier
  • Date: 2012-02-18 21:47:09 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120218214709-6362d71gqdsdkrj5
Tags: 1.0.2-1
http://bugs.debian.org/658987
* New upstream release
  - remove logging patch (applied upstream)
  - update s390 patch since it was partially applied upstream
* Include the Evolution plugin as a separate binary package

* Fix compilation issues on SH4 (closes: #658987)
* Merge Ubuntu's binutils-gold linking fix

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 pulseaudio 
 
5
SUBDIRS = codecs audiortp sound alsa pulseaudio
6
6
 
7
7
libaudio_la_SOURCES = \
8
8
                audioloop.cpp \
42
42
        ./codecs/libcodecdescriptor.la \
43
43
        ./alsa/libalsalayer.la \
44
44
        ./pulseaudio/libpulselayer.la \
45
 
        ./sound/libsound.la 
 
45
        ./sound/libsound.la
46
46
 
47
47
 
48
48