X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=2e5dd5d9cbde20318805330bddb163ea7eea4568;hp=97d20b2146a16142dcde798d42763d4be7600cee;hb=9530f1fe19529e1acb31adf5a834fa6cb0a27e6a;hpb=21c0367349371affa33e8752083948bac6b0a7cd

diff --git a/Makefile b/Makefile
index 97d20b214..2e5dd5d9c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,16 +17,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-# Set this to make use of syslog
+# Set this to make use of syslog.
 USE_LOG = true
 
-# Set this to ad development debug messages
+# 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.
 DEBUG = false
 
 # Set this to include Security-Enhanced Linux support.
 USE_SELINUX = false
 
-# Set this to comile with the local version of klibc instead of glibc.
+# Set this to comile with klibc instead of glibc.
 USE_KLIBC = false
 
 # Set this to create statically linked binaries.
@@ -45,11 +47,10 @@ SENDER =	udevsend
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
-VERSION =	055
+VERSION =	057
 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
 
@@ -216,7 +217,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(K
 	done ; \
 
 $(KLCC):
-	$(MAKE) -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
+	$(MAKE) -j1 -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
 			 SHLIBDIR=$(KLIBC_INSTALL)/lib \
 			 INSTALLDIR=$(KLIBC_INSTALL) \
 			 bindir=$(KLIBC_INSTALL)/bin \
@@ -249,7 +250,6 @@ 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_LOG_DEFAULT 	\"yes\" >> $@
 	@echo \#define UDEV_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
 	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
 
@@ -263,15 +263,15 @@ GEN_MANPAGESIN = udev.8.in
 $(GEN_MANPAGES): $(GEN_MANPAGESIN)
 	sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
-$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS)
-$(SYSFS_OBJS): $(HOST_PROGS)
-$(OBJS): $(GEN_HEADERS) $(HOST_PROGS)
-$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS)
-$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS)
+$(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)
@@ -427,3 +427,4 @@ uninstall: uninstall-man uninstall-dev.d
 
 test: all
 	@ cd test && ./udev-test.pl
+	@ cd test && ./udevstart-test.pl