X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=39ffc7dd0e853b6657474bc484b91e89afe10b86;hb=07acdb0f7413eeb261bdb52eba6abe75371cc202;hp=1571e8232666ed9664badb102af94aac7e315136;hpb=de96652486539a47cc687116a34515e2a54ff8cd;p=elogind.git

diff --git a/Makefile b/Makefile
index 1571e8232..39ffc7dd0 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 113
+VERSION = 115
 
 # set this to make use of syslog
 USE_LOG = true
@@ -73,7 +73,6 @@ UDEV_OBJS = \
 	udev_utils.o			\
 	udev_utils_string.o		\
 	udev_utils_file.o		\
-	udev_utils_run.o		\
 	udev_sysdeps.o
 LIBUDEV = libudev.a
 
@@ -119,7 +118,7 @@ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
 CFLAGS		+= $(WARNINGS)
 
-LDFLAGS += -Wl,-warn-common
+LDFLAGS += -Wl,-warn-common,--as-needed
 
 OPTFLAGS = -Os
 CFLAGS += $(OPTFLAGS)
@@ -220,6 +219,7 @@ clean:
 	$(Q) - rm -f core $(PROGRAMS) $(GEN_HEADERS)
 	$(Q) - rm -f udev-$(VERSION).tar.gz
 	$(Q) - rm -f udev-$(VERSION).tar.bz2
+	$(Q) - rm -f udev-git-HEAD.patch
 	@ extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
@@ -230,11 +230,11 @@ install-config:
 	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
 	fi
-	@ if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
-		echo; \
-		echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
-		echo; \
-	fi
+	@ for i in $(shell ls -1 etc/udev/rules.d); do \
+		if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$i ]; then \
+			$(INSTALL_DATA) etc/udev/rules.d/$$i $(DESTDIR)$(configdir)/rules.d; \
+		fi \
+	done
 	@ extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \
 	done;
@@ -346,6 +346,15 @@ release:
 	git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2
 .PHONY: release
 
+dist:
+	git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | gzip -9v > udev-$(VERSION).tar.gz
+	git-archive --format=tar --prefix=udev-$(VERSION)/ HEAD | bzip2 -9v > udev-$(VERSION).tar.bz2
+.PHONY: dist
+
+patch:
+	git diff $(shell echo $$(($(VERSION) - 1))) HEAD > udev-git-HEAD.patch
+.PHONY: patch
+
 gcov-all:
 	$(MAKE) clean all USE_GCOV=true
 	@ echo