X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=bcaf30b706faf4cbca3c7c06a0881815dea84a30;hp=9c755ba4de94aa6eed1bed1f9a60c98f8f6332b4;hb=e07a3d79bad70ea132435c8a44737ac270b0f9e3;hpb=87b60f72b762fddad92c83856ebe05b5aa05fc76

diff --git a/Makefile b/Makefile
index 9c755ba4d..bcaf30b70 100644
--- a/Makefile
+++ b/Makefile
@@ -17,42 +17,98 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-# Set this to make use of syslog.
+VERSION = 073
+
+# set this to make use of syslog
 USE_LOG = true
 
-# Set this to compile-in development debug messages. Pass UDEV_LOG="debug"
-# to the executed binary or set the value in the udev configuration file to
-# let udev print the debug messages to syslog.
+# 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
 
-# Set this to include Security-Enhanced Linux support.
+# compile with gcc's code coverage option
+USE_GCOV = false
+
+# include Security-Enhanced Linux support
 USE_SELINUX = false
 
-# Set this to comile with klibc instead of glibc.
+# comile with klibc instead of glibc
 USE_KLIBC = false
 
-# Set this to create statically linked binaries.
+# set this to create statically linked binaries
 USE_STATIC = false
 
-# To build any of the extras programs, run with:
-# 	make EXTRAS="extras/a extras/b"
-EXTRAS=
+# to build any of the extras programs pass:
+#  make EXTRAS="extras/<extra1> extras/<extra2>"
+EXTRAS =
 
 # make the build silent. Set this to something else to make it noisy again.
-V=false
-
-ROOT =		udev
-DAEMON =	udevd
-SENDER =	udevsend
-INFO =		udevinfo
-TESTER =	udevtest
-STARTER =	udevstart
-VERSION =	056
-INSTALL_DIR =	/usr/local/bin
-RELEASE_NAME =	$(ROOT)-$(VERSION)
-LOCAL_CFG_DIR =	etc/udev
-DESTDIR =
-KERNEL_DIR = /lib/modules/${shell uname -r}/build
+V = false
+
+PROGRAMS = \
+	udev				\
+	udevd				\
+	udevsend			\
+	udeveventrecorder		\
+	udevcontrol			\
+	udevmonitor			\
+	udevinfo			\
+	udevtest			\
+	udevstart
+
+HEADERS = \
+	udev.h				\
+	udev_utils.h			\
+	udev_rules.h			\
+	udev_db.h			\
+	udev_sysfs.h			\
+	logging.h			\
+	udev_libc_wrapper.h		\
+	udev_selinux.h			\
+	list.h
+
+UDEV_OBJS = \
+	udev_event.o			\
+	udev_device.o			\
+	udev_config.o			\
+	udev_add.o			\
+	udev_remove.o			\
+	udev_sysfs.o			\
+	udev_db.o			\
+	udev_rules.o			\
+	udev_rules_parse.o		\
+	udev_utils.o			\
+	udev_utils_string.o		\
+	udev_utils_file.o		\
+	udev_utils_run.o		\
+	udev_libc_wrapper.o
+LIBUDEV = libudev.a
+
+MAN_PAGES = \
+	udev.8				\
+	udevmonitor.8			\
+	udevd.8				\
+	udevsend.8			\
+	udevtest.8			\
+	udevinfo.8			\
+	udevstart.8
+
+SYSFS_OBJS = \
+	libsysfs/sysfs_class.o		\
+	libsysfs/sysfs_device.o		\
+	libsysfs/sysfs_dir.o		\
+	libsysfs/sysfs_driver.o		\
+	libsysfs/sysfs_utils.o		\
+	libsysfs/dlist.o
+LIBSYSFS = libsysfs/libsysfs.a
+
+# config files automatically generated
+GEN_CONFIGS = \
+	$(LOCAL_CFG_DIR)/udev.conf
+
+GEN_HEADERS = \
+	udev_version.h
 
 # override this to make udev look in a different location for it's config files
 prefix =
