← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gnome/src/config/Makefile

  • Committer: Package Import Robot
  • Author(s): Francois Marier, Francois Marier, Mark Purcell
  • Date: 2014-10-18 15:08:50 UTC
  • mfrom: (1.1.12)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20141018150850-2exfk34ckb15pcwi
Tags: 1.4.1-0.1
http://bugs.debian.org/759576
http://bugs.debian.org/741130
[ Francois Marier ]
* Non-maintainer upload
* New upstream release (closes: #759576, #741130)
  - debian/rules +PJPROJECT_VERSION := 2.2.1
  - add upstream patch to fix broken TLS support
  - add patch to fix pjproject regression

[ Mark Purcell ]
* Build-Depends:
  - sflphone-daemon + libavformat-dev, libavcodec-dev, libswscale-dev,
  libavdevice-dev, libavutil-dev
  - sflphone-gnome + libclutter-gtk-1.0-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/config/Makefile
36
36
host_triplet = i686-pc-linux-gnu
37
37
DIST_COMMON = $(srcdir)/../../globals.mak $(srcdir)/Makefile.am \
38
38
        $(srcdir)/Makefile.in
39
 
#am__append_1 = videoconf.c videoconf.h
 
39
am__append_1 = videoconf.c videoconf.h
40
40
subdir = src/config
41
41
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
42
42
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
67
67
        accountlistconfigdialog.h addressbook-config.h assistant.h \
68
68
        audioconf.h hooks-config.h preferencesdialog.h \
69
69
        shortcuts-config.h tlsadvanceddialog.h utils.h \
70
 
        zrtpadvanceddialog.h reqaccount.c reqaccount.h videoconf.c \
71
 
        videoconf.h
72
 
#am__objects_1 = libconfig_la-videoconf.lo
 
70
        zrtpadvanceddialog.h videoconf.c videoconf.h
 
71
am__objects_1 = libconfig_la-videoconf.lo
73
72
am_libconfig_la_OBJECTS = libconfig_la-addressbook-config.lo \
74
73
        libconfig_la-shortcuts-config.lo libconfig_la-assistant.lo \
75
74
        libconfig_la-preferencesdialog.lo \
78
77
        libconfig_la-tlsadvanceddialog.lo \
79
78
        libconfig_la-accountconfigdialog.lo \
80
79
        libconfig_la-hooks-config.lo libconfig_la-audioconf.lo \
81
 
        libconfig_la-utils.lo libconfig_la-reqaccount.lo \
82
 
        $(am__objects_1)
 
80
        libconfig_la-utils.lo $(am__objects_1)
83
81
libconfig_la_OBJECTS = $(am_libconfig_la_OBJECTS)
84
82
AM_V_lt = $(am__v_lt_$(V))
85
83
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
118
116
ETAGS = etags
119
117
CTAGS = ctags
120
118
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
121
 
ACLOCAL = ${SHELL} /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/build-aux/missing --run aclocal-1.11
 
119
ACLOCAL = ${SHELL} /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/build-aux/missing --run aclocal-1.11
122
120
ALL_LINGUAS = 
123
121
AMTAR = $${TAR-tar}
124
122
AM_DEFAULT_VERBOSITY = 0
125
123
AR = ar
126
 
AUTOCONF = ${SHELL} /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/build-aux/missing --run autoconf
127
 
AUTOHEADER = ${SHELL} /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/build-aux/missing --run autoheader
128
 
AUTOMAKE = ${SHELL} /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/build-aux/missing --run automake-1.11
 
124
AUTOCONF = ${SHELL} /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/build-aux/missing --run autoconf
 
125
AUTOHEADER = ${SHELL} /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/build-aux/missing --run autoheader
 
126
AUTOMAKE = ${SHELL} /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/build-aux/missing --run automake-1.11
129
127
AWK = mawk
130
128
CC = gcc -std=gnu99
131
129
CCDEPMODE = depmode=gcc3
132
 
CFLAGS = -g -O2 -Wall -Wextra -Wshadow
 
130
CFLAGS = -g -O2 -Wall -Wextra -Wshadow -ggdb
133
131
CHECK_CFLAGS =  
134
132
CHECK_LIBS = -lcheck_pic  
135
 
CLUTTERGTK_CFLAGS = 
136
 
CLUTTERGTK_LIBS = 
137
 
CLUTTER_CFLAGS = 
138
 
CLUTTER_LIBS = 
 
133
CLUTTERGTK_CFLAGS = -pthread -I/usr/include/clutter-1.0 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cogl -I/usr/include/cairo -I/usr/include/atk-1.0 -I/usr/include/json-glib-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/gio-unix-2.0/ -I/usr/include/clutter-gtk-1.0  
 
134
CLUTTERGTK_LIBS = -pthread -lclutter-gtk-1.0 -lclutter-1.0 -lgtk-3 -lcogl-pango -ljson-glib-1.0 -lXi -lcogl -ldrm -lX11 -lXext -lXdamage -lXcomposite -lgmodule-2.0 -lrt -lXfixes -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0  
 
135
CLUTTER_CFLAGS = -pthread -I/usr/include/clutter-1.0 -I/usr/include/pango-1.0 -I/usr/include/cogl -I/usr/include/cairo -I/usr/include/atk-1.0 -I/usr/include/json-glib-1.0 -I/usr/include/gtk-3.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/gio-unix-2.0/  
 
136
CLUTTER_LIBS = -pthread -lclutter-1.0 -latk-1.0 -lcogl-pango -ljson-glib-1.0 -lgdk-3 -lXi -lcogl -ldrm -lX11 -lXext -lXdamage -lXcomposite -lgmodule-2.0 -lrt -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lXfixes  
139
137
CPP = gcc -std=gnu99 -E
140
138
CPPFLAGS = 
141
139
CYGPATH_W = echo
195
193
LTLIBINTL = 
196
194
LTLIBOBJS = 
197
195
MAINT = 
198
 
MAKEINFO = ${SHELL} /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/build-aux/missing --run makeinfo
 
196
MAKEINFO = ${SHELL} /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/build-aux/missing --run makeinfo
199
197
MANIFEST_TOOL = :
200
198
MKDIR_P = /bin/mkdir -p
201
199
MSGFMT = /usr/bin/msgfmt
210
208
PACKAGE = sflphone-client-gnome
211
209
PACKAGE_BUGREPORT = sflphoneteam@savoirfairelinux.com
212
210
PACKAGE_NAME = sflphone
213
 
PACKAGE_STRING = sflphone 1.3.0
 
211
PACKAGE_STRING = sflphone 1.4.1
214
212
PACKAGE_TARNAME = sflphone-client-gnome
215
213
PACKAGE_URL = 
216
 
PACKAGE_VERSION = 1.3.0
 
214
PACKAGE_VERSION = 1.4.1
217
215
PATH_SEPARATOR = :
218
216
PKG_CONFIG = /usr/bin/pkg-config
219
217
PKG_CONFIG_LIBDIR = 
225
223
SHELL = /bin/bash
226
224
STRIP = strip
227
225
USE_NLS = yes
228
 
VERSION = 1.3.0
 
226
VERSION = 1.4.1
229
227
WARN_CFLAGS = -Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare 
230
228
X11_CFLAGS =  
231
229
X11_LIBS = -lX11  
232
230
XGETTEXT = /usr/bin/xgettext
233
231
XGETTEXT_015 = /usr/bin/xgettext
234
232
XGETTEXT_EXTRA_OPTIONS = 
235
 
abs_builddir = /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/src/config
236
 
abs_srcdir = /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/src/config
237
 
abs_top_builddir = /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome
238
 
abs_top_srcdir = /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome
 
233
abs_builddir = /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/src/config
 
234
abs_srcdir = /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/src/config
 
235
abs_top_builddir = /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome
 
236
abs_top_srcdir = /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome
239
237
ac_ct_AR = ar
240
238
ac_ct_CC = gcc
241
239
ac_ct_DUMPBIN = 
265
263
htmldir = ${docdir}
266
264
includedir = ${prefix}/include
267
265
infodir = ${datarootdir}/info
268
 
install_sh = ${SHELL} /home/jenkins/workspace/sflphone-package-manager/sflphone-1.3.0/gnome/build-aux/install-sh
 
266
install_sh = ${SHELL} /home/jenkins/workspace/sflphone-launchpad/sflphone-1.4.1/gnome/build-aux/install-sh
269
267
intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
270
268
intltool__v_merge_options_0 = -q
271
269
libdir = ${exec_prefix}/lib
322
320
        accountlistconfigdialog.h addressbook-config.h assistant.h \
323
321
        audioconf.h hooks-config.h preferencesdialog.h \
324
322
        shortcuts-config.h tlsadvanceddialog.h utils.h \
325
 
        zrtpadvanceddialog.h reqaccount.c reqaccount.h $(am__append_1)
326
 
#SFL_VIDEO_LDFLAGS =  
 
323
        zrtpadvanceddialog.h $(am__append_1)
 
324
SFL_VIDEO_LDFLAGS = -pthread -lclutter-1.0 -latk-1.0 -lcogl-pango -ljson-glib-1.0 -lgdk-3 -lXi -lcogl -ldrm -lX11 -lXext -lXdamage -lXcomposite -lgmodule-2.0 -lrt -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lXfixes   -pthread -lclutter-gtk-1.0 -lclutter-1.0 -lgtk-3 -lcogl-pango -ljson-glib-1.0 -lXi -lcogl -ldrm -lX11 -lXext -lXdamage -lXcomposite -lgmodule-2.0 -lrt -lXfixes -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0  
327
325
libconfig_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
328
326
                                           $(GTK_LDFLAGS) $(GLIB_LDFLAGS) \
329
327
                                           $(SFL_VIDEO_LDFLAGS) 
330
328
 
331
 
#SFL_VIDEO_LIBADD =  
 
329
SFL_VIDEO_LIBADD = -pthread -lclutter-1.0 -latk-1.0 -lcogl-pango -ljson-glib-1.0 -lgdk-3 -lXi -lcogl -ldrm -lX11 -lXext -lXdamage -lXcomposite -lgmodule-2.0 -lrt -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 -lXfixes   -pthread -lclutter-gtk-1.0 -lclutter-1.0 -lgtk-3 -lcogl-pango -ljson-glib-1.0 -lXi -lcogl -ldrm -lX11 -lXext -lXdamage -lXcomposite -lgmodule-2.0 -lrt -lXfixes -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0  
332
330
libconfig_la_LIBADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) \
333
331
                                          $(GTK_LIBS) $(GLIB_LIBS) $(SFL_VIDEO_LIBADD)
