X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=d4d3ac8b0556be6a0b246ebfef10b8ad03716647;hp=d953218f7ba267a1da6418a73f7137b132d1a471;hb=eb6c7cd03635ffc28798734f0b87b9e21dae6f9e;hpb=53921bfa44129a19661a4aaa4c1647282921fc18

diff --git a/Makefile b/Makefile
index d953218f7..d4d3ac8b0 100644
--- a/Makefile
+++ b/Makefile
@@ -25,31 +25,35 @@ USE_LOG = true
 # Leave this set to `false' for production use.
 DEBUG = false
 
-# Set the following to `true' to make udev emit a D-BUS signal when a
-# new node is created.
-USE_DBUS = false
-
 
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
-HELPER =	udevinfo
-VERSION =	015_bk
+INFO =		udevinfo
+TESTER =	udevtest
+STARTER =	udevstart
+RULER =		udevruler
+VERSION =	030
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
+HOTPLUG_EXEC =	$(ROOT)
 
 DESTDIR =
+
+KERNEL_DIR = /lib/modules/${shell uname -r}/build
+
 # override this to make udev look in a different location for it's config files
 prefix =
 exec_prefix =	${prefix}
 etcdir =	${prefix}/etc
 sbindir =	${exec_prefix}/sbin
+usrbindir =	${exec_prefix}/usr/bin
 mandir =	${prefix}/usr/share/man
 hotplugdir =	${etcdir}/hotplug.d/default
-dbusdir =	${etcdir}/dbus-1/system.d
-configdir =	${etcdir}/udev/
-initdir = 	${etcdir}/init.d/
+configdir =	${etcdir}/udev
+initdir = 	${etcdir}/init.d
+dev_ddir =	${etcdir}/dev.d
 srcdir = .
 
 INSTALL = /usr/bin/install -c
@@ -68,6 +72,9 @@ udevdir = ${prefix}/udev
 # than the local version of klibc
 #USE_KLIBC = true
 
+# set up PWD so that older versions of make will work with our build.
+PWD = $(shell pwd)
+
 # If you are running a cross compiler, you may want to set this
 # to something more interesting, like "arm-linux-".  If you want
 # to compile vs uClibc, that can be done here as well.
@@ -85,7 +92,7 @@ ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sp
 	-e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
 
 # code taken from uClibc to determine the gcc include dir
-GCCINCDIR := ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
+GCCINCDIR := ${shell LC_ALL=C $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
 
 # code taken from uClibc to determine the libgcc.a filename
 GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
@@ -107,9 +114,9 @@ ifeq ($(strip $(TARGET_ARCH)),i386)
 		/dev/null >/dev/null 2>&1; then echo "-mpreferred-stack-boundary=2"; fi}
 	OPTIMIZATION += ${shell if $(CC) -malign-functions=0 -malign-jumps=0 -S -o /dev/null -xc \
 		/dev/null >/dev/null 2>&1; then echo "-malign-functions=0 -malign-jumps=0"; fi}
-	CFLAGS+=-pipe
+	CFLAGS+=-pipe -Dasmlinkage=__attribute__((regparm(0)))
 else
-	CFLAGS+=-pipe
+	CFLAGS+=-pipe -Dasmlinkage=
 endif
 
 ifeq ($(strip $(USE_LOG)),true)
@@ -134,7 +141,8 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	KLIBC_BASE	= $(PWD)/klibc
 	KLIBC_DIR	= $(KLIBC_BASE)/klibc
 	INCLUDE_DIR	:= $(KLIBC_DIR)/include
-	LINUX_INCLUDE_DIR	:= $(KLIBC_BASE)/linux/include
+	LINUX_INCLUDE_DIR	:= $(KERNEL_DIR)/include
+#	LINUX_INCLUDE_DIR	:= $(KLIBC_BASE)/linux/include
 	include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
 	# arch specific objects
 	ARCH_LIB_OBJS =	\
