← Back to branch summary

~ubuntu-branches/ubuntu/wily/hal/wily

« back to all changes in this revision

Viewing changes to hald/freebsd/probing/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-10-12 16:50:48 UTC
  • mfrom: (1.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20101012165048-fm9vz0n87zpoovcm
Tags: 0.5.14-3ubuntu1
* Merge with Debian unstable; remaining Ubuntu changes:
 - Add support for smartdimmer backlight control for GeForce 7/8/9 based
   Sony laptops.
   + Add 04_nvidia_brightness.patch.
   + Add smartdimmer recommends.
 - debian/hal.postinst: Do not create plugdev and powerdev groups.
 - Change startup from init/upstart to D-Bus activation. This allows us
   having installed programs which still need hal without the need to start
   hal on boot:
   + Remove debian/hal.{init,default}.
   + Add D-Bus activation service file debian/org.freedesktop.Hal.service and
     install it in debian/hal.install.
   + debian/hal.postinst: When triggering an .fdi file update, just stop
     hald; it will be reactivated when needed.
 - Add 02_libhal_dont_check_running.patch, 00git_bigger_path_size.patch, see
   their patch headers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hald/freebsd/probing/Makefile.am
56
56
        $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
57
57
 
58
58
hald_probe_storage_SOURCES = freebsd_dvd_rw_utils.c freebsd_dvd_rw_utils.h probe-storage.c
59
 
hald_probe_storage_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@
 
59
hald_probe_storage_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @BLKID_CFLAGS@
60
60
hald_probe_storage_LDADD = \
61
61
        @GLIB_LIBS@                                                     \
62
 
        @VOLUME_ID_LIBS@                                                \
 
62
        @BLKID_LIBS@                                                    \
63
63
        $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
64
64
 
65
65
hald_probe_volume_SOURCES = freebsd_dvd_rw_utils.c freebsd_dvd_rw_utils.h probe-volume.c
66
 
hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@
 
66
hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @BLKID_CFLAGS@
67
67
hald_probe_volume_LDADD = \
68
68
        @GLIB_LIBS@                                                     \
69
 
        @VOLUME_ID_LIBS@                                                \
70
 
        -lufs                                                           \
 
69
        @BLKID_LIBS@                                                    \
 
70
        @LIBUFS_LIBS@                                                   \
71
71
        $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la