@@ -60,132 +116,77 @@ exec_prefix =	${prefix}
 etcdir =	${prefix}/etc
 sbindir =	${exec_prefix}/sbin
 usrbindir =	${exec_prefix}/usr/bin
+usrsbindir =	${exec_prefix}/usr/sbin
 mandir =	${prefix}/usr/share/man
-hotplugdir =	${etcdir}/hotplug.d/default
 configdir =	${etcdir}/udev
-initdir = 	${etcdir}/init.d
-dev_ddir =	${etcdir}/dev.d
-srcdir = .
+udevdir =	/dev
+udevdb =	${udevdir}/.udevdb
+LOCAL_CFG_DIR =	etc/udev
+KERNEL_DIR =	/lib/modules/${shell uname -r}/build
+DESTDIR =
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-
-# place to put our device nodes
-udevdir =	${prefix}/udev
-udevdb =	${udevdir}/.udevdb
-
-# 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.
-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
+CROSS =
 CC = $(CROSS)gcc
 LD = $(CROSS)gcc
 AR = $(CROSS)ar
-STRIP = $(CROSS)strip
 RANLIB = $(CROSS)ranlib
 HOSTCC = gcc
-
-export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS
-
-# code taken from uClibc to determine the current arch
-ARCH := ${shell $(CC) -dumpmachine | sed -e s'/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
-	-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 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 )
-
-# use '-Os' optimization if available, else use -O2
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
-		then echo "-Os"; else echo "-O2" ; fi}
+STRIP = $(CROSS)strip
+STRIPCMD = $(STRIP) -s
 
 # check if compiler option is supported
-cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
-
-CFLAGS		+= -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
-CFLAGS		+= $(call cc-supports,-Wno-pointer-sign)
-CFLAGS		+= $(call cc-supports,-Wdeclaration-after-statement)
-CFLAGS		+= -pipe
-CFLAGS		+= -D_GNU_SOURCE
-
-HEADERS = \
-	udev.h			\
-	udev_utils.h		\
-	udev_rules.h		\
-	udev_version.h		\
-	udev_db.h		\
-	udev_sysfs.h		\
-	logging.h		\
-	udev_libc_wrapper.h	\
-	udev_selinux.h		\
-	list.h
-
-SYSFS_OBJS = \
-	libsysfs/sysfs_class.o	\
-	libsysfs/sysfs_device.o	\
-	libsysfs/sysfs_dir.o	\
-	libsysfs/sysfs_driver.o	\
-	libsysfs/sysfs_utils.o	\
-	libsysfs/dlist.o
+cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;}
 
-UDEV_OBJS = \
-	udev_utils.o		\
-	udev_config.o		\
-	udev_add.o		\
-	udev_remove.o		\
-	udev_sysfs.o		\
-	udev_db.o		\
-	udev_multiplex.o	\
-	udev_rules.o		\
-	udev_rules_parse.o	\
-	udev_libc_wrapper.o
+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
+WARNINGS	+= $(call cc-supports, -Wdeclaration-after-statement, )
+CFLAGS		+= $(WARNINGS)
 
-OBJS = \
-	udev.a			\
-	libsysfs/sysfs.a
+LDFLAGS = -Wl,-warn-common
 
-SYSFS = $(PWD)/libsysfs/sysfs.a
+# use -Os optimization if available, else use -O2
+OPTFLAGS := $(call cc-supports, -Os, -O2)
+CFLAGS += $(OPTFLAGS)
 
-CFLAGS +=	-I$(PWD)/libsysfs/sysfs \
+# include our local copy of libsysfs
+CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
 		-I$(PWD)/libsysfs
 
 ifeq ($(strip $(USE_LOG)),true)
 	CFLAGS += -DUSE_LOG
 endif
 
-# if DEBUG is enabled, then we do not strip or optimize
+# if DEBUG is enabled, then we do not strip
 ifeq ($(strip $(DEBUG)),true)
-	CFLAGS  += -O1 -g -DDEBUG
-	LDFLAGS += -Wl
-	STRIPCMD = /bin/true -Since_we_are_debugging
-else
-	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer
-	LDFLAGS += -s -Wl
-	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+	CFLAGS  += -DDEBUG
+	STRIPCMD =
 endif
 