@@ -144,6 +152,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	CRT0 = $(KLIBC_DIR)/crt0.o
 	LIBC =	$(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
 	CFLAGS += $(WARNINGS) -nostdinc			\
+		$(OPTFLAGS)				\
 		-D__KLIBC__ -fno-builtin-printf		\
 		-I$(INCLUDE_DIR)			\
 		-I$(KLIBC_DIR)/arch/$(ARCH)/include	\
@@ -152,7 +161,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
 		-I$(LINUX_INCLUDE_DIR)
 	LIB_OBJS =
 	LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
-	UDEVD =
 else
 	WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 	CRT0 =
@@ -160,24 +168,24 @@ else
 	CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
 	LIB_OBJS = -lc
 	LDFLAGS =
-	UDEVD = $(DAEMON) $(SENDER)
 endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(UDEVD) $(HELPER)
+all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
+		$(MAKE) prefix=$(prefix) \
+			LD="$(LD)" \
+			SYSFS="$(SYSFS)" \
+			KERNEL_DIR="$(KERNEL_DIR)" \
 			-C $$target $@ ; \
 	done ; \
 
-$(ROOT): $(LIBC)
-
 $(ARCH_LIB_OBJS) : $(CRT0)
 
 $(CRT0):
-	$(MAKE) -C klibc
+	$(MAKE) -C klibc KERNEL_DIR=$(KERNEL_DIR)
 
 TDB =	tdb/tdb.o	\
 	tdb/spinlock.o
@@ -190,20 +198,21 @@ SYSFS =	$(PWD)/libsysfs/sysfs_bus.o	\
 	$(PWD)/libsysfs/sysfs_utils.o	\
 	$(PWD)/libsysfs/dlist.o
 
-OBJS =	udev_config.o	\
+OBJS =	udev_lib.o	\
+	udev_config.o	\
 	udev-add.o	\
 	udev-remove.o	\
 	udevdb.o	\
-	logging.o	\
 	namedev.o	\
 	namedev_parse.o	\
+	dev_d.o		\
 	$(SYSFS)	\
 	$(TDB)
 
 HEADERS =	udev.h		\
+		udev_lib.h	\
 		namedev.h	\
 		udev_version.h	\
-		udev_dbus.h	\
 		udevdb.h	\
 		klibc_fixups.h	\
 		logging.h	\
@@ -211,13 +220,7 @@ HEADERS =	udev.h		\
 
 ifeq ($(strip $(USE_KLIBC)),true)
 	OBJS += klibc_fixups.o
-endif
-
-ifeq ($(USE_DBUS), true)
-	CFLAGS += -DUSE_DBUS
-	CFLAGS += $(shell pkg-config --cflags dbus-1)
-	LDFLAGS += $(shell pkg-config --libs dbus-1)
-	OBJS += udev_dbus.o
+	KLIBC_FIXUP = klibc_fixups.o
 endif
 
 # header files automatically generated
@@ -225,15 +228,16 @@ GEN_HEADERS =	udev_version.h
 
 # Rules on how to create the generated header files
 udev_version.h:
-	@echo \#define UDEV_VERSION	\"$(VERSION)\" > $@
-	@echo \#define UDEV_ROOT	\"$(udevdir)/\" >> $@
-	@echo \#define UDEV_DB		\"$(udevdir)/\.udev.tdb\" >> $@
-	@echo \#define UDEV_CONFIG_DIR	\"$(configdir)\" >> $@
-	@echo \#define UDEV_CONFIG_FILE	\"$(configdir)\udev.conf\" >> $@
-	@echo \#define UDEV_RULES_FILE	\"$(configdir)\udev.rules\" >> $@
-	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)\udev.permissions\" >> $@
-	@echo \#define UDEV_BIN		\"$(PWD)/udev\" >> $@
-	@echo \#define UDEVD_BIN	\"$(PWD)/udevd\" >> $@
+	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
+	@echo \#define UDEV_ROOT		\"$(udevdir)/\" >> $@
+	@echo \#define UDEV_DB			\"$(udevdir)/.udev.tdb\" >> $@
+	@echo \#define UDEV_CONFIG_DIR		\"$(configdir)\" >> $@
+	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
+	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
+	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)/permissions.d\" >> $@
+	@echo \#define UDEV_LOG_DEFAULT 	\"yes\" >> $@
+	@echo \#define UDEV_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
+	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
 
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
@@ -242,30 +246,49 @@ GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
 $(LOCAL_CFG_DIR)/udev.conf:
 	sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
