X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile;h=12f1eee73edbf688c5a3ca3c1f86e273813191d4;hb=5d7d80c871a0e44729c520e76063369482316636;hp=39d43e33335776d784072e59c2454239122e5099;hpb=512fa4d69efa3f71c61a581c137ee6da2a9bf2f9;p=moebius2.git

diff --git a/Makefile b/Makefile
index 39d43e3..12f1eee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 
 TARGETS= minimise primer initial view
 
-CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror
+CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
+CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
 OPTIMISE=	-O2
-CFLAGS=		$(CWARNS) -MMD $(OPTIMISE) -g
-CXXFLAGS=	$(CWARNS) -MMD $(OPTIMISE) -g
+CFLAGS=		-MMD $(OPTIMISE) -g $(CWARNS)
+CXXFLAGS=	-MMD $(OPTIMISE) -g $(CXXWARNS)
 
 LIBGSL= -lgsl -lgslcblas
 
@@ -24,7 +25,7 @@ initial:	generator primer sgtatham/z.typescript
 		./$^ -o$@
 
 clean:
-		rm -f *.o $(TARGETS) *.new *.tmp
+		rm -f *.o $(TARGETS) *.new *.tmp *.rej *.orig
 		rm -f initial
 		rm -f *.d