-# If we are using our version of klibc, then we need to build, link it, and then
-# link udev against it statically. Otherwise, use glibc and link dynamically.
+ifeq ($(strip $(USE_GCOV)),true)
+	CFLAGS += -fprofile-arcs -ftest-coverage
+	LDFLAGS += -fprofile-arcs
+endif
+
+# if our own version of klibc is used, we need to build it
 ifeq ($(strip $(USE_KLIBC)),true)
 	KLIBC_INSTALL	= $(PWD)/klibc/.install
-	KLCC		= $(KLIBC_INSTALL)/bin/klcc
+	KLCC		= $(KLIBC_INSTALL)/bin/$(CROSS)klcc
 	CC		= $(KLCC)
 	LD		= $(KLCC)
-	LDFLAGS		+= -static
-else
-	CFLAGS		+= -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
+	V = true
 endif
 
 ifeq ($(strip $(USE_SELINUX)),true)
 	UDEV_OBJS += udev_selinux.o
-	LIB_OBJS += -lselinux
+	LIB_OBJS += -lselinux -lsepol
 	CFLAGS += -DUSE_SELINUX
 endif
 
@@ -202,46 +203,64 @@ else
 	HOST_PROGS=
 endif
 
-# config files automatically generated
-GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
-
-all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
-	@extras="$(EXTRAS)" ; for target in $$extras ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) \
+all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) CC="$(CC)" \
+			CFLAGS="$(CFLAGS)" \
 			LD="$(LD)" \
-			SYSFS="$(SYSFS)" \
+			LDFLAGS="$(LDFLAGS)" \
+			STRIPCMD="$(STRIPCMD)" \
+			LIB_OBJS="$(LIB_OBJS)" \
+			LIBUDEV="$(PWD)/$(LIBUDEV)" \
+			LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
 			KERNEL_DIR="$(KERNEL_DIR)" \
 			QUIET="$(QUIET)" \
