udevtrigger: allow to specify action string

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 29c2044906666531d9954c2504164d510b3bf066..1571e8232666ed9664badb102af94aac7e315136 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 105
+VERSION = 113
 
 # set this to make use of syslog
 USE_LOG = true
@@ -113,13 +113,13 @@ LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 RANLIB = $(CROSS_COMPILE)ranlib
 
-CFLAGS         = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS         += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 WARNINGS       = -Wstrict-prototypes -Wsign-compare -Wshadow \
                  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
                  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
 CFLAGS         += $(WARNINGS)
 
-LDFLAGS = -Wl,-warn-common
+LDFLAGS += -Wl,-warn-common
 
 OPTFLAGS = -Os
 CFLAGS += $(OPTFLAGS)
@@ -225,11 +225,6 @@ clean:
        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,21 @@ 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
 
 gcov-all:
        $(MAKE) clean all USE_GCOV=true