allow C99 statements

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index d4ee3eb6be1401fb26b23cb4284fdb36b88af1fc..774d5e154a9cdf2a11268c2dca8f9655de3c4cd1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 076
+VERSION = 077
 
 # set this to make use of syslog
 USE_LOG = true
@@ -133,20 +133,15 @@ HOSTCC = gcc
 STRIP = $(CROSS)strip
 STRIPCMD = $(STRIP) -s
 
-# check if compiler option is supported
-cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;}
-
 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
-WARNINGS       += $(call cc-supports, -Wdeclaration-after-statement, )
 CFLAGS         += $(WARNINGS)
 
 LDFLAGS = -Wl,-warn-common
 
-# use -Os optimization if available, else use -O2
-OPTFLAGS := $(call cc-supports, -Os, -O2)
+OPTFLAGS = -Os
 CFLAGS += $(OPTFLAGS)
 
 # include our local copy of libsysfs
@@ -382,9 +377,10 @@ buildtest:
 
 ChangeLog: Makefile
        @ mv $@ $@.tmp
-       @ echo "Summary of changes from v$(VERSION) to v$(shell printf '%03i' $$(expr $(VERSION) + 1))" >> $@
+       @ echo "Summary of changes from v$(shell printf '%03i' $$(expr $(VERSION) - 1)) to v$(VERSION)" >> $@
        @ echo "============================================" >> $@
-       @ git log --pretty=short $(VERSION)..HEAD | git shortlog  >> $@
+       @ echo >> $@
+       @ git log --pretty=short $(shell printf '%03i' $$(expr $(VERSION) - 1))..HEAD | git shortlog  >> $@
        @ echo >> $@
        @ cat $@
        @ cat $@.tmp >> $@