-			-C $$target $@ ; \
-	done ; \
+			-C $$target $@; \
+	done;
+.PHONY: all
+.DEFAULT: all
+
+# clear implicit rules
+.SUFFIXES:
+
+# build the objects
+%.o: %.c $(GEN_HEADERS)
+	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+
+# "Static Pattern Rule" to build all programs
+$(PROGRAMS): %: $(HOST_PROGS) $(KLCC) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o
+	$(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+ifneq ($(STRIPCMD),)
+	$(QUIET) $(STRIPCMD) $@
+endif
 
+# our own copy of klibc, it is not used if KLCC is given
 $(KLCC):
-	$(MAKE) -j1 -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
+	$(MAKE) -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
 			 SHLIBDIR=$(KLIBC_INSTALL)/lib \
 			 INSTALLDIR=$(KLIBC_INSTALL) \
 			 bindir=$(KLIBC_INSTALL)/bin \
 			 mandir=$(KLIBC_INSTALL)/man all install
-	-find $(KLIBC_INSTALL)/include -name SCCS -print| xargs rm -rf
+.NOTPARALLEL: $(KLCC)
 
-udev.a: $(UDEV_OBJS)
-	rm -f $@
+$(UDEV_OBJS): $(KLCC)
+$(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
+	@rm -f $@
 	$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
 	$(QUIET) $(RANLIB) $@
 
-libsysfs/sysfs.a: $(SYSFS_OBJS)
-	rm -f $@
+$(SYSFS_OBJS): $(KLCC)
+$(LIBSYSFS): $(HOST_PROGS) $(SYSFS_OBJS)
+	@rm -f $@
 	$(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
 	$(QUIET) $(RANLIB) $@
 
-# header files automatically generated
-GEN_HEADERS =	udev_version.h
-
-ccdv:
-	@echo "Building ccdv"
-	@$(HOSTCC) -O1 ccdv.c -o ccdv
+# generate config files
+$(GEN_CONFIGS):
+	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $@.in > $@
 
-# Rules on how to create the generated header files
+# generate config header file
 udev_version.h:
 	@echo "Creating udev_version.h"
 	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
@@ -250,122 +269,55 @@ udev_version.h:
 	@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_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
-	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
-
-# Rules on how to create the generated config files
-$(LOCAL_CFG_DIR)/udev.conf:
-	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(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 > $@
-
-$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(SYSFS_OBJS): $(HOST_PROGS) $(KLCC)
-$(OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-
-$(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
-	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(ROOT).o $(OBJS) $(LIB_OBJS)
-	$(QUIET) $(STRIPCMD) $@
-
-$(TESTER): $(KLCC) $(TESTER).o $(OBJS) $(HEADERS)
-	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(TESTER).o $(OBJS) $(LIB_OBJS)
-	$(QUIET) $(STRIPCMD) $@
+	@echo \#define UDEVD_BIN		\"$(sbindir)/udevd\" >> $@
 
-$(INFO): $(KLCC) $(INFO).o $(OBJS) $(HEADERS)
-	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(INFO).o $(OBJS) $(LIB_OBJS)
-	$(QUIET) $(STRIPCMD) $@
+# man pages
+%.8: docs/%.xml
+	xmlto man $?
+.PRECIOUS: %.8
 
-$(DAEMON): $(KLCC) $(DAEMON).o $(OBJS) udevd.h
-	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(DAEMON).o $(OBJS) $(LIB_OBJS)
-	$(QUIET) $(STRIPCMD) $@
-
-$(SENDER): $(KLCC) $(SENDER).o $(OBJS) udevd.h
-	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(SENDER).o $(OBJS) $(LIB_OBJS)
-	$(QUIET) $(STRIPCMD) $@
-
-$(STARTER): $(KLCC) $(STARTER).o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(STARTER).o $(OBJS) $(LIB_OBJS)
-	$(QUIET) $(STRIPCMD) $@
-
-.c.o:
-	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
+ccdv: ccdv.c
+	@$(HOSTCC) -O1 ccdv.c -o ccdv
+.SILENT: ccdv
 
 clean:
-	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
-	 | xargs rm -f 
-	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
-	 $(SENDER) $(TESTER) $(STARTER)
-	-rm -f ccdv
+	- find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print0 | xargs -0rt rm -f
+	- find -name "*.gcno" -print0 | xargs -0rt rm -f
+	- find -name "*.gcda" -print0 | xargs -0rt rm -f
+	- find -name "*.gcov" -print0 | xargs -0rt rm -f
+	- rm -f udev_gcov.txt
+	- rm -f core $(PROGRAMS) $(GEN_HEADERS) $(GEN_CONFIGS)
+	- rm -f udev-$(VERSION).tar.gz
 	$(MAKE) -C klibc SUBDIRS=klibc clean
-	@extras="$(EXTRAS)" ; for target in $$extras ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-			-C $$target $@ ; \
-	done ; \
-
-spotless: clean
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) -C $$target $@; \
+	done;
 	$(MAKE) -C klibc SUBDIRS=klibc spotless
 	rm -rf klibc/.install
+.PHONY: clean
+
+release:
+	git-tar-tree HEAD udev-$(VERSION) | gzip -9v > udev-$(VERSION).tar.gz
+	@echo "udev-$(VERSION).tar.gz created"
+.PHONY: release
 
-DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz" -e "\/\." -e releases -e BitKeeper -e SCCS -e test/sys | sort )
-DISTDIR := $(RELEASE_NAME)
-srcdir = .
-release: spotless
-	-rm -rf $(DISTDIR)
-	mkdir $(DISTDIR)
-	chmod 777 $(DISTDIR)
-	bk export -w $(DISTDIR)
-	tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
-	rm -rf $(DISTDIR)
-	@echo "$(RELEASE_NAME).tar.gz created"
-
-
-small_release: $(DISTFILES) spotless
-#	@echo $(DISTFILES)
-	@-rm -rf $(DISTDIR)
-	@mkdir $(DISTDIR)
-	@-chmod 777 $(DISTDIR)
-	@for file in $(DISTFILES); do			\
-		if test -d $$file; then			\
-		  	mkdir $(DISTDIR)/$$file;	\
-		else					\
-			cp -p $$file $(DISTDIR)/$$file;	\
-		fi;					\
-	done
-	@tar -c $(DISTDIR) | gzip -9 > $(RELEASE_NAME).tar.gz
-	@rm -rf $(DISTDIR)
-	@echo "Built $(RELEASE_NAME).tar.gz"
-
-install-config:
+install-config: $(GEN_CONFIGS)
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.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)/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; \
+		echo; \
+		echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
+		echo; \
 	fi
-
-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)
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) -C $$target $@; \
+	done;
+.PHONY: install-config
 
 install-man:
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
@@ -373,57 +325,106 @@ install-man:
 	$(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
+	$(INSTALL_DATA) -D udevsend.8 $(DESTDIR)$(mandir)/man8/udevsend.8
+	$(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
+	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) -C $$target $@; \
+	done;
+.PHONY: install-man
 
 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-config install-man install-dev.d all
+	- rm -f $(DESTDIR)$(mandir)/man8/udev.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevinfo.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevtest.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevstart.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevd.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevmonitor.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevsend.8
+	- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) -C $$target $@; \
+	done;
+.PHONY: uninstall-man
+
+install-bin:
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
-	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
-	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
-	$(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)
-	$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
-	- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
+	$(INSTALL_PROGRAM) -D udev $(DESTDIR)$(sbindir)/udev
+	$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
+	$(INSTALL_PROGRAM) -D udevsend $(DESTDIR)$(sbindir)/udevsend
+	$(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol
+	$(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor
+	$(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo
+	$(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest
+	$(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) -C $$target $@; \
+	done;
 ifndef DESTDIR
-	- killall $(DAEMON)
+	- killall udevd
 	- rm -rf $(udevdb)
+	- $(sbindir)/udevd --daemon
 endif
-	@extras="$(EXTRAS)" ; for target in $$extras ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-			-C $$target $@ ; \
-	done ; \
-
-uninstall: uninstall-man uninstall-dev.d
-	- rm $(hotplugdir)/10-udev.hotplug
-	- rm $(configdir)/rules.d/50-udev.rules
-	- rm $(configdir)/udev.conf
-	- rmdir $(configdir)/rules.d
-	- rmdir $(configdir)
-	- rm $(sbindir)/$(ROOT)
-	- rm $(sbindir)/$(DAEMON)
-	- rm $(sbindir)/$(SENDER)
-	- rm $(sbindir)/$(STARTER)
-	- rm $(usrbindir)/$(INFO)
-	- rm $(usrbindir)/$(TESTER)
-	- rmdir $(hotplugdir)
+.PHONY: install-bin
+
+uninstall-bin:
+	- rm -f $(DESTDIR)$(sbindir)/udev
+	- rm -f $(DESTDIR)$(sbindir)/udevd
+	- rm -f $(DESTDIR)$(sbindir)/udevsend
+	- rm -f $(DESTDIR)$(sbindir)/udeveventrecoreder
+	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
+	- rm -f $(DESTDIR)$(sbindir)/udevstart
+	- rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
+	- rm -f $(usrbindir)/udevinfo
+	- rm -f $(DESTDIR)$(DESTDIR)$(usrbindir)/udevtest
+ifndef DESTDIR
+	- killall udevd
 	- rm -rf $(udevdb)
-	- rmdir $(udevdir)
-	- killall $(DAEMON)
-	@extras="$(EXTRAS)" ; for target in $$extras ; do \
-		echo $$target ; \
-		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-			-C $$target $@ ; \
-	done ; \
-
-test: all
+endif
+	@extras="$(EXTRAS)"; for target in $$extras; do \
+		echo $$target; \
+		$(MAKE) -C $$target $@; \
+	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
+	@ cd test && ./udevstart-test.pl
+.PHONY: test tests
+
+buildtest:
+	./test/simple-build-check.sh
+.PHONY: buildtest
+
+gcov-all:
+	$(MAKE) clean all STRIPCMD= 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"
+