← Back to branch summary

~ubuntu-branches/ubuntu/raring/hal/raring

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl, Martin Pitt, Michael Biebl
  • Date: 2011-04-10 07:21:18 UTC
  • mfrom: (1.1.22 sid)
  • Revision ID: james.westby@ubuntu.com-20110410072118-ojw5p0hmiwe7i78v
Tags: 0.5.14-6
https://launchpad.net/bugs/721399
http://bugs.debian.org/621973
[ Martin Pitt ]
* Add 00upstream_video4linux_check.patch: Do not build
  hald-probe-video4linux if v4l1 is not available. (LP: #721399)
* Refresh 99-autoreconf.patch for above.
* 45-fix-libusb-detection.patch: Unfuzz.

[ Michael Biebl ]
* debian/patches/00_disable_v4l1_probing.patch
  - The hald-probe-video4linux prober supports both v4l1 and v4l2. Support
    for v4l1 has been removed from Linux kernel 2.6.38. Instead of
    disabling the prober altogether, #ifdef the v4l1 parts when building on a
    newer kernel. This partially reverts 00upstream_video4linux_check.patch.
    (Closes: #621973)
* Refresh all patches to apply cleanly.
* Use dh-autoreconf to update the build system
  - Drop debian/patches/99-autoreconf.patch
  - Add Build-Depends on dh-autoreconf.
  - Include /usr/share/cdbs/1/rules/autoreconf.mk in debian/rules.
* Bump Standards-Version to 3.9.2. No further changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hald/freebsd/probing/Makefile.in
1
 
# Makefile.in generated by automake 1.11.1 from Makefile.am.
 
1
# Makefile.in generated by automake 1.11 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
199
199
LIBOBJS = @LIBOBJS@
200
200
LIBS = @LIBS@
201
201
LIBTOOL = @LIBTOOL@
202
 
LIBUFS_LIBS = @LIBUFS_LIBS@
203
202
LIBUSB20_LIBS = @LIBUSB20_LIBS@
204
203
LINUX_INPUT_H = @LINUX_INPUT_H@
205
204
LIPO = @LIPO@
230
229
PATH_SEPARATOR = @PATH_SEPARATOR@
231
230
PCI_IDS_DIR = @PCI_IDS_DIR@
232
231
PKG_CONFIG = @PKG_CONFIG@
233
 
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
234
 
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
235
232
POLKIT_CFLAGS = @POLKIT_CFLAGS@
236
233
POLKIT_LIBS = @POLKIT_LIBS@
237
234
POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@
344
341
        $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
345
342
 
346
343
hald_probe_storage_SOURCES = freebsd_dvd_rw_utils.c freebsd_dvd_rw_utils.h probe-storage.c
347
 
hald_probe_storage_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @BLKID_CFLAGS@
 
344
hald_probe_storage_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@
348
345
hald_probe_storage_LDADD = \
349
346
        @GLIB_LIBS@                                                     \
350
 
        @BLKID_LIBS@                                                    \
 
347
        @VOLUME_ID_LIBS@                                                \
351
348
        $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
352
349
 
353
350
hald_probe_volume_SOURCES = freebsd_dvd_rw_utils.c freebsd_dvd_rw_utils.h probe-volume.c
354
 
hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @BLKID_CFLAGS@
 
351
hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@
355
352
hald_probe_volume_LDADD = \
356
353
        @GLIB_LIBS@                                                     \
357
 
        @BLKID_LIBS@                                                    \
358
 
        @LIBUFS_LIBS@                                                   \
 
354
        @VOLUME_ID_LIBS@                                                \
 
355
        -lufs                                                           \
359
356
        $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
360
357
 
361
358
all: all-am