udevadm: info - make attribute array static and const

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b87741802f853c29980a4033dd80ff4950640974..62c3bdbd974fcee5cd24467484ce9fc8e8bf89de 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,9 @@ DISTCHECK_HOOKS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=10
+LIBUDEV_CURRENT=11
 LIBUDEV_REVISION=0
-LIBUDEV_AGE=10
+LIBUDEV_AGE=11
 
 SUBDIRS += libudev/docs
 
@@ -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,12 +313,12 @@ 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