← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

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

  • Committer: Jackson Doak
  • Date: 2013-07-10 21:04:46 UTC
  • mfrom: (20.1.3 sid)
  • Revision ID: noskcaj@ubuntu.com-20130710210446-y8f587vza807icr9
https://launchpad.net/bugs/1196978
Properly merged from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/audio/alsa/Makefile.in
58
58
am_libalsalayer_la_OBJECTS = alsalayer.lo
59
59
libalsalayer_la_OBJECTS = $(am_libalsalayer_la_OBJECTS)
60
60
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
61
 
depcomp = $(SHELL) $(top_srcdir)/depcomp
 
61
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
62
62
am__depfiles_maybe = depfiles
63
63
am__mv = mv -f
64
64
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
225
225
install_sh = @install_sh@
226
226
libdir = @libdir@
227
227
libexecdir = @libexecdir@
 
228
libilbc_CFLAGS = @libilbc_CFLAGS@
 
229
libilbc_LIBS = @libilbc_LIBS@
228
230
libssl_CFLAGS = @libssl_CFLAGS@
229
231
libssl_LIBS = @libssl_LIBS@
230
232
localedir = @localedir@
232
234
mandir = @mandir@
233
235
mkdir_p = @mkdir_p@
234
236
oldincludedir = @oldincludedir@
 
237
opus_CFLAGS = @opus_CFLAGS@
 
238
opus_LIBS = @opus_LIBS@
235
239
pdfdir = @pdfdir@
236
240
prefix = @prefix@
237
241
program_transform_name = @program_transform_name@
252
256
ASTYLERC = "$(top_srcdir)/../astylerc"
253
257
indent = "/usr/bin/astyle"
254
258
PJSIP_LIBS = $(APP_LDFLAGS) $(APP_LDLIBS)
255
 
SIP_CFLAGS = -I$(src)/libs/pjproject/pjsip/include \
256
 
                   -I$(src)/libs/pjproject/pjlib/include \
257
 
                   -I$(src)/libs/pjproject/pjlib-util/include \
258
 
                   -I$(src)/libs/pjproject/pjmedia/include \
259
 
                   -I$(src)/libs/pjproject/pjnath/include
 
259
SIP_CFLAGS = -I$(src)/libs/pjproject-2.0.1/pjsip/include \
 
260
                   -I$(src)/libs/pjproject-2.0.1/pjlib/include \
 
261
                   -I$(src)/libs/pjproject-2.0.1/pjlib-util/include \
 
262
                   -I$(src)/libs/pjproject-2.0.1/pjmedia/include \
 
263
                   -I$(src)/libs/pjproject-2.0.1/pjnath/include
260
264
 
261
265
@BUILD_SPEEX_FALSE@SPEEXCODEC = 
262
266
@BUILD_SPEEX_TRUE@SPEEXCODEC = -DHAVE_SPEEX_CODEC
267
271
AM_CPPFLAGS = \
268
272
        -I$(src)/libs \
269
273
        -I$(src)/libs/iax2 \
270
 
        -I$(src)/libs/pjproject \
 
274
        -I$(src)/libs/pjproject-2.0.1 \
271
275
        -I$(src)/src \
272
276
        -I$(src)/src/config \
273
277
        -I$(src)/test \
570
574
 
571
575
 
572
576
# for pjsip
573
 
include $(src)/libs/pjproject/build.mak
 
577
include $(src)/libs/pjproject-2.0.1/build.mak
574
578
 
575
579
indent:
576
580
        @echo "Indenting code:"