← Back to branch summary

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

« back to all changes in this revision

Viewing changes to daemon/src/video/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/video/Makefile.in
40
40
        $(top_srcdir)/globals.mak TODO
41
41
subdir = src/video
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 \
54
55
CONFIG_CLEAN_VPATH_FILES =
55
56
LTLIBRARIES = $(noinst_LTLIBRARIES)
56
57
libvideo_la_DEPENDENCIES =
57
 
am_libvideo_la_OBJECTS = libav_utils.lo video_rtp_session.lo \
58
 
        video_send_thread.lo video_receive_thread.lo video_preview.lo \
59
 
        video_v4l2.lo video_v4l2_list.lo video_preferences.lo \
60
 
        packet_handle.lo shm_sink.lo socket_pair.lo
 
58
am_libvideo_la_OBJECTS = video_v4l2.lo video_v4l2_list.lo \
 
59
        video_preferences.lo video_base.lo video_scaler.lo \
 
60
        video_decoder.lo video_encoder.lo video_mixer.lo \
 
61
        socket_pair.lo shm_sink.lo video_camera.lo \
 
62
        video_receive_thread.lo video_sender.lo video_rtp_session.lo \
 
63
        libav_utils.lo
61
64
libvideo_la_OBJECTS = $(am_libvideo_la_OBJECTS)
62
65
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
63
66
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
169
172
EXPAT_VERSION = @EXPAT_VERSION@
170
173
FGREP = @FGREP@
171
174
GREP = @GREP@
 
175
HAVE_CXX11 = @HAVE_CXX11@
172
176
INSTALL = @INSTALL@
173
177
INSTALL_DATA = @INSTALL_DATA@
174
178
INSTALL_PROGRAM = @INSTALL_PROGRAM@
227
231
SED = @SED@
228
232
SET_MAKE = @SET_MAKE@
229
233
SHELL = @SHELL@
 
234
SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
 
235
SNDFILE_LIBS = @SNDFILE_LIBS@
230
236
STRIP = @STRIP@
231
237
UDEV_CFLAGS = @UDEV_CFLAGS@
232
238
UDEV_LIBS = @UDEV_LIBS@
303
309
sflplugindir = $(sfllibdir)/plugins
304
310
ASTYLERC = "$(top_srcdir)/../astylerc"
305
311
indent = "/usr/bin/astyle"
 
312
PJPROJECT_DIR = pjproject-2.1.0
306
313
PJSIP_LIBS = $(APP_LDFLAGS) $(APP_LDLIBS)
307
 
SIP_CFLAGS = -I$(src)/libs/pjproject-2.0.1/pjsip/include \
308
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
309
 
                   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
310
 
                   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
311
 
                   -I$(src)/libs/pjproject-2.0.1/pjnath/include
 
314
SIP_CFLAGS = -I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
 
315
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
 
316
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
 
317
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
 
318
                   -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
 
319
                   -DPJ_AUTOCONF=1
312
320
 
313
321
@BUILD_SPEEX_FALSE@SPEEXCODEC = 
314
322
@BUILD_SPEEX_TRUE@SPEEXCODEC = -DHAVE_SPEEX_CODEC
 
323
@BUILD_OPUS_FALSE@OPUSCODEC = 
 
324
@BUILD_OPUS_TRUE@OPUSCODEC = -DHAVE_OPUS
315
325
@BUILD_GSM_FALSE@GSMCODEC = 
316
326
@BUILD_GSM_TRUE@GSMCODEC = -DHAVE_GSM_CODEC
317
327
 
319
329
AM_CPPFLAGS = \
320
330
        -I$(src)/libs \
321
331
        -I$(src)/libs/iax2 \
322
 
        -I$(src)/libs/pjproject-2.0.1 \
 
332
        -I$(src)/libs/$(PJPROJECT_DIR) \
323
333
        -I$(src)/src \
324
334
        -I$(src)/src/config \
