[PATCH] Makefile: add some more warnings and prepare for clean gcc4 compile

diff --git a/Makefile b/Makefile
index 052e41acc3f87deea2e0b81a6cdb42eb31fe5796..dc907f6a81e55e9738402d431495ceca9c5fab10 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,8 +108,12 @@ GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
 OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
                then echo "-Os"; else echo "-O2" ; fi}
 
-# add -Wredundant-decls when libsysfs gets cleaned up
-WARNINGS := -Wall 
+# 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)"; fi;}
+
+WARNINGS := -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith -Wstrict-prototypes -Wsign-compare
+WARNINGS += $(call cc-supports,-Wno-pointer-sign)
+WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)
 
 CFLAGS := -pipe
 

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index f0c15b8fecd4a50090519bccbe3792b8ca298b0e..d273ed795c879655aa1b460df0b5fa12d5b7d1eb 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,9 +28,6 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts \
-                -Wpointer-arith -Wcast-align -Wsign-compare
-
 override CFLAGS+=-D_FILE_OFFSET_BITS=64
 
 VOLUME_ID_OBJS=                                        \