X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=1c0fda3e0e3ef71f69e1c9a584d64580f562f099;hp=c4311ddc19b3427ac81b9c67aca41f2dbf98d780;hb=14e1e49484401d573eac1a99002242dbf7c072f0;hpb=25b5bb4245824ac0ba90fa04e3baaa39011d7528

diff --git a/Makefile b/Makefile
index c4311ddc1..1c0fda3e0 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 110
+VERSION = 114
 
 # 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,16 +219,12 @@ 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;
 .PHONY: clean
 
-release:
-	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: release
-
 install-config:
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
 	@ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
@@ -324,7 +319,8 @@ buildtest:
 	test/simple-build-check.sh
 .PHONY: buildtest
 
-ChangeLog: Makefile
+ChangeLog:
+	head -1 $@ | grep -q "to v$(shell echo $$(($(VERSION) - 1)))"
 	@ mv $@ $@.tmp
 	@ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@
 	@ echo "============================================" >> $@
@@ -334,6 +330,30 @@ ChangeLog: Makefile
 	@ cat $@
 	@ cat $@.tmp >> $@
 	@ rm $@.tmp
+	head -1 $@ | grep -q "to v$(VERSION)"
+.PHONY: ChangeLog
+.PRECIOUS: ChangeLog
+
+release:
+	$(Q) - rm -f udev-$(VERSION).tar.gz
+	$(Q) - rm -f udev-$(VERSION).tar.bz2
+	head -1 ChangeLog | grep -q "to v$(VERSION)"
+	head -1 RELEASE-NOTES | grep -q "udev $(VERSION)"
+	git commit -a -m "release $(VERSION)"
+	cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
+	@ echo
+	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: 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