From de79ce38a546cb7ba5854f78d0da4e212f8f9e30 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Thu, 14 May 2009 00:06:59 +0000 Subject: [PATCH] Try to figure out if we are using gcc 4 and get rid of the stupid warning, while not breaking 3.x and 2.x... --- GNUmakefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4a784177..c96caf01 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.98 2009-05-13 23:43:27 nicm Exp $ +# $Id: GNUmakefile,v 1.99 2009-05-14 00:06:59 nicm Exp $ .PHONY: clean @@ -8,10 +8,17 @@ FDEBUG= 1 CC?= gcc CFLAGS+= -DBUILD="\"$(VERSION)\"" -CPPFLAGS:= -I. -I- $(CPPFLAGS) LDFLAGS+= -L/usr/local/lib LIBS+= -lncurses +# This sort of sucks but gets rid of the stupid warning and should work on +# most platforms... +ifeq ($(shell ($(CC) -v 2>&1|awk '/gcc version 4/ { print $0 }') || true), ) +CPPFLAGS:= -I. -I- $(CPPFLAGS) +else +CPPFLAGS:= -iquote. $(CPPFLAGS) +endif + ifdef FDEBUG LDFLAGS+= -rdynamic CFLAGS+= -g -ggdb -DDEBUG