15 files changed, 1 insertions, 1080 deletions
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)