Merge branch 'master' of git+ssh://master.kernel.org/pub/scm/linux/hotplug/udev

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2e3fe3942587a74072575c3d54a9ad69168ee000..eb8f6d197d619acdb25a4b1ffa0a2a6938c1f0b5 100644 (file)
--- 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,19 @@ 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
+# ------------------------------------------------------------------------------
+dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules
 
 if ENABLE_EXTRAS
 # ------------------------------------------------------------------------------
@@ -560,6 +570,7 @@ udevkeymapdir = $(libexecdir)/keymaps
 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
        extras/keymap/keymaps/acer-aspire_5720 \
+       extras/keymap/keymaps/acer-aspire_8930 \
        extras/keymap/keymaps/acer-aspire_5920g \
        extras/keymap/keymaps/acer-aspire_6920 \
        extras/keymap/keymaps/acer-travelmate_c300 \