← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/im/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/im/Makefile.in
40
40
        $(top_srcdir)/globals.mak
41
41
subdir = src/im
42
42
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
43
 
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_expat.m4 \
 
43
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
 
44
        $(top_srcdir)/m4/ax_lib_expat.m4 \
44
45
        $(top_srcdir)/m4/ax_path_lib_pcre.m4 \
45
46
        $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
46
47
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
128
129
EXPAT_VERSION = @EXPAT_VERSION@
129
130
FGREP = @FGREP@
130
131
GREP = @GREP@
 
132
HAVE_CXX11 = @HAVE_CXX11@
131
133
INSTALL = @INSTALL@
132
134
INSTALL_DATA = @INSTALL_DATA@
133
135
INSTALL_PROGRAM = @INSTALL_PROGRAM@
186
188
SED = @SED@
187
189
SET_MAKE = @SET_MAKE@
188
190
SHELL = @SHELL@
 
191
SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 
192
SNDFILE_LIBS = @SNDFILE_LIBS@
189
193
STRIP = @STRIP@
190
194
UDEV_CFLAGS = @UDEV_CFLAGS@
191
195
UDEV_LIBS = @UDEV_LIBS@
262
266
sflplugindir = $(sfllibdir)/plugins
263
267
ASTYLERC = "$(top_srcdir)/../astylerc"
264
268
indent = "/usr/bin/astyle"
 
269
PJPROJECT_DIR = pjproject-2.1.0
265
270
PJSIP_LIBS = $(APP_LDFLAGS) $(APP_LDLIBS)
266
 
SIP_CFLAGS = -I$(src)/libs/pjproject-2.0.1/pjsip/include \
267
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
268
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
269
 
                   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
270
 
                   -I$(src)/libs/pjproject-2.0.1/pjnath/include
 
271
SIP_CFLAGS = -I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
 
272
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
 
273
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
 
274
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
 
275
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
 
276
                   -DPJ_AUTOCONF=1
271
277
 
272
278
@BUILD_SPEEX_FALSE@SPEEXCODEC = 
273
279
@BUILD_SPEEX_TRUE@SPEEXCODEC = -DHAVE_SPEEX_CODEC
 
280
@BUILD_OPUS_FALSE@OPUSCODEC = 
 
281
@BUILD_OPUS_TRUE@OPUSCODEC = -DHAVE_OPUS
274
282
@BUILD_GSM_FALSE@GSMCODEC = 
275
283
@BUILD_GSM_TRUE@GSMCODEC = -DHAVE_GSM_CODEC
276
284
 
278
286
AM_CPPFLAGS = \
279
287
        -I$(src)/libs \
280
288
        -I$(src)/libs/iax2 \
281
 
        -I$(src)/libs/pjproject-2.0.1 \
 
289
        -I$(src)/libs/$(PJPROJECT_DIR) \
282
290
        -I$(src)/src \
283
291
        -I$(src)/src/config \
284
292
        -I$(src)/test \
289
297
        -DCODECS_DIR=\""$(sflcodecdir)"\" \
290
298
        -DPLUGINS_DIR=\""$(sflplugindir)"\" \
291
299
        -DENABLE_TRACE \
292
 
         $(SPEEXCODEC) \
293
 
         $(GSMCODEC)
 
300
        $(SPEEXCODEC) \
 
301
        $(GSMCODEC) \
 
302
        $(OPUSCODEC)
294
303
 
295
304
noinst_LTLIBRARIES = libim.la
296
305
libim_la_SOURCES = instant_messaging.cpp instant_messaging.h
580
589
 
581
590
 
582
591
# for pjsip
583
 
include $(src)/libs/pjproject-2.0.1/build.mak
 
592
include $(src)/libs/$(PJPROJECT_DIR)/build.mak
584
593
 
585
594
indent:
586
595
        @echo "Indenting code:"