X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=7ad9a242b7a9b3ebca104045a16144372993f06f;hb=fc1de713f5b754fb38876b5b797e18f812727f0a;hp=b87741802f853c29980a4033dd80ff4950640974;hpb=0c0b3f97cad4c34140dda3aa85a9bc74badb4b16;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index b87741802..7ad9a242b 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
 
@@ -124,15 +124,20 @@ sharepkgconfig_DATA = udev/udev.pc
 
 if WITH_SYSTEMD
 systemdsystemunit_DATA = \
+	init/udev.socket \
 	init/udev.service \
-	init/udev-settle.service \
-	init/udev-retry.service
+	init/udev-trigger.service \
+	init/udev-settle.service
+
+EXTRA_DIST += init/udev.socket
 
 systemd-install-hook:
+	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/socket.target.wants
+	ln -sf ../udev.socket $(DESTDIR)$(systemdsystemunitdir)/socket.target.wants/udev.socket
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
 	ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
+	ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
 	ln -sf ../udev-settle.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-settle.service
-	ln -sf ../udev-retry.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-retry.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 endif
@@ -221,6 +226,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 +288,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
 # ------------------------------------------------------------------------------
@@ -312,12 +310,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