-udev_udevadm_LDADD = $(udev_common_libs)
-
-libexec_PROGRAMS = \
- extras/ata_id/ata_id \
- extras/cdrom_id/cdrom_id \
- extras/collect/collect \
- extras/edd_id/edd_id \
- extras/floppy/create_floppy_devices \
- extras/path_id/path_id \
- extras/fstab_import/fstab_import \
- extras/scsi_id/scsi_id \
- extras/usb_id/usb_id \
- extras/v4l_id/v4l_id
-
-dist_libexec_SCRIPTS = \
- extras/firmware/firmware.sh \
+# ------------------------------------------------------------------------------
+# udev docs and man pages
+# ------------------------------------------------------------------------------
+writing_udev_rulesdir = $(docdir)/writing_udev_rules
+dist_writing_udev_rules_DATA = \
+ docs/writing_udev_rules/index.html
+
+dist_man_MANS = \
+ udev/udev.7 \
+ udev/udevadm.8 \
+ udev/udevd.8
+
+EXTRA_DIST += \
+ udev/udev.xml \
+ udev/udevadm.xml \
+ udev/udevd.xml
+
+%.7 %.8 : %.xml
+ $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+# ------------------------------------------------------------------------------
+# udev tests
+# ------------------------------------------------------------------------------
+TESTS = test/udev-test.pl
+
+check_PROGRAMS = \
+ libudev/test-libudev \
+ udev/test-udev
+
+libudev_test_libudev_SOURCES = libudev/test-libudev.c
+libudev_test_libudev_LDADD = libudev/libudev.la
+
+udev_test_udev_SOURCES = \
+ $(udev_common_sources) \
+ udev/test-udev.c
+udev_test_udev_LDADD = libudev/libudev-private.la
+
+# ------------------------------------------------------------------------------
+# firmware.sh - firmware loading
+# ------------------------------------------------------------------------------
+dist_libexec_SCRIPTS = extras/firmware/firmware.sh
+dist_udevrules_DATA += extras/firmware/50-firmware.rules
+
+# ------------------------------------------------------------------------------
+# rule_generator - persistent network and optical device rule generator
+# ------------------------------------------------------------------------------
+dist_libexec_SCRIPTS += \