X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=dc3930b46b70cf8c4cde35d76f15bcdffbfa25ff;hb=e2bd03ff63789e0ffcc1955f15d9927f3ce87465;hp=9d9caec7f70f4e41c26b7c558980d50fa4bf7ba3;hpb=6b493a20e1dbf90a4e54d3be37027fa906220c31;p=elogind.git

diff --git a/Makefile b/Makefile
index 9d9caec7f..dc3930b46 100644
--- a/Makefile
+++ b/Makefile
@@ -47,11 +47,10 @@ SENDER =	udevsend
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
-VERSION =	056
+VERSION =	058
 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
 
@@ -218,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 \
@@ -264,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)
@@ -318,35 +317,10 @@ spotless: clean
 	$(MAKE) -C klibc SUBDIRS=klibc spotless
 	rm -rf klibc/.install
 
-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)
+	git-tar-tree HEAD $(RELEASE_NAME) | gzip -9v > $(RELEASE_NAME).tar.gz
 	@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) -d $(DESTDIR)$(configdir)/rules.d
 	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
@@ -428,3 +402,4 @@ uninstall: uninstall-man uninstall-dev.d
 
 test: all
 	@ cd test && ./udev-test.pl
+	@ cd test && ./udevstart-test.pl