libudev: list - use bit flags for 'sort' and 'unique'

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 15d1636fd6449644b56da438aa19367db5b9acc2..2aff45e2a912b937deb3f45341235f5b47bbd99a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ DISTCHECK_HOOKS =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=11
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=11
 
 SUBDIRS += libudev/docs
@@ -124,15 +124,19 @@ 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)/sockets.target.wants
+       ln -sf ../udev.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.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-settle.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-settle.service
-       ln -sf ../udev-retry.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-retry.service
+       ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 endif
@@ -221,7 +225,6 @@ 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
 # ------------------------------------------------------------------------------
@@ -283,14 +286,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
 # ------------------------------------------------------------------------------
@@ -318,8 +313,6 @@ 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
 # ------------------------------------------------------------------------------
@@ -575,6 +568,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/asus \
        extras/keymap/keymaps/compaq-e_evo \
        extras/keymap/keymaps/dell \
+       extras/keymap/keymaps/dell-latitude-xt2 \
        extras/keymap/keymaps/everex-xt5000 \
        extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
        extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \