← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/audio/pulseaudio/Makefile.in

  • 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/pulseaudio/Makefile.in
41
41
        $(srcdir)/Makefile.in $(top_srcdir)/globals.mak
42
42
subdir = src/audio/pulseaudio
43
43
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44
 
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_expat.m4 \
 
44
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
 
45
        $(top_srcdir)/m4/ax_lib_expat.m4 \
45
46
        $(top_srcdir)/m4/ax_path_lib_pcre.m4 \
46
47
        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
47
48
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
125
126
EXPAT_VERSION = @EXPAT_VERSION@
126
127
FGREP = @FGREP@
127
128
GREP = @GREP@
 
129
HAVE_CXX11 = @HAVE_CXX11@
128
130
INSTALL = @INSTALL@
129
131
INSTALL_DATA = @INSTALL_DATA@
130
132
INSTALL_PROGRAM = @INSTALL_PROGRAM@
183
185
SED = @SED@
184
186
SET_MAKE = @SET_MAKE@
185
187
SHELL = @SHELL@
 
188
SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 
189
SNDFILE_LIBS = @SNDFILE_LIBS@
186
190
STRIP = @STRIP@
187
191
UDEV_CFLAGS = @UDEV_CFLAGS@
188
192
UDEV_LIBS = @UDEV_LIBS@
259
263
sflplugindir = $(sfllibdir)/plugins
260
264
ASTYLERC = "$(top_srcdir)/../astylerc"
261
265
indent = "/usr/bin/astyle"
 
266
PJPROJECT_DIR = pjproject-2.1.0
262
267
PJSIP_LIBS = $(APP_LDFLAGS) $(APP_LDLIBS)
263
 
SIP_CFLAGS = -I$(src)/libs/pjproject-2.0.1/pjsip/include \
264
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
265
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
266
 
                   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
267
 
                   -I$(src)/libs/pjproject-2.0.1/pjnath/include
 
268
SIP_CFLAGS = -I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
 
269
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
 
270
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
 
271
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
 
272
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
 
273
                   -DPJ_AUTOCONF=1
268
274
 
269
275
@BUILD_SPEEX_FALSE@SPEEXCODEC = 
270
276
@BUILD_SPEEX_TRUE@SPEEXCODEC = -DHAVE_SPEEX_CODEC
 
277
@BUILD_OPUS_FALSE@OPUSCODEC = 
 
278
@BUILD_OPUS_TRUE@OPUSCODEC = -DHAVE_OPUS
271
279
@BUILD_GSM_FALSE@GSMCODEC = 
272
280
@BUILD_GSM_TRUE@GSMCODEC = -DHAVE_GSM_CODEC
273
281
 
275
283
AM_CPPFLAGS = \
276
284
        -I$(src)/libs \
277
285
        -I$(src)/libs/iax2 \
278
 
        -I$(src)/libs/pjproject-2.0.1 \
 
286
        -I$(src)/libs/$(PJPROJECT_DIR) \
279
287
        -I$(src)/src \
280
288
        -I$(src)/src/config \
281
289
        -I$(src)/test \
286
294
        -DCODECS_DIR=\""$(sflcodecdir)"\" \
287
295
        -DPLUGINS_DIR=\""$(sflplugindir)"\" \
288
296
        -DENABLE_TRACE \
289
 
         $(SPEEXCODEC) \
290
 
         $(GSMCODEC)
 
297
        $(SPEEXCODEC) \
 
298
        $(GSMCODEC) \
 
299
        $(OPUSCODEC)
291
300
 
292
301
@BUILD_PULSE_TRUE@noinst_LTLIBRARIES = libpulselayer.la
293
302
@BUILD_PULSE_TRUE@libpulselayer_la_SOURCES = \
585
594
 
586
595
 
587
596
# for pjsip
588
 
include $(src)/libs/pjproject-2.0.1/build.mak
 
597
include $(src)/libs/$(PJPROJECT_DIR)/build.mak
589
598
 
590
599
indent:
591
600
        @echo "Indenting code:"