325
335
        -I$(src)/test \
330
340
        -DCODECS_DIR=\""$(sflcodecdir)"\" \
331
341
        -DPLUGINS_DIR=\""$(sflplugindir)"\" \
332
342
        -DENABLE_TRACE \
333
 
         $(SPEEXCODEC) \
334
 
         $(GSMCODEC)
 
343
        $(SPEEXCODEC) \
 
344
        $(GSMCODEC) \
 
345
        $(OPUSCODEC)
335
346
 
336
347
SUBDIRS = test
337
348
noinst_LTLIBRARIES = libvideo.la
338
 
libvideo_la_SOURCES = libav_utils.cpp libav_utils.h video_rtp_session.cpp \
339
 
                      video_rtp_session.h video_send_thread.h video_send_thread.cpp \
340
 
                      video_receive_thread.h video_receive_thread.cpp \
341
 
                      video_preview.h video_preview.cpp video_v4l2.cpp \
342
 
                      video_v4l2_list.cpp video_v4l2.h video_v4l2_list.h \
343
 
                      video_preferences.h video_preferences.cpp \
344
 
                      packet_handle.h packet_handle.cpp check.h shm_header.h \
345
 
                      shm_sink.cpp shm_sink.h video_provider.h \
346
 
                      socket_pair.cpp socket_pair.h
 
349
libvideo_la_SOURCES = \
 
350
        video_v4l2.cpp \
 
351
        video_v4l2_list.cpp video_v4l2.h video_v4l2_list.h \
 
352
        video_preferences.cpp video_preferences.h \
 
353
        video_base.cpp video_base.h \
 
354
        video_scaler.cpp video_scaler.h \
 
355
        video_decoder.cpp video_decoder.h \
 
356
        video_encoder.cpp video_encoder.h \
 
357
        video_mixer.cpp video_mixer.h \
 
358
        socket_pair.cpp socket_pair.h \
 
359
        shm_sink.cpp shm_sink.h \
 
360
        video_camera.cpp video_camera.h \
 
361
        video_receive_thread.cpp video_receive_thread.h \
 
362
        video_sender.cpp video_sender.h \
 
363
        video_rtp_session.cpp video_rtp_session.h \
 
364
        check.h shm_header.h video_provider.h \
 
365
        libav_utils.cpp libav_utils.h libav_deps.h
347
366
 
348
367
libvideo_la_LIBADD = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVDEVICE_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ @UDEV_LIBS@
349
368
AM_CXXFLAGS = @LIBAVCODEC_CFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVDEVICE_CFLAGS@ @LIBSWSCALE_CFLAGS@ @UDEV_CFLAGS@
402
421
        -rm -f *.tab.c
403
422
 
404
423
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libav_utils.Plo@am__quote@
405
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet_handle.Plo@am__quote@
406
424
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shm_sink.Plo@am__quote@
407
425
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket_pair.Plo@am__quote@
 
426
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_base.Plo@am__quote@
 
427
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_camera.Plo@am__quote@
 
428
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_decoder.Plo@am__quote@
 
429
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_encoder.Plo@am__quote@
 
430
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_mixer.Plo@am__quote@
408
431
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_preferences.Plo@am__quote@
409
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_preview.Plo@am__quote@
410
432
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_receive_thread.Plo@am__quote@
411
433
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_rtp_session.Plo@am__quote@
412
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_send_thread.Plo@am__quote@
 
434
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_scaler.Plo@am__quote@
 
435
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_sender.Plo@am__quote@
413
436
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_v4l2.Plo@am__quote@
414
437
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_v4l2_list.Plo@am__quote@
415
438
 
759
782
 
760
783
 
761
784
# for pjsip
762
 
include $(src)/libs/pjproject-2.0.1/build.mak
 
785
include $(src)/libs/$(PJPROJECT_DIR)/build.mak
763
786
 
764
787
indent:
765
788
        @echo "Indenting code:"