334
332
 
335
 
#SFL_VIDEO_CFLAGS =  
 
333
SFL_VIDEO_CFLAGS = -pthread -I/usr/include/clutter-1.0 -I/usr/include/pango-1.0 -I/usr/include/cogl -I/usr/include/cairo -I/usr/include/atk-1.0 -I/usr/include/json-glib-1.0 -I/usr/include/gtk-3.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/gio-unix-2.0/   -pthread -I/usr/include/clutter-1.0 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cogl -I/usr/include/cairo -I/usr/include/atk-1.0 -I/usr/include/json-glib-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libdrm -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/gio-unix-2.0/ -I/usr/include/clutter-gtk-1.0  
336
334
libconfig_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
337
335
                                          $(GTK_CFLAGS) $(GLIB_CFLAGS) \
338
336
                                          $(SFL_VIDEO_CFLAGS)
397
395
include ./$(DEPDIR)/libconfig_la-audioconf.Plo
398
396
include ./$(DEPDIR)/libconfig_la-hooks-config.Plo
399
397
include ./$(DEPDIR)/libconfig_la-preferencesdialog.Plo
400
 
include ./$(DEPDIR)/libconfig_la-reqaccount.Plo
401
398
include ./$(DEPDIR)/libconfig_la-shortcuts-config.Plo
402
399
include ./$(DEPDIR)/libconfig_la-tlsadvanceddialog.Plo
403
400
include ./$(DEPDIR)/libconfig_la-utils.Plo
505
502
#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
506
503
#       $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libconfig_la_CFLAGS) $(CFLAGS) -c -o libconfig_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
507
504
 
