From 51df9ee4965516b17dcd50647546ee970df87b32 Mon Sep 17 00:00:00 2001 From: "kay.sievers@vrfy.org" Date: Sat, 5 Feb 2005 02:44:37 +0100 Subject: [PATCH] [PATCH] Makefile: add some more warnings and prepare for clean gcc4 compile --- Makefile | 8 ++++++-- extras/volume_id/Makefile | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 052e41acc..dc907f6a8 100644 --- 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 f0c15b8fe..d273ed795 100644 --- 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= \ -- 2.30.2