← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gnome/src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-19 21:46:37 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120519214637-la8rbrford5kj6m3
Tags: 1.1.0-1
http://bugs.debian.org/663282
http://bugs.debian.org/665789
* New upstream release 
  - Fixes "FTBFS with libccrtp-dev/2.0.2 from experimental" (Closes: #663282)
* NEW Maintainer: Debian VoIP Team - Thanks Francois for your work.
  - (Closes: #665789: O: sflphone -- SIP and IAX2 compatible VoIP phone)
* Added Build-Depends: libdbus-c++-bin
* Add gcc47-fixes.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/Makefile.am
5
5
SUBDIRS = config contacts dbus widget icons
6
6
 
7
7
NOFIFY_LIBS = -lnotify
8
 
X11_LIBS = -lX11
9
8
LD_LIBS = -ldl
10
9
 
11
 
SFLPHONEGTK_LIBS=./contacts/libcontacts.la ./config/libconfig.la ./dbus/libdbus.la ./widget/libwidget.la ./icons/libicons.la
 
10
SFLPHONEGTK_LIBS=./contacts/libcontacts.la ./config/libconfig.la \
 
11
                 ./dbus/libdbus.la ./widget/libwidget.la ./icons/libicons.la
12
12
 
13
13
sflphone_client_gnome_SOURCES = \
14
14
  main.c \
27
27
  codeclist.c \
28
28
  reqaccount.c \
29
29
  eel-gconf-extensions.c \
30
 
  shortcuts.c
 
30
  shortcuts.c \
 
31
  str_utils.c \
 
32
  gtk2_wrappers.c
31
33
 
32
34
noinst_HEADERS =  actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
33
 
                  reqaccount.h sflphone_const.h uimanager.h \
34
 
                  accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \
35
 
                  shortcuts.h eel-gconf-extensions.h logger.h imwindow.h unused.h
36
 
 
37
 
sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
38
 
                                                          $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(LD_LIBS) $(GCONF_LIBS) -lgthread-2.0
39
 
 
40
 
sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) $(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \
41
 
                               $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) $(GCONF_CFLAGS)
 
35
                  reqaccount.h sflphone_const.h uimanager.h accountlist.h \
 
36
                  sliders.h statusicon.h callable_obj.h conference_obj.h \
 
37
                  shortcuts.h eel-gconf-extensions.h logger.h imwindow.h \
 
38
                  unused.h str_utils.h gtk2_wrappers.h
 
39
 
 
40
sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) \
 
41
                              $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
 
42
                              $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) \
 
43
                              $(LD_LIBS) $(GCONF_LIBS) \
 
44
                              $(JAVASCRIPT_CORE_GTK_LIBS) $(GTHREAD_LIBS) -lgthread-2.0
 
45
 
 
46
sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
 
47
                               $(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \
 
48
                               $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) \
 
49
                               $(GCONF_CFLAGS) $(JAVASCRIPT_CORE_GTK_CFLAGS) \
 
50
                               $(GTHREAD_CFLAGS)
42
51
 
43
52
# add symbolic link
44
53
install-exec-local: