51 files changed, 1 insertions, 2199 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8b391a01fc..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,354 +0,0 @@
-#
-# Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
-# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-VERSION = 125
-
-# set this to make use of syslog
-USE_LOG = true
-
-# compile-in development debug messages
-# (export UDEV_LOG="debug" or set udev_log="debug" in udev.conf
-#  to print the debug messages to syslog)
-DEBUG = false
-
-# compile with gcc's code coverage option
-USE_GCOV = false
-
-# include Security-Enhanced Linux support
-USE_SELINUX = false
-
-# set this to create statically linked binaries
-USE_STATIC = false
-
-# to build any of the extras programs pass:
-#  make EXTRAS="extras/<extra1> extras/<extra2>"
-EXTRAS =
-
-# make the build silent
-V =
-
-PROGRAMS = \
-	udevd				\
-	udevadm				\
-	test-udev
-
-HEADERS = \
-	udev.h				\
-	udevd.h				\
-	udev_rules.h			\
-	logging.h			\
-	udev_sysdeps.h			\
-	udev_selinux.h			\
-	list.h
-
-UDEV_OBJS = \
-	udev_device.o			\
-	udev_config.o			\
-	udev_node.o			\
-	udev_db.o			\
-	udev_sysfs.o			\
-	udev_rules.o			\
-	udev_rules_parse.o		\
-	udev_utils.o			\
-	udev_utils_string.o		\
-	udev_utils_file.o		\
-	udevmonitor.o			\
-	udevinfo.o			\
-	udevcontrol.o			\
-	udevtrigger.o			\
-	udevsettle.o			\
-	udevtest.o			\
-	udev_sysdeps.o
-LIBUDEV = libudev.a
-
-MAN_PAGES = \
-	udev.7				\
-	udevd.8				\
-	udevadm.8
-
-GEN_HEADERS = \
-	udev_version.h
-
-prefix ?=
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev
-udevdir =	/dev
-DESTDIR =
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-PWD = $(shell pwd)
-
-CROSS_COMPILE ?=
-CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)gcc
-AR = $(CROSS_COMPILE)ar
-RANLIB = $(CROSS_COMPILE)ranlib
-
-CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
-		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
-		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
-CFLAGS		+= $(WARNINGS)
-
-LDFLAGS += -Wl,-warn-common,--as-needed
-
-OPTFLAGS = -Os
-CFLAGS += $(OPTFLAGS)
-
-ifeq ($(strip $(USE_LOG)),true)
-	CFLAGS += -DUSE_LOG
-endif
-
-# if DEBUG is enabled, then we do not strip
-ifeq ($(strip $(DEBUG)),true)
-	CFLAGS  += -DDEBUG
-endif
-
-ifeq ($(strip $(USE_GCOV)),true)
-	CFLAGS += -fprofile-arcs -ftest-coverage
-	LDFLAGS += -fprofile-arcs
-endif
-
-ifeq ($(strip $(USE_SELINUX)),true)
-	UDEV_OBJS += udev_selinux.o
-	LIB_OBJS += -lselinux -lsepol
-	CFLAGS += -DUSE_SELINUX
-endif
-
-ifeq ($(strip $(USE_STATIC)),true)
-	CFLAGS += -DUSE_STATIC
-	LDFLAGS += -static
-endif
-
-ifeq ($(strip $(V)),)
-	E = @echo
-	Q = @
-else
-	E = @\#
-	Q =
-endif
-export E Q
-
-all: $(PROGRAMS) $(MAN_PAGES)
-	$(Q) extras="$(EXTRAS)"; for target in $$extras; do \
-		$(MAKE) CC="$(CC)" \
-			CFLAGS="$(CFLAGS)" \
-			LD="$(LD)" \
-			LDFLAGS="$(LDFLAGS)" \
-			AR="$(AR)" \
-			RANLIB="$(RANLIB)" \
-			LIB_OBJS="$(LIB_OBJS)" \
-			LIBUDEV="$(PWD)/$(LIBUDEV)" \
-			-C $$target $@ || exit 1; \
-	done;
-.PHONY: all
-.DEFAULT: all
-
-# clear implicit rules
-.SUFFIXES:
-
-# build the objects
-%.o: %.c $(HEADERS) $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-# "Static Pattern Rule" to build all programs
-$(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-$(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
-	$(Q) rm -f $@
-	$(E) "  AR      " $@
-	$(Q) $(AR) cq $@ $(UDEV_OBJS)
-	$(E) "  RANLIB  " $@
-	$(Q) $(RANLIB) $@
-
-udev_version.h:
-	$(E) "  GENHDR  " $@
-	$(Q) echo "/* Generated by make. */" > $@
-	$(Q) echo \#define UDEV_VERSION		\"$(VERSION)\" >> $@
-	$(Q) echo \#define UDEV_CONFIG_FILE	\"$(configdir)/udev.conf\" >> $@
-
-# man pages
-%.8 %.7: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) - find . -type f -name '*.orig' -print0 | xargs -0r rm -f
-	$(Q) - find . -type f -name '*.rej' -print0 | xargs -0r rm -f
-	$(Q) - find . -type f -name '*~' -print0 | xargs -0r rm -f
-	$(Q) - find . -type f -name '*.[oas]' -print0 | xargs -0r rm -f
-	$(Q) - find . -type f -name "*.gcno" -print0 | xargs -0r rm -f
-	$(Q) - find . -type f -name "*.gcda" -print0 | xargs -0r rm -f
-	$(Q) - find . -type f -name "*.gcov" -print0 | xargs -0r rm -f
-	$(Q) - rm -f udev_gcov.txt
-	$(Q) - rm -f core $(PROGRAMS) $(GEN_HEADERS)
-	$(Q) - rm -f udev-$(VERSION).tar.gz
-	$(Q) - rm -f udev-$(VERSION).tar.bz2
-	$(Q) - rm -f udev-git-HEAD.patch
-	@ extras="$(EXTRAS)"; for target in $$extras; do \
-		$(MAKE) -C $$target $@ || exit 1; \
-	done;
-.PHONY: clean
-
-install-config:
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)/rules.d
-	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
-	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
-		$(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
-	fi
-	cp rules/rules.d/* $(DESTDIR)$(libudevdir)/rules.d
-	@ extras="$(EXTRAS)"; for target in $$extras; do \
-		$(MAKE) -C $$target $@ || exit 1; \
-	done;
-.PHONY: install-config
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man7
-	$(INSTALL_DATA) udev.7 $(DESTDIR)$(mandir)/man7/udev.7
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
-	$(INSTALL_DATA) udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
-	$(INSTALL_DATA) udevadm.8 $(DESTDIR)$(mandir)/man8/udevadm.8
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		$(MAKE) -C $$target $@ || exit 1; \
-	done;
-.PHONY: install-man
-
-uninstall-man:
-	- rm -f $(DESTDIR)$(mandir)/man7/udev.7
-	- rm -f $(DESTDIR)$(mandir)/man8/udevadm.8
-	- rm -f $(DESTDIR)$(mandir)/man8/udevd.8
-	@ extras="$(EXTRAS)"; for target in $$extras; do \
-		$(MAKE) -C $$target $@ || exit 1; \
-	done;
-.PHONY: uninstall-man
-
-install-bin:
-	$(INSTALL) -d $(DESTDIR)$(sbindir)
-	$(INSTALL_PROGRAM) udevd $(DESTDIR)$(sbindir)/udevd
-	$(INSTALL_PROGRAM) udevadm $(DESTDIR)$(sbindir)/udevadm
-	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevsettle
-	$(INSTALL) -d $(DESTDIR)$(usrbindir)
-	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevinfo
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		$(MAKE) -C $$target $@ || exit 1; \
-	done;
-ifndef DESTDIR
-	- killall udevd
-	- rm -rf $(udevdir)/.udev
-	- $(sbindir)/udevd --daemon
-endif
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm -f $(DESTDIR)$(sbindir)/udevd
-	- rm -f $(DESTDIR)$(sbindir)/udevadm
-	- rm -f $(DESTDIR)$(sbindir)/udevsettle
-	- rm -f $(DESTDIR)$(usrbindir)/udevinfo
-ifndef DESTDIR
-	- killall udevd
-	- rm -rf $(udevdir)/.udev
-endif
-	@extras="$(EXTRAS)"; for target in $$extras; do \
-		$(MAKE) -C $$target $@ || exit 1; \
-	done;
-.PHONY: uninstall-bin
-
-install: all install-bin install-config install-man
-.PHONY: install
-
-uninstall: uninstall-bin uninstall-man
-.PHONY: uninstall
-
-test tests: all
-	@ cd test && ./udev-test.pl
-.PHONY: test tests
-
-buildtest:
-	test/simple-build-check.sh
-.PHONY: buildtest
-
-ChangeLog:
-	head -1 $@ | grep -q "to v$(shell echo $$(($(VERSION) - 1)))"
-	@ mv $@ $@.tmp
-	@ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@
-	@ echo "============================================" >> $@
-	@ echo >> $@
-	@ git log --pretty=short $(shell echo $$(($(VERSION) - 1)))..HEAD | git shortlog  >> $@
-	@ echo >> $@
-	@ cat $@
-	@ cat $@.tmp >> $@
-	@ rm $@.tmp
-	head -1 $@ | grep -q "to v$(VERSION)"
-.PHONY: ChangeLog
-.PRECIOUS: ChangeLog
-
-release:
-	$(Q) - rm -f udev-$(VERSION).tar.gz
-	$(Q) - rm -f udev-$(VERSION).tar.bz2
-	head -1 ChangeLog | grep -q "to v$(VERSION)"
-	head -1 RELEASE-NOTES | grep -q "udev $(VERSION)"
-	git commit -a -m "release $(VERSION)"
-	cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
-	@ echo
-	git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | gzip -9v > udev-$(VERSION).tar.gz
-	git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2
-.PHONY: release
-
-dist:
-	git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | gzip -9v > udev-$(VERSION).tar.gz
-	git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2
-.PHONY: dist
-
-patch:
-	git diff $(shell echo $$(($(VERSION) - 1))) HEAD > udev-git-HEAD.patch
-.PHONY: patch
-
-gcov-all:
-	$(MAKE) clean all USE_GCOV=true
-	@ echo
-	@ echo "binaries built with gcov support."
-	@ echo "run the tests and analyze with 'make udev_gcov.txt'"
-.PHONY: gcov-all
-
-# see docs/README-gcov_for_udev
-udev_gcov.txt: $(wildcard *.gcda) $(wildcard *.gcno)
-	for file in `find -maxdepth 1 -name "*.gcno"`; do \
-		name=`basename $$file .gcno`; \
-		echo "################" >> $@; \
-		echo "$$name.c" >> $@; \
-		echo "################" >> $@; \
-		if [ -e "$$name.gcda" ]; then \
-			gcov -l "$$name.c" >> $@ 2>&1; \
-		else \
-			echo "code for $$name.c was never executed" >> $@ 2>&1; \
-		fi; \
-		echo >> $@; \
-	done; \
-	echo "view $@ for the result"
diff --git a/RELEASE-NOTES b/NEWS
index fea7db0d2b..fea7db0d2b 100644
--- a/RELEASE-NOTES
+++ b/NEWS
diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile
deleted file mode 100644
index bab49a250d..0000000000
--- a/extras/ata_id/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = ata_id
-OBJ =
-HEADERS =
-GEN_HEADERS =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: uninstall-bin
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
-	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: install-man
-
-uninstall-man:
-	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
-
diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
deleted file mode 100644
index ec03d1fce2..0000000000
--- a/extras/cdrom_id/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = cdrom_id
-OBJ =
-HEADERS =
-GEN_HEADERS =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)/rules.d
-	$(INSTALL_DATA) 60-cdrom_id.rules $(DESTDIR)$(libudevdir)/rules.d/60-cdrom_id.rules
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-	- rm $(DESTDIR)$(libudevdir)/rules.d/60-cdrom_id.rules
-.PHONY: uninstall-bin
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
-	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: install-man
-
-uninstall-man:
-	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
diff --git a/extras/collect/Makefile b/extras/collect/Makefile
deleted file mode 100644
index 76487017dd..0000000000
--- a/extras/collect/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Makefile for udev extra invoked by the udev main Makefile
-
-PROG = collect
-OBJ =
-HEADERS =
-GEN_HEADERS =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: uninstall-bin
-
-install-man:
-	@echo "Please create a man page for this tool."
-.PHONY: install-man
-
-uninstall-man:
-	@echo "Please create a man page for this tool."
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile
deleted file mode 100644
index 0126b859ee..0000000000
--- a/extras/edd_id/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = edd_id
-OBJ =
-HEADERS =
-GEN_HEADERS =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)/rules.d/
-	$(INSTALL_DATA) 61-persistent-storage-edd.rules $(DESTDIR)$(libudevdir)/rules.d/61-persistent-storage-edd.rules
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-	- rm $(DESTDIR)$(libudevdir)/rules.d/61-persistent-storage-edd.rules
-.PHONY: uninstall-bin
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
-	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: install-man
-
-uninstall-man:
-	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
-
diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
deleted file mode 100644
index 5e84acb156..0000000000
--- a/extras/firmware/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = firmware.sh
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: uninstall-bin
-
-install-man:
-	@echo "Please create a man page for this tool."
-.PHONY: install-man
-
-uninstall-man:
-	@echo "Please create a man page for this tool."
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
-
diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile
deleted file mode 100644
index 0adc373c94..0000000000
--- a/extras/floppy/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = create_floppy_devices
-OBJ =
-HEADERS =
-GEN_HEADERS =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: uninstall-bin
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8/
-	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: install-man
-
-uninstall-man:
-	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
diff --git a/extras/fstab_import/.gitignore b/extras/fstab_import/.gitignore
new file mode 100644
index 0000000000..c9ec5b801c
--- /dev/null
+++ b/extras/fstab_import/.gitignore
@@ -0,0 +1 @@
+fstab_import
diff --git a/extras/fstab_import/Makefile b/extras/fstab_import/Makefile
deleted file mode 100644
index 3f65aa3f64..0000000000
--- a/extras/fstab_import/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = fstab_import
-OBJ =
-HEADERS =
-GEN_HEADERS =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-	$(INSTALL_DATA) 79-fstab_import.rules $(DESTDIR)$(libudevdir)/rules.d/79-fstab_import.rules
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-	- rm $(DESTDIR)$(libudevdir)/rules.d/79-fstab_import.rules
-.PHONY: uninstall-bin
-
-install-man:
-	@echo "Please create a man page for this tool."
-.PHONY: install-man
-
-uninstall-man:
-	@echo "Please create a man page for this tool."
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
-
diff --git a/extras/path_id/Makefile b/extras/path_id/Makefile
deleted file mode 100644
index 2f0b882e65..0000000000
--- a/extras/path_id/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = path_id
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: uninstall-bin
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8/
-	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: install-man
-
-uninstall-man:
-	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
-
diff --git a/extras/rule_generator/Makefile b/extras/rule_generator/Makefile
deleted file mode 100644
index e236ca77f0..0000000000
--- a/extras/rule_generator/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_DATA) rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions
-	$(INSTALL_SCRIPT) write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules
-	$(INSTALL_SCRIPT) write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules
-	$(INSTALL) -d  $(DESTDIR)$(libudevdir)/rules.d
-	$(INSTALL_DATA) 75-cd-aliases-generator.rules \
-		$(DESTDIR)$(libudevdir)/rules.d/75-cd-aliases-generator.rules
-	$(INSTALL_DATA) 75-persistent-net-generator.rules \
-		$(DESTDIR)$(libudevdir)/rules.d/75-persistent-net-generator.rules
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/rule_generator.functions
-	- rm $(DESTDIR)$(libudevdir)/write_cd_rules
-	- rm $(DESTDIR)$(libudevdir)/write_net_rules
-	- rm $(DESTDIR)$(configdir)/rules.d/75-cd-aliases-generator.rules
-	- rm $(DESTDIR)$(configdir)/rules.d/75-persistent-net-generator.rules
-.PHONY: uninstall-bin
-
-install-man:
-	@echo "Please create a man page for this tool."
-.PHONY: install-man
-
-uninstall-man:
-	@echo "Please create a man page for this tool."
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
-
diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
deleted file mode 100644
index ca067d0cb9..0000000000
--- a/extras/scsi_id/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2003 IBM
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-SCSI_ID_VERSION = 2.0
-
-PROG = scsi_id
-OBJS= scsi_serial.o
-HEADERS = scsi_id.h scsi.h scsi_id_version.h bsg.h
-GEN_HEADERS = scsi_id_version.h
-MAN_PAGES = scsi_id.8
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-scsi_id_version.h:
-	$(E) "  GENHDR  " $@
-	$(Q) echo "/* Generated by make. */" > $@
-	$(Q) echo \#define SCSI_ID_VERSION     \"$(SCSI_ID_VERSION)\" >> $@
-	$(Q) echo \#define SCSI_ID_CONFIG_FILE     \"$(etcdir)/scsi_id.config\" >> $@
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: uninstall-bin
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
-	$(INSTALL_DATA) scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
-.PHONY: install-man
-
-uninstall-man:
-	-rm -f $(DESTDIR)$(mandir)/man8/scsi_id.8
-.PHONY: uninstall-man
-
-install-config:
-	@ if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \
-		echo $(INSTALL) -d $(DESTDIR)$(etcdir); \
-		echo $(INSTALL_DATA) ./scsi_id.config  $(DESTDIR)$(etcdir); \
-		$(INSTALL) -d $(DESTDIR)$(etcdir); \
-		$(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \
-	fi
-.PHONY: install-config
-
-install: all install-bin install-config install-man
-.PHONY: install
-
-uninstall: uninstall-bin uninstall-man
-.PHONY: uninstall
diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile
deleted file mode 100644
index 09496049a5..0000000000
--- a/extras/usb_id/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = usb_id
-OBJ =
-HEADERS =
-GEN_HEADERS =
-MAN_PAGES =
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-.PHONY: uninstall-bin
-
-install-man:
-	@echo "Please create a man page for this tool."
-.PHONY: install-man
-
-uninstall-man:
-	@echo "Please create a man page for this tool."
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
deleted file mode 100644
index 50d5e338c2..0000000000
--- a/extras/volume_id/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# Makefile for udev extra invoked from the udev main Makefile
-#
-# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-
-PROG = vol_id
-GEN_HEADERS =
-MAN_PAGES = vol_id.8
-
-prefix =
-etcdir =	${prefix}/etc
-sbindir =	${prefix}/sbin
-usrbindir =	${prefix}/usr/bin
-usrsbindir =	${prefix}/usr/sbin
-libudevdir =	${prefix}/lib/udev
-mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
-
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-
-all: lib $(PROG) $(MAN_PAGES)
-.PHONY: all
-.DEFAULT: all
-
-.SUFFIXES:
-
-%.o: %.c $(GEN_HEADERS)
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-lib:
-	$(Q) $(MAKE) -C $@
-.PHONY: lib
-
-lib/libvolume_id.a: lib
-
-$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
-	$(E) "  LD      " $@
-ifeq ($(strip $(VOLUME_ID_STATIC)),true)
-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
-else
-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
-endif
-
-# man pages
-%.8: %.xml
-	$(E) "  XMLTO   " $@
-	$(Q) xmlto man $?
-.PRECIOUS: %.8
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-	$(Q) $(MAKE) -C lib clean
-.PHONY: clean
-
-install-bin: all
-	$(INSTALL) -d $(DESTDIR)$(libudevdir)
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-	$(MAKE) -C lib install
-.PHONY: install-bin
-
-uninstall-bin:
-	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-	$(MAKE) -C lib uninstall
-.PHONY: uninstall-bin
-
-install-man:
-	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
-	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: install-man
-
-uninstall-man:
-	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
-
-install-config:
-	@echo "no config file to install"
-.PHONY: install-config
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
deleted file mode 100644
index 95bb2ed394..0000000000
--- a/extras/volume_id/lib/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-# libvolume_id - read filesystem label/uuid
-#
-# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
-#
-# Released under the GNU General Public License, version 2.
-#
-includedir = 	${prefix}/usr/include
-oslibdir =	$(shell $(CC) $(CFLAGS) -print-multi-os-directory)
-libdir =	$(realpath ${prefix}/lib/$(oslibdir))
-usrlibdir =	$(realpath ${prefix}/usr/lib/$(oslibdir))
-
-INSTALL = install -c
-INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_LIB = ${INSTALL} -m 755
-
-SHLIB_CUR = 0
-SHLIB_REV = 85
-SHLIB_AGE = 0
-SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
-
-OBJS=				\
-	ext.o			\
-	fat.o			\
-	hfs.o			\
-	highpoint.o		\
-	isw_raid.o		\
-	lsi_raid.o		\
-	via_raid.o		\
-	silicon_raid.o		\
-	nvidia_raid.o		\
-	promise_raid.o		\
-	adaptec_raid.o		\
-	jmicron_raid.o		\
-	ddf_raid.o		\
-	iso9660.o		\
-	jfs.o			\
-	linux_raid.o		\
-	linux_swap.o		\
-	lvm.o			\
-	ntfs.o			\
-	reiserfs.o		\
-	udf.o			\
-	ufs.o			\
-	xfs.o			\
-	cramfs.o		\
-	hpfs.o			\
-	romfs.o			\
-	sysv.o			\
-	minix.o			\
-	gfs.o			\
-	luks.o			\
-	ocfs.o			\
-	vxfs.o			\
-	squashfs.o		\
-	netware.o		\
-	oracleasm.o		\
-	volume_id.o		\
-	util.o
-
-HEADERS=			\
-	libvolume_id.h		\
-	util.h
-
-all: libvolume_id.a $(SHLIB) libvolume_id.pc
-.PHONY: all
-.DEFAULT: all
-
-.SUFFIXES:
-
-%.o: %.c
-	$(E) "  CC      " $@
-	$(Q) $(CC) -c $(CFLAGS) $< -o $@
-
-.shlib/%.o: %.c
-	$(E) "  CC      " $@
-	$(Q) mkdir -p $(dir $@)
-	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
-
-libvolume_id.a: $(HEADERS) $(OBJS)
-	$(Q) rm -f $@
-	$(E) "  AR      " $@
-	$(Q) $(AR) cq $@ $(OBJS)
-	$(E) "  RANLIB  " $@
-	$(Q) $(RANLIB) $@
-
-$(SHLIB): $(HEADERS) exported_symbols $(addprefix .shlib/,$(OBJS))
-	$(E) "  CC      " $@
-	$(Q) $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ \
-		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
-		$(addprefix .shlib/,$(OBJS))
-	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
-	$(Q) ln -sf $@ libvolume_id.so
-
-libvolume_id.pc:
-	$(E) "  GENPC   " $@
-	$(Q) echo "prefix=${prefix}/usr" >> $@
-	$(Q) echo "exec_prefix=\$${prefix}" >> $@
-	$(Q) echo "libdir=${usrlibdir}" >> $@
-	$(Q) echo "includedir=${includedir}" >> $@
-	$(Q) echo "" >> $@
-	$(Q) echo "Name: libvolume_id" >> $@
-	$(Q) echo "Description: Filesystem label and uuid access" >> $@
-	$(Q) echo "Version: $(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)" >> $@
-	$(Q) echo "Libs: -L\$${libdir} -lvolume_id" >> $@
-	$(Q) echo "Cflags: -I\$${includedir}" >> $@
-
-install: all
-	$(INSTALL) -d $(DESTDIR)$(includedir)
-	$(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
-	$(INSTALL) -d $(DESTDIR)$(libdir)
-	$(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
-	$(INSTALL) -d $(DESTDIR)$(usrlibdir)
-	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
-ifeq ($(libdir),$(usrlibdir))
-	ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-else
-	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
-endif
-	$(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
-	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
-.PHONY: install
-
-uninstall:
-	rm -f $(DESTDIR)$(includedir)/libvolume_id.h
-	rm -f $(DESTDIR)$(usrlibdir)/libvolume_id.a
-	rm -f $(DESTDIR)$(libdir)/$(SHLIB)
-	rm -f $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
-	rm -f $(DESTDIR)$(libdir)/libvolume_id.so
-.PHONY: uninstall
-
-clean:
-	$(E) "  CLEAN   "
-	$(Q) rm -f libvolume_id.a $(OBJS)
-	$(Q) rm -f $(SHLIB) libvolume_id.so.$(SHLIB_CUR) libvolume_id.so
-	$(Q) rm -rf .shlib
-	$(Q) rm -f libvolume_id.pc
-.PHONY: clean
-
diff --git a/extras/volume_id/vol_id.8 b/extras/volume_id/vol_id.8
deleted file mode 100644
index 2e4a8c3811..0000000000
--- a/extras/volume_id/vol_id.8
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"     Title: vol_id
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: March 2006
-.\"    Manual: vol_id
-.\"    Source: volume_id
-.\"
-.TH "VOL_ID" "8" "March 2006" "volume_id" "vol_id"
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-vol_id - probe filesystem type and read label and uuid
-.SH "SYNOPSIS"
-.HP 7
-\fBvol_id\fR [\fB\-\-export\fR] [\fB\-\-type\fR] [\fB\-\-label\fR] [\fB\-\-label\-raw\fR] [\fB\-\-uuid\fR] [\fB\-\-skip\-raid\fR] [\fB\-\-probe\-all\fR] [\fB\-\-help\fR] [\fIdevice\fR]
-.SH "DESCRIPTION"
-.PP
-\fBvol_id\fR
-is usually called from a udev rule, to provide udev with the filesystem type, the label and the uuid of a volume\. It supports most of the common filesystem formats and detects various raid setups to prevent the recognition of raid members as a volume with a filesystem\.
-.SH "OPTIONS"
-.PP
-\fB\-\-export\fR
-.RS 4
-Print all values in key/value format to import them into the environment\.
-.RE
-.PP
-\fB\-\-type\fR
-.RS 4
-Print the filesystem type\.
-.RE
-.PP
-\fB\-\-label\fR
-.RS 4
-Print the safe version of volume label suitable for use as filename\.
-.RE
-.PP
-\fB\-\-label\-raw\fR
-.RS 4
-Print the raw volume label\.
-.RE
-.PP
-\fB\-\-uuid\fR
-.RS 4
-Print the uuid of a volume\.
-.RE
-.PP
-\fB\-\-skip\-raid\fR
-.RS 4
-Skip detection of raid metadata\.
-.RE
-.PP
-\fB\-\-probe\-all\fR
-.RS 4
-Probe for all types and print all matches\.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print usage\.
-.RE
-.SH "ENVIRONMENT"
-.PP
-\fBUDEV_LOG\fR
-.RS 4
-Set the syslog priority\.
-.RE
-.SH "EXIT STATUS"
-.PP
-\fBvol_id\fR
-will only return successful if the value asked for is not empty\. All trailing whitespace will be removed, spaces replaced by underscore and slashes ignored\.
-.SH "AUTHOR"
-.PP
-Written by Kay Sievers
-<kay\.sievers@vrfy\.org>
-.SH "SEE ALSO"
-.PP
-\fBudev\fR(7)
diff --git a/udev.7 b/udev.7
deleted file mode 100644
index c4ca28603d..0000000000
--- a/udev.7
+++ /dev/null
@@ -1,432 +0,0 @@
-.\"     Title: udev
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: August 2005
-.\"    Manual: udev
-.\"    Source: udev
-.\"
-.TH "UDEV" "7" "August 2005" "udev" "udev"
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-udev - dynamic device management
-.SH "DESCRIPTION"
-.PP
-udev provides a dynamic device directory containing only the files for actually present devices\. It creates or removes device node files in the
-\fI/dev\fR
-directory, or it renames network interfaces\.
-.PP
-Usually udev runs as
-\fBudevd\fR(8)
-and receives uevents directly from the kernel if a device is added or removed from the system\.
-.PP
-If udev receives a device event, it matches its configured rules against the available device attributes provided in sysfs to identify the device\. Rules that match may provide additional device information or specify a device node name and multiple symlink names and instruct udev to run additional programs as part of the device event handling\.
-.SH "CONFIGURATION"
-.PP
-udev configuration files are placed in
-\fI/etc/udev/\fR
-and
-\fI/lib/udev/\fR\. All empty lines, or lines beginning with \'#\' will be ignored\.
-.SS "Configuration file"
-.PP
-udev expects its main configuration file at
-\fI/etc/udev/udev\.conf\fR\. It consists of a set of variables allowing the user to override default udev values\. The following variables can be set:
-.PP
-\fBudev_root\fR
-.RS 4
-Specifies where to place the device nodes in the filesystem\. The default value is
-\fI/dev\fR\.
-.RE
-.PP
-\fBudev_log\fR
-.RS 4
-The logging priority\. Valid values are the numerical syslog priorities or their textual representations:
-\fBerr\fR,
-\fBinfo\fR
-and
-\fBdebug\fR\.
-.RE
-.SS "Rules files"
-.PP
-The udev rules are read from the files located in the default rules directory
-\fI/lib/udev/rules\.d/\fR, the custom rules directory
-\fI/etc/udev/rules\.d/\fR
-and the temporary rules directory
-\fI/dev/\.udev/rules\.d/\fR\. All rule files are sorted and processed in lexical order, regardless in which of these directories they live\. Every line in the rules file contains at least one key value pair\. There are two kind of keys, match and assignment keys\. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned\.
-.PP
-A matching rule may specify the name of the device node, add a symlink pointing to the node, or run a specified program as part of the event handling\. If no matching rule is found, the default device node name is used\.
-.PP
-A rule may consist of a list of one or more key value pairs separated by a comma\. Each key has a distinct operation, depending on the used operator\. Valid operators are:
-.PP
-\fB==\fR
-.RS 4
-Compare for equality\.
-.RE
-.PP
-\fB!=\fR
-.RS 4
-Compare for non\-equality\.
-.RE
-.PP
-\fB=\fR
-.RS 4
-Assign a value to a key\. Keys that represent a list, are reset and only this single value is assigned\.
-.RE
-.PP
-\fB+=\fR
-.RS 4
-Add the value to a key that holds a list of entries\.
-.RE
-.PP
-\fB:=\fR
-.RS 4
-Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules\.
-.RE
-.PP
-The following key names can be used to match against device properties\. Some of the keys also match against properties of the parent devices in sysfs, not only the device that has generated the event\. If multiple keys that match a parent device are specified in a single rule, all these keys must match at one and the same parent device\.
-.PP
-\fBACTION\fR
-.RS 4
-Match the name of the event action\.
-.RE
-.PP
-\fBDEVPATH\fR
-.RS 4
-Match the devpath of the event device\.
-.RE
-.PP
-\fBKERNEL\fR
-.RS 4
-Match the name of the event device\.
-.RE
-.PP
-\fBNAME\fR
-.RS 4
-Match the name of the node or network interface\. It can be used once the NAME key has been set in one of the preceding rules\.
-.RE
-.PP
-\fBSUBSYSTEM\fR
-.RS 4
-Match the subsystem of the event device\.
-.RE
-.PP
-\fBDRIVER\fR
-.RS 4
-Match the driver name of the event device\. Only set for devices which are bound to a driver at the time the event is generated\.
-.RE
-.PP
-\fBATTR{\fR\fB\fIfilename\fR\fR\fB}\fR
-.RS 4
-Match sysfs attribute values of the event device\. Up to five
-\fBATTR\fR
-keys can be specified per rule\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\. Depending on the type of operator, this key is also used to set the value of a sysfs attribute\.
-.RE
-.PP
-\fBKERNELS\fR
-.RS 4
-Search the devpath upwards for a matching device name\.
-.RE
-.PP
-\fBSUBSYSTEMS\fR
-.RS 4
-Search the devpath upwards for a matching device subsystem name\.
-.RE
-.PP
-\fBDRIVERS\fR
-.RS 4
-Search the devpath upwards for a matching device driver name\.
-.RE
-.PP
-\fBATTRS{\fR\fB\fIfilename\fR\fR\fB}\fR
-.RS 4
-Search the devpath upwards for a device with matching sysfs attribute values\. Up to five
-\fBATTRS\fR
-keys can be specified per rule, but all of them must match on the same device\. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself\.
-.RE
-.PP
-\fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
-.RS 4
-Match against the value of an environment variable\. Up to five
-\fBENV\fR
-keys can be specified per rule\. Depending on the type of operator, this key is also used to export a variable to the environment\.
-.RE
-.PP
-\fBTEST{\fR\fB\fIoctal mode mask\fR\fR\fB}\fR
-.RS 4
-Test the existence of a file\. An octal mode mask can be specified if needed\.
-.RE
-.PP
-\fBPROGRAM\fR
-.RS 4
-Execute external program\. The key is true, if the program returns with exit code zero\. The whole event environment is available to the executed program\. The program\'s output printed to stdout, is available in the RESULT key\.
-.RE
-.PP
-\fBRESULT\fR
-.RS 4
-Match the returned string of the last PROGRAM call\. This key can be used in the same or in any later rule after a PROGRAM call\.
-.RE
-.PP
-Most of the fields support a shell style pattern matching\. The following pattern characters are supported:
-.PP
-\fB*\fR
-.RS 4
-Matches zero, or any number of characters\.
-.RE
-.PP
-\fB?\fR
-.RS 4
-Matches any single character\.
-.RE
-.PP
-\fB[]\fR
-.RS 4
-Matches any single character specified within the brackets\. For example, the pattern string \'tty[SR]\' would match either \'ttyS\' or \'ttyR\'\. Ranges are also supported within this match with the \'\-\' character\. For example, to match on the range of all digits, the pattern [0\-9] would be used\. If the first character following the \'[\' is a \'!\', any characters not enclosed are matched\.
-.RE
-.PP
-The following keys can get values assigned:
-.PP
-\fBNAME\fR
-.RS 4
-The name of the node to be created, or the name the network interface should be renamed to\. Only one rule can set the node name, all later rules with a NAME key will be ignored\.
-.RE
-.PP
-\fBSYMLINK\fR
-.RS 4
-The name of a symlink targeting the node\. Every matching rule can add this value to the list of symlinks to be created along with the device node\. Multiple symlinks may be specified by separating the names by the space character\.
-.RE
-.PP
-\fBOWNER, GROUP, MODE\fR
-.RS 4
-The permissions for the device node\. Every specified value overwrites the compiled\-in default value\.
-.RE
-.PP
-\fBATTR{\fR\fB\fIkey\fR\fR\fB}\fR
-.RS 4
-The value that should be written to a sysfs attribute of the event device\. Depending on the type of operator, this key is also used to match against the value of a sysfs attribute\.
-.RE
-.PP
-\fBENV{\fR\fB\fIkey\fR\fR\fB}\fR
-.RS 4
-Export a variable to the environment\. Depending on the type of operator, this key is also to match against an environment variable\.
-.RE
-.PP
-\fBRUN\fR
-.RS 4
-Add a program to the list of programs to be executed for a specific device\. This can only be used for very short running tasks\. Running an event process for a long period of time may block all further events for this or a dependent device\. Long running tasks need to be immediately detached from the event process itself\.
-.sp
-If the specifiefd string starts with
-\fBsocket:\fR\fB\fIpath\fR\fR, all current event values will be passed to the specified socket, as a message in the same format the kernel sends an uevent\. If the first character of the specified path is an @ character, an abstract namespace socket is used, instead of an existing socket file\.
-.RE
-.PP
-\fBLABEL\fR
-.RS 4
-Named label where a GOTO can jump to\.
-.RE
-.PP
-\fBGOTO\fR
-.RS 4
-Jumps to the next LABEL with a matching name
-.RE
-.PP
-\fBIMPORT{\fR\fB\fItype\fR\fR\fB}\fR
-.RS 4
-Import a set of variables into the event environment, depending on
-\fItype\fR:
-.PP
-\fBprogram\fR
-.RS 4
-Execute an external program specified as the assigned value and import its output, which must be in environment key format\.
-.RE
-.PP
-\fBfile\fR
-.RS 4
-Import a text file specified as the assigned value, which must be in environment key format\.
-.RE
-.PP
-\fBparent\fR
-.RS 4
-Import the stored keys from the parent device by reading the database entry of the parent device\. The value assigned to
-\fBIMPORT{parent}\fR
-is used as a filter of key names to import (with the same shell\-style pattern matching used for comparisons)\.
-.RE
-.sp
-If no option is given, udev will choose between
-\fBprogram\fR
-and
-\fBfile\fR
-based on the executable bit of the file permissions\.
-.RE
-.PP
-\fBWAIT_FOR\fR
-.RS 4
-Wait for a file to become available\.
-.RE
-.PP
-\fBOPTIONS\fR
-.RS 4
-Rule and device options:
-.PP
-\fBlast_rule\fR
-.RS 4
-Stops further rules application\. No later rules will have any effect\.
-.RE
-.PP
-\fBignore_device\fR
-.RS 4
-Ignore this event completely\.
-.RE
-.PP
-\fBignore_remove\fR
-.RS 4
-Do not remove the device node when the device goes away\. This may be useful as a workaround for broken device drivers\.
-.RE
-.PP
-\fBlink_priority=\fR\fB\fIvalue\fR\fR
-.RS 4
-Specify the priority of the created symlinks\. Devices with higher priorities overwrite existing symlinks of other devices\. The default is 0\.
-.RE
-.PP
-\fBall_partitions\fR
-.RS 4
-Create the device nodes for all available partitions of a block device\. This may be useful for removable media devices where media changes are not detected\.
-.RE
-.PP
-\fBevent_timeout=\fR
-.RS 4
-Number of seconds an event will wait for operations to finish, before it will terminate itself\.
-.RE
-.PP
-\fBstring_escape=\fR\fB\fInone|replace\fR\fR
-.RS 4
-Usually control and other possibly unsafe characters are replaced in strings used for device naming\. The mode of replacement can be specified with this option\.
-.RE
-.RE
-.PP
-The
-\fBNAME\fR,
-\fBSYMLINK\fR,
-\fBPROGRAM\fR,
-\fBOWNER\fR,
-\fBGROUP\fR,
-\fBMODE\fR
-and
-\fBRUN\fR
-fields support simple printf\-like string substitutions\. The
-\fBRUN\fR
-format chars gets applied after all rules have been processed, right before the program is executed\. It allows the use of the complete environment set by earlier matching rules\. For all other fields, substitutions are applied while the individual rule is being processed\. The available substitutions are:
-.PP
-\fB$kernel\fR, \fB%k\fR
-.RS 4
-The kernel name for this device\.
-.RE
-.PP
-\fB$number\fR, \fB%n\fR
-.RS 4
-The kernel number for this device\. For example, \'sda3\' has kernel number of \'3\'
-.RE
-.PP
-\fB$devpath\fR, \fB%p\fR
-.RS 4
-The devpath of the device\.
-.RE
-.PP
-\fB$id\fR, \fB%b\fR
-.RS 4
-The name of the device matched while searching the devpath upwards for
-\fBSUBSYSTEMS\fR,
-\fBKERNELS\fR,
-\fBDRIVERS\fR
-and
-\fBATTRS\fR\.
-.RE
-.PP
-\fB$driver\fR
-.RS 4
-The driver name of the device matched while searching the devpath upwards for
-\fBSUBSYSTEMS\fR,
-\fBKERNELS\fR,
-\fBDRIVERS\fR
-and
-\fBATTRS\fR\.
-.RE
-.PP
-\fB$attr{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR
-.RS 4
-The value of a sysfs attribute found at the device, where all keys of the rule have matched\. If the matching device does not have such an attribute, follow the chain of parent devices and use the value of the first attribute that matches\. If the attribute is a symlink, the last element of the symlink target is returned as the value\.
-.RE
-.PP
-\fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR
-.RS 4
-The value of an environment variable\.
-.RE
-.PP
-\fB$major\fR, \fB%M\fR
-.RS 4
-The kernel major number for the device\.
-.RE
-.PP
-\fB$minor\fR, \fB%m\fR
-.RS 4
-The kernel minor number for the device\.
-.RE
-.PP
-\fB$result\fR, \fB%c\fR
-.RS 4
-The string returned by the external program requested with PROGRAM\. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute:
-\fB%c{N}\fR\. If the number is followed by the \'+\' char this part plus all remaining parts of the result string are substituted:
-\fB%c{N+}\fR
-.RE
-.PP
-\fB$parent\fR, \fB%P\fR
-.RS 4
-The node name of the parent device\.
-.RE
-.PP
-\fB$name\fR
-.RS 4
-The current name of the device node\. If not changed by a rule, it is the name of the kernel device\.
-.RE
-.PP
-\fB$links\fR
-.RS 4
-The current list of symlinks, separated by a space character\. The value is only set if an earlier rule assigned a value, or during a remove events\.
-.RE
-.PP
-\fB$root\fR, \fB%r\fR
-.RS 4
-The udev_root value\.
-.RE
-.PP
-\fB$sys\fR, \fB%S\fR
-.RS 4
-The sysfs mount point\.
-.RE
-.PP
-\fB$tempnode\fR, \fB%N\fR
-.RS 4
-The name of a created temporary device node to provide access to the device from a external program before the real node is created\.
-.RE
-.PP
-\fB%%\fR
-.RS 4
-The \'%\' character itself\.
-.RE
-.PP
-\fB$$\fR
-.RS 4
-The \'$\' character itself\.
-.RE
-.PP
-The count of characters to be substituted may be limited by specifying the format length value\. For example, \'%3s{file}\' will only insert the first three characters of the sysfs attribute
-.SH "AUTHOR"
-.PP
-Written by Greg Kroah\-Hartman
-<greg@kroah\.com>
-and Kay Sievers
-<kay\.sievers@vrfy\.org>\. With much help from Dan Stekloff and many others\.
-.SH "SEE ALSO"
-.PP
-\fBudevd\fR(8),
-\fBudevadm\fR(8)
diff --git a/list.h b/udev/list.h
index 8626630f6b..8626630f6b 100644
--- a/list.h
+++ b/udev/list.h
diff --git a/logging.h b/udev/logging.h
index 6e1d5a20ef..6e1d5a20ef 100644
--- a/logging.h
+++ b/udev/logging.h
diff --git a/test-udev.c b/udev/test-udev.c
index 4ac2d5a889..4ac2d5a889 100644
--- a/test-udev.c
+++ b/udev/test-udev.c
diff --git a/udev.h b/udev/udev.h
index 5ecef4abbd..5ecef4abbd 100644
--- a/udev.h
+++ b/udev/udev.h
diff --git a/udev.xml b/udev/udev.xml
index c740c0d807..c740c0d807 100644
--- a/udev.xml
+++ b/udev/udev.xml
diff --git a/udev_config.c b/udev/udev_config.c
index 55f0361dd2..55f0361dd2 100644
--- a/udev_config.c
+++ b/udev/udev_config.c
diff --git a/udev_db.c b/udev/udev_db.c
index 3348c9a02c..3348c9a02c 100644
--- a/udev_db.c
+++ b/udev/udev_db.c
diff --git a/udev_device.c b/udev/udev_device.c
index cf21191ca0..cf21191ca0 100644
--- a/udev_device.c
+++ b/udev/udev_device.c
diff --git a/udev_node.c b/udev/udev_node.c
index 78b6747043..78b6747043 100644
--- a/udev_node.c
+++ b/udev/udev_node.c
diff --git a/udev_rules.c b/udev/udev_rules.c
index ea850a84c3..ea850a84c3 100644
--- a/udev_rules.c
+++ b/udev/udev_rules.c
diff --git a/udev_rules.h b/udev/udev_rules.h
index fe0f9dfbb5..fe0f9dfbb5 100644
--- a/udev_rules.h
+++ b/udev/udev_rules.h
diff --git a/udev_rules_parse.c b/udev/udev_rules_parse.c
index 3ada8b1c7d..3ada8b1c7d 100644
--- a/udev_rules_parse.c
+++ b/udev/udev_rules_parse.c
diff --git a/udev_selinux.c b/udev/udev_selinux.c
index eec950194c..eec950194c 100644
--- a/udev_selinux.c
+++ b/udev/udev_selinux.c
diff --git a/udev_selinux.h b/udev/udev_selinux.h
index 73567d6cfe..73567d6cfe 100644
--- a/udev_selinux.h
+++ b/udev/udev_selinux.h
diff --git a/udev_sysdeps.c b/udev/udev_sysdeps.c
index 9447cca936..9447cca936 100644
--- a/udev_sysdeps.c
+++ b/udev/udev_sysdeps.c
diff --git a/udev_sysdeps.h b/udev/udev_sysdeps.h
index d4f03686af..d4f03686af 100644
--- a/udev_sysdeps.h
+++ b/udev/udev_sysdeps.h
diff --git a/udev_sysfs.c b/udev/udev_sysfs.c
index c4cd4ab75d..c4cd4ab75d 100644
--- a/udev_sysfs.c
+++ b/udev/udev_sysfs.c
diff --git a/udev_utils.c b/udev/udev_utils.c
index 00b67dadc6..00b67dadc6 100644
--- a/udev_utils.c
+++ b/udev/udev_utils.c
diff --git a/udev_utils_file.c b/udev/udev_utils_file.c
index a492785af9..a492785af9 100644
--- a/udev_utils_file.c
+++ b/udev/udev_utils_file.c
diff --git a/udev_utils_string.c b/udev/udev_utils_string.c
index e3dc137e63..e3dc137e63 100644
--- a/udev_utils_string.c
+++ b/udev/udev_utils_string.c
diff --git a/udevadm.c b/udev/udevadm.c
index 6e7d7734d2..6e7d7734d2 100644
--- a/udevadm.c
+++ b/udev/udevadm.c
diff --git a/udevadm.xml b/udev/udevadm.xml
index 670c991457..670c991457 100644
--- a/udevadm.xml
+++ b/udev/udevadm.xml
diff --git a/udevcontrol.c b/udev/udevcontrol.c
index 4c93b8f464..4c93b8f464 100644
--- a/udevcontrol.c
+++ b/udev/udevcontrol.c
diff --git a/udevd.c b/udev/udevd.c
index 0827a5ceb3..0827a5ceb3 100644
--- a/udevd.c
+++ b/udev/udevd.c
diff --git a/udevd.h b/udev/udevd.h
index 9be34cb0cc..9be34cb0cc 100644
--- a/udevd.h
+++ b/udev/udevd.h
diff --git a/udevd.xml b/udev/udevd.xml
index 8d22a0c14d..8d22a0c14d 100644
--- a/udevd.xml
+++ b/udev/udevd.xml
diff --git a/udevinfo.c b/udev/udevinfo.c
index b9ee17c4f1..b9ee17c4f1 100644
--- a/udevinfo.c
+++ b/udev/udevinfo.c
diff --git a/udevmonitor.c b/udev/udevmonitor.c
index 2430dd39a5..2430dd39a5 100644
--- a/udevmonitor.c
+++ b/udev/udevmonitor.c
diff --git a/udevsettle.c b/udev/udevsettle.c
index cb63a66bba..cb63a66bba 100644
--- a/udevsettle.c
+++ b/udev/udevsettle.c
diff --git a/udevtest.c b/udev/udevtest.c
index d5e90b02c6..d5e90b02c6 100644
--- a/udevtest.c
+++ b/udev/udevtest.c
diff --git a/udevtrigger.c b/udev/udevtrigger.c
index d4b10d06ab..d4b10d06ab 100644
--- a/udevtrigger.c
+++ b/udev/udevtrigger.c
diff --git a/udevadm.8 b/udevadm.8
deleted file mode 100644
index 65e85e6bc0..0000000000
--- a/udevadm.8
+++ /dev/null
@@ -1,272 +0,0 @@
-.\"     Title: udevadm
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: November 2007
-.\"    Manual: udevadm
-.\"    Source: udev
-.\"
-.TH "UDEVADM" "8" "November 2007" "udev" "udevadm"
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-udevadm - udev management tool
-.SH "SYNOPSIS"
-.HP 21
-\fBudevadm info \fR\fB[options]\fR
-.HP 24
-\fBudevadm trigger \fR\fB[options]\fR
-.HP 23
-\fBudevadm settle \fR\fB[options]\fR
-.HP 36
-\fBudevadm control \fR\fB[options]\fR\fB \fR\fB\fIinstruction\fR\fR
-.HP 24
-\fBudevadm monitor \fR\fB[options]\fR
-.HP 29
-\fBudevadm test \fR\fB[options]\fR\fB \fR\fB\fIdevpath\fR\fR
-.HP 16
-\fBudevadm version\fR
-.HP 13
-\fBudevadm help\fR
-.SH "DESCRIPTION"
-.PP
-udevadm expects a command and command specific options\. It controls the runtime behavior of udev, requests kernel events, manages the event queue, and provides simple debugging mechanisms\.
-.SH "OPTIONS"
-.SS "udevadm info \fIoptions\fR"
-.PP
-Queries the udev database for device information stored in the udev database\. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device\.
-.PP
-\fB\-\-query=\fR\fB\fItype\fR\fR
-.RS 4
-Query the database for specified type of device data\. It needs the
-\fB\-\-path\fR
-or
-\fB\-\-name\fR
-to identify the specified device\. Valid queries are:
-\fBname\fR,
-\fBsymlink\fR,
-\fBpath\fR,
-\fBenv\fR,
-\fBall\fR\.
-.RE
-.PP
-\fB\-\-path=\fR\fB\fIdevpath\fR\fR
-.RS 4
-The devpath of the device to query\.
-.RE
-.PP
-\fB\-\-name=\fR\fB\fIfile\fR\fR
-.RS 4
-The name of the device node or a symlink to query
-.RE
-.PP
-\fB\-\-root\fR
-.RS 4
-The udev root directory:
-\fI/dev\fR\. If used in conjunction with a
-\fBname\fR
-or
-\fBsymlink\fR
-query, the query returns the absolute path including the root directory\.
-.RE
-.PP
-\fB\-\-attribute\-walk\fR
-.RS 4
-Print all sysfs properties of the specified device that can be used in udev rules to match the specified device\. It prints all devices along the chain, up to the root of sysfs that can be used in udev rules\.
-.RE
-.PP
-\fB\-\-device\-id\-of\-file=\fR\fB\fIfile\fR\fR
-.RS 4
-Print major/minor numbers of the underlying device, where the file lives on\.
-.RE
-.PP
-\fB\-\-export\-db\fR
-.RS 4
-Export the content of the udev database\.
-.RE
-.PP
-\fB\-\-version\fR
-.RS 4
-Print version\.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print help text\.
-.RE
-.SS "udevadm trigger [options]"
-.PP
-Request device uevents, usually used to replay events at system coldplug\.
-.PP
-\fB\-\-verbose\fR
-.RS 4
-Print the list of devices which will be triggered\.
-.RE
-.PP
-\fB\-\-dry\-run\fR
-.RS 4
-Do not actually trigger the event\.
-.RE
-.PP
-\fB\-\-retry\-failed\fR
-.RS 4
-Trigger only the events which are failed during a previous run\.
-.RE
-.PP
-\fB\-\-action=\fR\fB\fIaction\fR\fR
-.RS 4
-Type of event to be triggered\. The default value is "add"\.
-.RE
-.PP
-\fB\-\-subsystem\-match=\fR\fB\fIsubsystem\fR\fR
-.RS 4
-Trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
-.RE
-.PP
-\fB\-\-subsystem\-nomatch=\fR\fB\fIsubsystem\fR\fR
-.RS 4
-Do not trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
-.RE
-.PP
-\fB\-\-attr\-match=\fR\fB\fIattribute\fR\fR\fB=\fR\fB\fIvalue\fR\fR
-.RS 4
-Trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
-.RE
-.PP
-\fB\-\-attr\-nomatch=\fR\fB\fIattribute\fR\fR\fB=\fR\fB\fIvalue\fR\fR
-.RS 4
-Do not trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
-.RE
-.PP
-\fB\-\-socket=\fR\fB\fIpath\fR\fR
-.RS 4
-Pass the synthesized events to the specified socket, instead of triggering a global kernel event\. All available event values will be send in the same format the kernel sends an uevent, or
-\fBRUN+="socket:\fR\fB\fIpath\fR\fR\fB"\fR
-sends a message\. If the first character of the specified path is an @ character, an abstract namespace socket is used, instead of an existing socket file\.
-.RE
-.PP
-\fB\-\-env=\fR\fB\fIKEY\fR\fR\fB=\fR\fB\fIvalue\fR\fR
-.RS 4
-Pass an additional environemt key to the event\. This works only with the \-\-socket option\.
-.RE
-.SS "udevadm settle [options]"
-.PP
-Watches the udev event queue, and exits if all current events are handled\.
-.PP
-\fB\-\-timeout=\fR\fB\fIseconds\fR\fR
-.RS 4
-Maximum number of seconds to wait for the event queue to become empty\. The default value is 180 seconds\.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print help text\.
-.RE
-.SS "udevadm control \fIcommand\fR"
-.PP
-Modify the internal state of the running udev daemon\.
-.PP
-\fB\-\-log_priority=\fR\fB\fIvalue\fR\fR
-.RS 4
-Set the internal log level of udevd\. Valid values are the numerical syslog priorities or their textual representations:
-\fBerr\fR,
-\fBinfo\fR
-and
-\fBdebug\fR\.
-.RE
-.PP
-\fB\-\-stop_exec_queue\fR
-.RS 4
-Signal udevd to stop executing new events\. Incoming events will be queued\.
-.RE
-.PP
-\fB\-\-start_exec_queue\fR
-.RS 4
-Signal udevd to enable the execution of events\.
-.RE
-.PP
-\fB\-\-reload_rules\fR
-.RS 4
-Signal udevd to reload the rules from the config\.
-.RE
-.PP
-\fB\-\-env=\fR\fB\fIKEY\fR\fR\fB=\fR\fB\fIvalue\fR\fR
-.RS 4
-Set global variable\.
-.RE
-.PP
-\fB\-\-max_childs=\fR\fIvalue\fR
-.RS 4
-Set the maximum number of events, udevd will handle at the same time\.
-.RE
-.PP
-\fB\-\-max_childs_running=\fR\fB\fIvalue\fR\fR
-.RS 4
-Set the maximum number of events, which are allowed to run at the same time\.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print help text\.
-.RE
-.SS "udevadm monitor [options]"
-.PP
-Listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console\. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event\.
-.PP
-\fB\-\-environment\fR
-.RS 4
-Print the complete environment for all events\. Can be used to compare the kernel supplied and the udev added environment values\.
-.RE
-.PP
-\fB\-\-kernel\fR
-.RS 4
-Print the kernel uevents\.
-.RE
-.PP
-\fB\-\-udev\fR
-.RS 4
-Print the udev event after the rule processing\.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print help text\.
-.RE
-.SS "udevadm test [options] \fIdevpath\fR"
-.PP
-Simulate a udev event run for the given device, and print out debug output\. Unless forced to, no device node or symlink will be created\.
-.PP
-\fB\-\-action=\fR\fB\fIstring\fR\fR
-.RS 4
-The action string\.
-.RE
-.PP
-\fB\-\-subsystem=\fR\fB\fIstring\fR\fR
-.RS 4
-The subsystem string\.
-.RE
-.PP
-\fB\-\-force\fR
-.RS 4
-Force the creation of a device node or symlink\. Usually the test run prints only debug output\.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Print help text\.
-.RE
-.SS "udevadm version"
-.PP
-Print version number\.
-.SS "udevadm help"
-.PP
-Print help text\.
-.SH "AUTHOR"
-.PP
-Written by Kay Sievers
-<kay\.sievers@vrfy\.org>\.
-.SH "SEE ALSO"
-.PP
-\fBudev\fR(7)
-\fBudevd\fR(8)
diff --git a/udevd.8 b/udevd.8
deleted file mode 100644
index c6b481134d..0000000000
--- a/udevd.8
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"     Title: udevd
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: August 2005
-.\"    Manual: udevd
-.\"    Source: udev
-.\"
-.TH "UDEVD" "8" "August 2005" "udev" "udevd"
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-udevd - event managing daemon
-.SH "SYNOPSIS"
-.HP 6
-\fBudevd\fR [\fB\-\-daemon\fR] [\fB\-\-debug\-trace\fR] [\fB\-\-debug\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
-.SH "DESCRIPTION"
-.PP
-udevd listens to kernel uevents and passes the incoming events to udev\. It ensures the correct event order and takes care, that events for child devices are delayed until the parent event has finished the device handling\. The behavior of the running daemon can be changed with
-\fBudevadm control\fR\.
-.SH "OPTIONS"
-.PP
-\fB\-\-daemon\fR
-.RS 4
-Detach and run in the background\.
-.RE
-.PP
-\fB\-\-debug\-trace\fR
-.RS 4
-Run all events completely serialized\. This may be useful if udev triggers actions or loads kernel modules which cause problems and a slow but continuous operation is needed, where no events are processed in parallel\.
-.RE
-.PP
-\fB\-\-debug\fR
-.RS 4
-Print log messages to stdout\.
-.RE
-.PP
-\fB\-\-version\fR
-.RS 4
-Print version number\.
-.RE
-.PP
-\fBhelp\fR
-.RS 4
-Print help text\.
-.RE
-.SH "ENVIRONMENT"
-.PP
-\fBUDEV_LOG\fR
-.RS 4
-Overrides the syslog priority specified in the config file\.
-.RE
-.SH "AUTHOR"
-.PP
-Written by Kay Sievers
-<kay\.sievers@vrfy\.org>\.
-.SH "SEE ALSO"
-.PP
-\fBudev\fR(7),
-\fBudevadm\fR(8)