X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=40f13e790ee10238928a9ea809d909f0d302d9c0;hb=b7822bc4986a5396af7621a6a03e163142d86277;hp=0e49b6be298f6b19be4c6a00c803be09f586ee3f;hpb=06bd02c5633666ceccd14557c721a39b2a68f240;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 0e49b6be2..40f13e790 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,9 @@ DISTCHECK_HOOKS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=10
-LIBUDEV_REVISION=0
-LIBUDEV_AGE=10
+LIBUDEV_CURRENT=11
+LIBUDEV_REVISION=1
+LIBUDEV_AGE=11
 
 SUBDIRS += libudev/docs
 
@@ -125,8 +125,7 @@ sharepkgconfig_DATA = udev/udev.pc
 if WITH_SYSTEMD
 systemdsystemunit_DATA = \
 	init/udev.service \
-	init/udev-settle.service \
-	init/udev-retry.service
+	init/udev-settle.service
 
 systemd-install-hook:
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
@@ -221,6 +220,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
 # ------------------------------------------------------------------------------
@@ -282,14 +282,6 @@ extras_path_id_path_id_SOURCES = extras/path_id/path_id.c
 extras_path_id_path_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/path_id/path_id
 
-# ------------------------------------------------------------------------------
-# fstab_import - import /etc/fstab entry for block device
-# ------------------------------------------------------------------------------
-extras_fstab_import_fstab_import_SOURCES = extras/fstab_import/fstab_import.c
-extras_fstab_import_fstab_import_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/fstab_import/fstab_import
-dist_udevrules_DATA += extras/fstab_import/79-fstab_import.rules
-
 # ------------------------------------------------------------------------------
 # scsi_id - SCSI inquiry to get various serial numbers
 # ------------------------------------------------------------------------------
@@ -317,6 +309,8 @@ 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 # ENABLE_EXTRAS
+
 # ------------------------------------------------------------------------------
 # qemu -- qemu/kvm guest tweaks
 # ------------------------------------------------------------------------------
@@ -565,6 +559,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 \