508
 
libconfig_la-reqaccount.lo: reqaccount.c
509
 
        $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libconfig_la_CFLAGS) $(CFLAGS) -MT libconfig_la-reqaccount.lo -MD -MP -MF $(DEPDIR)/libconfig_la-reqaccount.Tpo -c -o libconfig_la-reqaccount.lo `test -f 'reqaccount.c' || echo '$(srcdir)/'`reqaccount.c
510
 
        $(AM_V_at)$(am__mv) $(DEPDIR)/libconfig_la-reqaccount.Tpo $(DEPDIR)/libconfig_la-reqaccount.Plo
511
 
#       $(AM_V_CC)source='reqaccount.c' object='libconfig_la-reqaccount.lo' libtool=yes \
512
 
#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
513
 
#       $(AM_V_CC_no)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libconfig_la_CFLAGS) $(CFLAGS) -c -o libconfig_la-reqaccount.lo `test -f 'reqaccount.c' || echo '$(srcdir)/'`reqaccount.c
514
 
 
515
505
libconfig_la-videoconf.lo: videoconf.c
516
506
        $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libconfig_la_CFLAGS) $(CFLAGS) -MT libconfig_la-videoconf.lo -MD -MP -MF $(DEPDIR)/libconfig_la-videoconf.Tpo -c -o libconfig_la-videoconf.lo `test -f 'videoconf.c' || echo '$(srcdir)/'`videoconf.c
517
507
        $(AM_V_at)$(am__mv) $(DEPDIR)/libconfig_la-videoconf.Tpo $(DEPDIR)/libconfig_la-videoconf.Plo