← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/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/Makefile.in
43
43
        build-aux/install-sh build-aux/ltmain.sh build-aux/missing
44
44
subdir = .
45
45
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
46
 
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_expat.m4 \
 
46
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
 
47
        $(top_srcdir)/m4/ax_lib_expat.m4 \
47
48
        $(top_srcdir)/m4/ax_path_lib_pcre.m4 \
48
49
        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
49
50
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
158
159
EXPAT_VERSION = @EXPAT_VERSION@
159
160
FGREP = @FGREP@
160
161
GREP = @GREP@
 
162
HAVE_CXX11 = @HAVE_CXX11@
161
163
INSTALL = @INSTALL@
162
164
INSTALL_DATA = @INSTALL_DATA@
163
165
INSTALL_PROGRAM = @INSTALL_PROGRAM@
216
218
SED = @SED@
217
219
SET_MAKE = @SET_MAKE@
218
220
SHELL = @SHELL@
 
221
SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 
222
SNDFILE_LIBS = @SNDFILE_LIBS@
219
223
STRIP = @STRIP@
220
224
UDEV_CFLAGS = @UDEV_CFLAGS@
221
225
UDEV_LIBS = @UDEV_LIBS@
292
296
sflplugindir = $(sfllibdir)/plugins
293
297
ASTYLERC = "$(top_srcdir)/../astylerc"
294
298
indent = "/usr/bin/astyle"
 
299
PJPROJECT_DIR = pjproject-2.1.0
295
300
PJSIP_LIBS = $(APP_LDFLAGS) $(APP_LDLIBS)
296
 
SIP_CFLAGS = -I$(src)/libs/pjproject-2.0.1/pjsip/include \
297
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
298
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
299
 
                   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
300
 
                   -I$(src)/libs/pjproject-2.0.1/pjnath/include
 
301
SIP_CFLAGS = -I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
 
302
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
 
303
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
 
304
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
 
305
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
 
306
                   -DPJ_AUTOCONF=1
301
307
 
302
308
@BUILD_SPEEX_FALSE@SPEEXCODEC = 
303
309
@BUILD_SPEEX_TRUE@SPEEXCODEC = -DHAVE_SPEEX_CODEC
 
310
@BUILD_OPUS_FALSE@OPUSCODEC = 
 
311
@BUILD_OPUS_TRUE@OPUSCODEC = -DHAVE_OPUS
304
312
@BUILD_GSM_FALSE@GSMCODEC = 
305
313
@BUILD_GSM_TRUE@GSMCODEC = -DHAVE_GSM_CODEC
306
314
 
308
316
AM_CPPFLAGS = \
309
317
        -I$(src)/libs \
310
318
        -I$(src)/libs/iax2 \
311
 
        -I$(src)/libs/pjproject-2.0.1 \
 
319
        -I$(src)/libs/$(PJPROJECT_DIR) \
312
320
        -I$(src)/src \
313
321
        -I$(src)/src/config \
314
322
        -I$(src)/test \
319
327
        -DCODECS_DIR=\""$(sflcodecdir)"\" \
320
328
        -DPLUGINS_DIR=\""$(sflplugindir)"\" \
321
329
        -DENABLE_TRACE \
322
 
         $(SPEEXCODEC) \
323
 
         $(GSMCODEC)
 
330
        $(SPEEXCODEC) \
 
331
        $(GSMCODEC) \
 
332
        $(OPUSCODEC)
324
333
 
325
334
 
326
335
# Makefile.am
849
858
 
850
859
 
851
860
# for pjsip
852
 
include $(src)/libs/pjproject-2.0.1/build.mak
 
861
include $(src)/libs/$(PJPROJECT_DIR)/build.mak
853
862
 
854
863
indent:
855
864
        @echo "Indenting code:"