← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/audio/codecs/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/codecs/Makefile.in
45
45
        $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
46
46
subdir = src/audio/codecs
47
47
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
48
 
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_expat.m4 \
 
48
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
 
49
        $(top_srcdir)/m4/ax_lib_expat.m4 \
49
50
        $(top_srcdir)/m4/ax_path_lib_pcre.m4 \
50
51
        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
51
52
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
115
116
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
116
117
        $(libcodec_ilbc_so_CXXFLAGS) $(CXXFLAGS) \
117
118
        $(libcodec_ilbc_so_LDFLAGS) $(LDFLAGS) -o $@
118
 
am__libcodec_opus_so_SOURCES_DIST = opus.cpp opus.h
 
119
am__libcodec_opus_so_SOURCES_DIST = opus.cpp opus_wrapper.h
119
120
@BUILD_OPUS_TRUE@am_libcodec_opus_so_OBJECTS =  \
120
121
@BUILD_OPUS_TRUE@       libcodec_opus_so-opus.$(OBJEXT)
121
122
libcodec_opus_so_OBJECTS = $(am_libcodec_opus_so_OBJECTS)
245
246
EXPAT_VERSION = @EXPAT_VERSION@
246
247
FGREP = @FGREP@
247
248
GREP = @GREP@
 
249
HAVE_CXX11 = @HAVE_CXX11@
248
250
INSTALL = @INSTALL@
249
251
INSTALL_DATA = @INSTALL_DATA@
250
252
INSTALL_PROGRAM = @INSTALL_PROGRAM@
303
305
SED = @SED@
304
306
SET_MAKE = @SET_MAKE@
305
307
SHELL = @SHELL@
 
308
SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 
309
SNDFILE_LIBS = @SNDFILE_LIBS@
306
310
STRIP = @STRIP@
307
311
UDEV_CFLAGS = @UDEV_CFLAGS@
308
312
UDEV_LIBS = @UDEV_LIBS@
379
383
sflplugindir = $(sfllibdir)/plugins
380
384
ASTYLERC = "$(top_srcdir)/../astylerc"
381
385
indent = "/usr/bin/astyle"
 
386
PJPROJECT_DIR = pjproject-2.1.0
382
387
PJSIP_LIBS = $(APP_LDFLAGS) $(APP_LDLIBS)
383
 
SIP_CFLAGS = -I$(src)/libs/pjproject-2.0.1/pjsip/include \
384
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
385
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
386
 
                   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
387
 
                   -I$(src)/libs/pjproject-2.0.1/pjnath/include
 
388
SIP_CFLAGS = -I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
 
389
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
 
390
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
 
391
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
 
392
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
 
393
                   -DPJ_AUTOCONF=1
388
394
 
389
395
@BUILD_SPEEX_FALSE@SPEEXCODEC = 
390
396
@BUILD_SPEEX_TRUE@SPEEXCODEC = -DHAVE_SPEEX_CODEC
 
397
@BUILD_OPUS_FALSE@OPUSCODEC = 
 
398
@BUILD_OPUS_TRUE@OPUSCODEC = -DHAVE_OPUS
391
399
@BUILD_GSM_FALSE@GSMCODEC = 
392
400
@BUILD_GSM_TRUE@GSMCODEC = -DHAVE_GSM_CODEC
393
401
 
395
403
AM_CPPFLAGS = \
396
404
        -I$(src)/libs \
397
405
        -I$(src)/libs/iax2 \
398
 
        -I$(src)/libs/pjproject-2.0.1 \
 
406
        -I$(src)/libs/$(PJPROJECT_DIR) \
399
407
        -I$(src)/src \
400
408
        -I$(src)/src/config \
401
409
        -I$(src)/test \
406
414
        -DCODECS_DIR=\""$(sflcodecdir)"\" \
407
415
        -DPLUGINS_DIR=\""$(sflplugindir)"\" \
408
416
        -DENABLE_TRACE \
409
 
         $(SPEEXCODEC) \
410
 
         $(GSMCODEC)
 
417
        $(SPEEXCODEC) \
 
418
        $(GSMCODEC) \
 
419
        $(OPUSCODEC)
411
420
 
412
421
noinst_LTLIBRARIES = libcodecdescriptor.la
413
422
libcodecdescriptor_la_SOURCES = audiocodecfactory.cpp audiocodec.cpp audiocodec.h audiocodecfactory.h
437
446
@BUILD_SPEEX_TRUE@libcodec_speex_ub_so_LDADD = libcodecdescriptor.la
438
447
@BUILD_SPEEX_TRUE@INSTALL_SPEEX_UB_RULE = install-libcodec_speex_ub_so
439
448
@BUILD_OPUS_TRUE@OPUS_LIB = libcodec_opus.so
440
 
@BUILD_OPUS_TRUE@libcodec_opus_so_SOURCES = opus.cpp opus.h
 
449
@BUILD_OPUS_TRUE@libcodec_opus_so_SOURCES = opus.cpp opus_wrapper.h
441
450
@BUILD_OPUS_TRUE@libcodec_opus_so_CXXFLAGS = -fPIC -g -Wall $(opus_CFLAGS)
442
451
@BUILD_OPUS_TRUE@libcodec_opus_so_LDFLAGS = --shared -lc -ldl -lstdc++ $(opus_LIBS)
443
452
@BUILD_OPUS_TRUE@libcodec_opus_so_LDADD = libcodecdescriptor.la
957
966
 
958
967
 
959
968
# for pjsip
960
 
include $(src)/libs/pjproject-2.0.1/build.mak
 
969
include $(src)/libs/$(PJPROJECT_DIR)/build.mak
961
970
 
962
971
indent:
963
972
        @echo "Indenting code:"