~ubuntu-branches/ubuntu/oneiric/gnome-settings-daemon/oneiric

« back to all changes in this revision

Viewing changes to plugins/automount/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Rodrigo Moya
  • Date: 2011-09-19 17:05:48 UTC
  • mfrom: (1.1.51 upstream)
  • Revision ID: package-import@ubuntu.com-20110919170548-gegm8ewt6qf7v7lp
Tags: 3.1.92-0ubuntu1
* New upstream release
* debian/control:
  - Bump libcolord-dev build dependency
* debian/patches/00git_guard_against_division_by_0.patch:
* debian/patches/00git_dont_crash_if_session_not_ready.patch:
* debian/patches/00git_numlock_status.patch:
* debian/patches/00git_disconnect_callbacks.patch:
  - Remove upstream patches
* debian/patches/06_use_application_indicator.patch:
* debian/patches/16_use_synchronous_notifications.patch:
  - Rebased

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
        -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
13
13
        $(AM_CPPFLAGS)
14
14
 
15
 
gnome_fallback_mount_helper_CFLAGS = \
16
 
        $(SETTINGS_PLUGIN_CFLAGS)
 
15
gnome_fallback_mount_helper_CFLAGS =    \
 
16
        $(SETTINGS_PLUGIN_CFLAGS)       \
 
17
        $(AUTOMOUNT_CFLAGS)
17
18
 
18
 
gnome_fallback_mount_helper_LDADD = \
19
 
        $(SETTINGS_PLUGIN_LIBS) \
20
 
        $(X11_LIBS) \
 
19
gnome_fallback_mount_helper_LDADD =     \
 
20
        $(SETTINGS_PLUGIN_LIBS)         \
 
21
        $(AUTOMOUNT_LIBS)               \
21
22
        $(top_builddir)/gnome-settings-daemon/libgsd-profile.la
22
23
 
23
24
autostartdir = $(sysconfdir)/xdg/autostart