← 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): Francois Marier
  • Date: 2012-02-18 21:47:09 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120218214709-6362d71gqdsdkrj5
Tags: 1.0.2-1
http://bugs.debian.org/658987
* New upstream release
  - remove logging patch (applied upstream)
  - update s390 patch since it was partially applied upstream
* Include the Evolution plugin as a separate binary package

* Fix compilation issues on SH4 (closes: #658987)
* Merge Ubuntu's binutils-gold linking fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/Makefile.am
3
3
bin_PROGRAMS = sflphone-client-gnome
4
4
 
5
5
SUBDIRS = config contacts dbus widget icons
6
 
  
 
6
 
7
7
NOFIFY_LIBS = -lnotify
8
8
X11_LIBS = -lX11
9
9
LD_LIBS = -ldl
35
35
                  shortcuts.h eel-gconf-extensions.h logger.h imwindow.h unused.h
36
36
 
37
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)
 
38
                                                          $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(LD_LIBS) $(GCONF_LIBS) -lgthread-2.0
39
39
 
40
40
sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) $(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \
41
41
                               $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) $(GCONF_CFLAGS)
43
43
# add symbolic link
44
44
install-exec-local:
45
45
        echo $(prefix); echo $(bindir); echo $(datadir); echo $(libdir)
46
 
        cd $(DESTDIR)$(bindir); ln -sf sflphone-client-gnome sflphone 
 
46
        cd $(DESTDIR)$(bindir); ln -sf sflphone-client-gnome sflphone
47
47
 
48
48
uninstall-local:
49
49
        -test -h $(DESTDIR)$(bindir)/sflphone && rm $(DESTDIR)$(bindir)/sflphone