~ubuntu-branches/ubuntu/precise/gvfs/precise-proposed

« back to all changes in this revision

Viewing changes to client/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-11-17 07:43:33 UTC
  • mfrom: (1.1.77) (33.1.18 experimental)
  • Revision ID: package-import@ubuntu.com-20111117074333-ua4kq03btq4shvb1
Tags: 1.10.1-1ubuntu1
* Merge with Debian experimental. Remaining Ubuntu changes:
  - debian/control.in: Drop libbluray-dev build dependency (in universe).

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
        -I$(top_srcdir)/metadata \
6
6
        -I$(top_srcdir)/common \
7
7
        $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
8
 
        -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
 
8
        -DG_LOG_DOMAIN=\"GVFS\" \
9
9
        -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\"    \
10
10
        -DGVFS_LOCALEDIR=\""$(localedir)"\"     \
11
11
        -DDBUS_API_SUBJECT_TO_CHANGE
74
74
        -I$(top_srcdir) \
75
75
        -I$(top_srcdir)/common \
76
76
        $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
77
 
        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
 
77
        -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
78
78
        -DDBUS_API_SUBJECT_TO_CHANGE
79
79
 
80
80
gvfs_fuse_daemon_LDADD = \