+GEN_MANPAGES   = udev.8
+GEN_MANPAGESIN = udev.8.in
+# Rules on how to create the man pages
+$(GEN_MANPAGES): $(GEN_MANPAGESIN)
+	sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
+
 
 $(OBJS): $(GEN_HEADERS)
-udev.o: $(GEN_HEADERS)
+$(ROOT).o: $(GEN_HEADERS)
+$(TESTER).o: $(GEN_HEADERS)
+$(INFO).o: $(GEN_HEADERS)
+$(DAEMON).o: $(GEN_HEADERS)
+$(SENDER).o: $(GEN_HEADERS)
+$(STARTER).o: $(GEN_HEADERS)
+
+$(ROOT): $(ROOT).o $(STARTER).o $(OBJS) $(HEADERS) $(LIBC) $(GEN_MANPAGES)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
+
+$(TESTER): $(TESTER).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
 
-$(ROOT): udev.o $(OBJS) $(HEADERS) $(GEN_HEADERS)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(INFO): $(INFO).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
-$(HELPER): udevinfo.o $(OBJS) $(HEADERS)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o logging.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(DAEMON): $(DAEMON).o $(OBJS) udevd.h $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
-$(DAEMON): udevd.h udevd.o udevd.o logging.o
-	$(LD) $(LDFLAGS) -lpthread -o $@ $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(SENDER): $(SENDER).o udevd.h $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
-$(SENDER): udevd.h udevsend.o udevd.o logging.o
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(RULER): $(RULER).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevruler.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) -lnewt
 	$(STRIPCMD) $@
 
 clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
-	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(HELPER) $(DAEMON) $(SENDER)
+	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(RULER)
 	$(MAKE) -C klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -273,19 +296,20 @@ clean:
 			-C $$target $@ ; \
 	done ; \
 
+spotless: clean
+	$(MAKE) -C klibc spotless
+
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
 release: clean
-	@echo "--------------------------cut here------------------------"
-	@echo "cd .."
-	@echo "rm -rf $(DISTDIR)"
-	@echo "mkdir $(DISTDIR)"
-	@echo "chmod 777 $(DISTDIR)"
-	@echo "cp -avr udev/* $(DISTDIR)"
-	@echo "tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz"
-	@echo "rm -rf $(DISTDIR)"
-	@echo "--------------------------cut here------------------------"
+	-rm -rf $(DISTDIR)
+	mkdir $(DISTDIR)
+	chmod 777 $(DISTDIR)
+	bk export $(DISTDIR)
+	tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
+	rm -rf $(DISTDIR)
+	@echo "$(RELEASE_NAME).tar.gz created"
 
 
 small_release: $(DISTFILES) clean
@@ -305,68 +329,94 @@ small_release: $(DISTFILES) clean
 	@echo "Built $(RELEASE_NAME).tar.gz"
 
 
