← Back to branch summary

~ubuntu-branches/ubuntu/utopic/sflphone/utopic-proposed

« back to all changes in this revision

Viewing changes to gnome/src/config/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2013-06-30 11:40:56 UTC
  • mfrom: (4.1.18 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130630114056-0np50jkyqo6vnmii
Tags: 1.2.3-2
* changeset_r92d62cfc54732bbbcfff2b1d36c096b120b981a5.diff 
  - fixes automatic endian detection 
* Update Vcs: fixes vcs-field-not-canonical

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/config/Makefile.am
24
24
  shortcuts-config.h \
25
25
  tlsadvanceddialog.h \
26
26
  utils.h \
27
 
  zrtpadvanceddialog.h
28
 
 
29
 
libconfig_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) $(GCONF_LDFLAGS) \
30
 
                                           $(GTK_LDFLAGS) $(GLIB_LDFLAGS) $(WEBKIT_LDFLAGS)
31
 
 
32
 
libconfig_la_LIBADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) $(GCONF_LIBS) \
33
 
                                          $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS)
34
 
 
35
 
libconfig_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) $(GCONF_CFLAGS) \
36
 
                                          $(GTK_CFLAGS) $(GLIB_CFLAGS) $(WEBKIT_CFLAGS)
 
27
  zrtpadvanceddialog.h \
 
28
  reqaccount.c \
 
29
  reqaccount.h
 
30
 
 
31
if SFL_VIDEO
 
32
libconfig_la_SOURCES+=videoconf.c videoconf.h
 
33
endif
 
34
 
 
35
if SFL_VIDEO
 
36
SFL_VIDEO_LDFLAGS=@CLUTTER_LIBS@ @CLUTTERGTK_LIBS@
 
37
endif
 
38
 
 
39
libconfig_la_LDFLAGS = $(DBUSGLIB_LDFLAGS) $(LIBNOTIFY_LDFLAGS) \
 
40
                                           $(GTK_LDFLAGS) $(GLIB_LDFLAGS) \
 
41
                                           $(SFL_VIDEO_LDFLAGS) 
 
42
 
 
43
if SFL_VIDEO
 
44
SFL_VIDEO_LIBADD=@CLUTTER_LIBS@ @CLUTTERGTK_LIBS@
 
45
endif
 
46
 
 
47
libconfig_la_LIBADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) \
 
48
                                          $(GTK_LIBS) $(GLIB_LIBS) $(SFL_VIDEO_LIBADD)
 
49
 
 
50
if SFL_VIDEO
 
51
SFL_VIDEO_CFLAGS=@CLUTTER_CFLAGS@ @CLUTTERGTK_CFLAGS@
 
52
endif
 
53
 
 
54
libconfig_la_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
 
55
                                          $(GTK_CFLAGS) $(GLIB_CFLAGS) \
 
56
                                          $(SFL_VIDEO_CFLAGS)
 
57
 
 
58
-include $(top_srcdir)/git.mk