X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=e2c7e4298829ab4dae7c11e82892ffdcc43d870c;hb=5ba7d3d603a63b7e2909c40a1e33d365024ba6b0;hp=f53e7ca2fdc1f6b52681366670686c27c5cca80d;hpb=e9b2679f420b77f1ea49fc3cd8a746072fe66854;p=elogind.git

diff --git a/Makefile b/Makefile
index f53e7ca2f..e2c7e4298 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,9 @@ ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
 HELPER =	udevinfo
-VERSION =	016_bk
+TESTER =	udevtest
+STARTER =	udevstart
+VERSION =	019_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -72,6 +74,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.
@@ -168,7 +173,7 @@ endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(SENDER) $(DAEMON) $(HELPER)
+all: $(ROOT) $(SENDER) $(DAEMON) $(HELPER) $(TESTER) $(STARTER)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) \
@@ -178,8 +183,6 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(HELPER)
 			-C $$target $@ ; \
 	done ; \
 
-$(ROOT): $(LIBC)
-
 $(ARCH_LIB_OBJS) : $(CRT0)
 
 $(CRT0):
@@ -225,6 +228,14 @@ ifeq ($(USE_DBUS), true)
 	OBJS += udev_dbus.o
 endif
 
+# if USE_SELINUX is enabled, then we do not strip or optimize
+ifeq ($(strip $(USE_SELINUX)),true)
+	CFLAGS  += -DUSE_SELINUX
+	OBJS += udev_selinux.o
+	LIB_OBJS += -lselinux
+endif
+
+
 # header files automatically generated
 GEN_HEADERS =	udev_version.h
 
@@ -250,28 +261,41 @@ $(LOCAL_CFG_DIR)/udev.conf:
 
 
 $(OBJS): $(GEN_HEADERS)
-udev.o: $(GEN_HEADERS)
-
-$(ROOT): udev.o $(OBJS) $(HEADERS) $(GEN_HEADERS)
+$(ROOT).o: $(GEN_HEADERS)
+$(TESTER).o: $(GEN_HEADERS)
+$(HELPER).o: $(GEN_HEADERS)
+$(DAEMON).o: $(GEN_HEADERS)
+$(SENDER).o: $(GEN_HEADERS)
+$(STARTER).o: $(GEN_HEADERS)
+
+$(ROOT): $(ROOT).o $(OBJS) $(HEADERS) $(LIBC)
 	$(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
-$(HELPER): $(HEADERS) udevinfo.o $(OBJS)
+$(TESTER): $(TESTER).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
+
+$(HELPER): $(HELPER).o $(OBJS) $(HEADERS) $(LIBC)
 	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
-$(DAEMON): udevd.h $(GEN_HEADERS) udevd.o
+$(DAEMON): $(DAEMON).o udevd.h $(LIBC)
 	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
-$(SENDER): udevd.h $(GEN_HEADERS) udevsend.o
+$(SENDER): $(SENDER).o udevd.h $(LIBC)
 	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
+$(STARTER): $(STARTER).o $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevstart.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(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) $(HELPER) $(DAEMON) $(SENDER) $(TESTER) $(STARTER)
 	$(MAKE) -C klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -345,6 +369,7 @@ install: install-config install-dbus-policy all
 	$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
 	$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
 	$(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
+	$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(sbindir)/$(TESTER)
 	@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; \
@@ -353,8 +378,13 @@ install: install-config install-dbus-policy all
 	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)/$(ROOT).hotplug
+	$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
 	- 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)" \
@@ -375,6 +405,7 @@ uninstall: uninstall-dbus-policy
 	- rm $(sbindir)/$(HELPER)
 	- rmdir $(hotplugdir)
 	- rmdir $(configdir)
+	- rm $(udevdir)/.udev.tdb
 	- rmdir $(udevdir)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \