summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-02-15 17:24:12 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-02-15 17:24:12 +0100
commit4cbe7095226e0e4a050ef347ddc297386a571557 (patch)
treece0ed5659fc6744c9a0705fc7584322098d04b1b /Makefile.am
parentf22f103661954524287aaef99378e4060fdb1ebd (diff)
parent905818f5961446ac32d1b2d165185fffddc4915a (diff)
Merge branch 'master' of git+ssh://master.kernel.org/pub/scm/linux/hotplug/udev
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index df426f72a4..eb8f6d197d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,6 +221,7 @@ dist_udevrules_DATA += \
extras/rule_generator/75-cd-aliases-generator.rules \
extras/rule_generator/75-persistent-net-generator.rules
+if ENABLE_EXTRAS
# ------------------------------------------------------------------------------
# firmware - firmware loading
# ------------------------------------------------------------------------------
@@ -312,10 +313,14 @@ libexec_PROGRAMS += extras/usb_id/usb_id
# ------------------------------------------------------------------------------
# v4l_id - video4linux capabilities
# ------------------------------------------------------------------------------
+if HAVE_V4L1
extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c
extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
libexec_PROGRAMS += extras/v4l_id/v4l_id
dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
+endif
+
+endif # ENABLE_EXTRAS
# ------------------------------------------------------------------------------
# qemu -- qemu/kvm guest tweaks