X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7b84c1c790ed10e5c031d787f490afc036f1b4d8;hp=11b4c8477df4f47f14d11a12172c9797289b7bab;hb=8e90942c7af2508f88c7284a0b116caf7ec854a9;hpb=6997e3b2dc0095985071e2f7496342a850cdb5ad

diff --git a/Makefile.am b/Makefile.am
index 11b4c8477..7b84c1c79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-debug \
 	--enable-rule_generator \
 	--enable-floppy \
-	--enable-edd \
 	--with-selinux \
 	--enable-gtk-doc \
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
@@ -149,23 +148,20 @@ udev-confdirs:
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
-EXTRA_DIST += \
-	rules/arch \
-	rules/misc
-
 udevrulesdir = $(libexecdir)/udev/rules.d
 dist_udevrules_DATA = \
-	rules/rules.d/50-udev-default.rules \
-	rules/rules.d/60-persistent-storage-tape.rules \
-	rules/rules.d/60-persistent-serial.rules \
-	rules/rules.d/60-persistent-input.rules \
-	rules/rules.d/60-persistent-alsa.rules \
-	rules/rules.d/60-persistent-storage.rules \
-	rules/rules.d/75-net-description.rules \
-	rules/rules.d/75-tty-description.rules \
-	rules/rules.d/78-sound-card.rules \
-	rules/rules.d/80-drivers.rules \
-	rules/rules.d/95-udev-late.rules
+	rules/42-qemu-usb.rules \
+	rules/50-udev-default.rules \
+	rules/60-persistent-storage-tape.rules \
+	rules/60-persistent-serial.rules \
+	rules/60-persistent-input.rules \
+	rules/60-persistent-alsa.rules \
+	rules/60-persistent-storage.rules \
+	rules/75-net-description.rules \
+	rules/75-tty-description.rules \
+	rules/78-sound-card.rules \
+	rules/80-drivers.rules \
+	rules/95-udev-late.rules
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = src/udev.conf
@@ -376,11 +372,6 @@ src_accelerometer_accelerometer_LDADD = src/libudev-private.la -lm
 pkglibexec_PROGRAMS += src/accelerometer/accelerometer
 dist_udevrules_DATA += src/accelerometer/61-accelerometer.rules
 
-# ------------------------------------------------------------------------------
-# qemu -- qemu/kvm guest tweaks
-# ------------------------------------------------------------------------------
-dist_udevrules_DATA += src/qemu/42-qemu-usb.rules
-
 if ENABLE_GUDEV
 # ------------------------------------------------------------------------------
 # GUdev - libudev gobject interface
@@ -685,16 +676,6 @@ pkglibexec_PROGRAMS += src/create_floppy_devices
 dist_udevrules_DATA += src/floppy/60-floppy.rules
 endif
 
-if ENABLE_EDD
-# ------------------------------------------------------------------------------
-# edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
-# ------------------------------------------------------------------------------
-src__edd_id_edd_id_SOURCES = src/edd_id/edd_id.c
-src_edd_id_edd_id_LDADD = src/libudev-private.la
-pkglibexec_PROGRAMS += src/edd_id/edd_id
-dist_udevrules_DATA += src/edd_id/61-persistent-storage-edd.rules
-endif
-
 # ------------------------------------------------------------------------------
 # install, uninstall, clean hooks
 # ------------------------------------------------------------------------------