-ifeq ($(USE_DBUS), true)
-install-dbus-policy:
-	$(INSTALL) -d $(DESTDIR)$(dbusdir)
-	$(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
-
-uninstall-dbus-policy:
-	- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
-else
-install-dbus-policy:
-	-
-uninstall-dbus-policy:
-	-
-endif
+install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB
+	@if [ -f /etc/redhat-release ]; then \
+		$(INSTALL_DATA) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
+	elif [ -f /etc/SuSE-release ]; then \
+		$(INSTALL_DATA) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
+	elif [ -f /etc/debian_version ]; then \
+		$(INSTALL_DATA) -D etc/init.d/udev.debian $(DESTDIR)$(initdir)/udev; \
+	fi
 
 install-config: $(GEN_CONFIGS)
-	$(INSTALL) -d $(DESTDIR)$(configdir)
-	@if [ ! -r $(DESTDIR)$(configdir)udev.conf ]; then \
+	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
+	$(INSTALL) -d $(DESTDIR)$(configdir)/permissions.d
+	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
 		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@if [ ! -r $(DESTDIR)$(configdir)udev.rules ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir); \
+	@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
+		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
+		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
 	fi
-	@if [ ! -r $(DESTDIR)$(configdir)udev.permissions ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
+	@if [ ! -r $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions ]; then \
+		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
+		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
 	fi
 
-install: install-config install-dbus-policy all
+install-dev.d:
+	$(INSTALL) -d $(DESTDIR)$(dev_ddir)/default
+	$(INSTALL_PROGRAM) -D etc/dev.d/net/hotplug.dev $(DESTDIR)$(dev_ddir)/net/hotplug.dev
+
+uninstall-dev.d:
+	- rm $(dev_ddir)/net/hotplug.dev
+	- rmdir $(dev_ddir)/net
+	- rmdir $(dev_ddir)/default
+	- rmdir $(dev_ddir)
+
+install-man:
+	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
+	$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
+	$(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
+	$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
+
+uninstall-man:
+	- rm $(mandir)/man8/udev.8
+	- rm $(mandir)/man8/udevinfo.8
+	- rm $(mandir)/man8/udevtest.8
+	- rm $(mandir)/man8/udevstart.8
+	- rm $(mandir)/man8/udevd.8
+	- rm $(mandir)/man8/udevsend.8
+
+install: install-initscript install-config install-man install-dev.d all
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
 	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
 	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
-	$(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
-	@if [ "x$(USE_LSB)" = "xtrue" ]; then \
-		$(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
-		ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \
-	else \
-		$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
-	fi
-	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
-	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
-	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
-	- ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
+	$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
+	$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
+	$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
+	$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
+	ln -sf $(sbindir)/udev $(DESTDIR)$(sbindir)/$(STARTER)
+	- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
+ifndef DESTDIR
+	- killall udevd
+	- rm -f $(udevdir)/.udev.tdb
+endif
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
 			-C $$target $@ ; \
 	done ; \
 
-uninstall: uninstall-dbus-policy
+uninstall: uninstall-man uninstall-dev.d
 	- rm $(hotplugdir)/udev.hotplug
-	- rm $(configdir)/udev.permissions
-	- rm $(configdir)/udev.rules
+	- rm $(configdir)/rules.d/50-udev.rules
+	- rm $(configdir)/permissions.d/50-udev.permissions
 	- rm $(configdir)/udev.conf
+	- rmdir $(configdir)/rules.d
+	- rmdir $(configdir)/permissions.d
+	- rmdir $(configdir)
 	- rm $(initdir)/udev
-	- rm $(mandir)/man8/udev.8
-	- rm $(mandir)/man8/udevinfo.8
 	- rm $(sbindir)/$(ROOT)
-	- rm $(sbindir)/$(HELPER)
+	- rm $(sbindir)/$(DAEMON)
+	- rm $(sbindir)/$(SENDER)
+	- rm $(sbindir)/$(STARTER)
+	- rm $(usrbindir)/$(INFO)
+	- rm $(usrbindir)/$(TESTER)
 	- rmdir $(hotplugdir)
-	- rmdir $(configdir)
+	- rm $(udevdir)/.udev.tdb
 	- rmdir $(udevdir)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \