ports to new c++ in lenny

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 39d43e33335776d784072e59c2454239122e5099..12f1eee73edbf688c5a3ca3c1f86e273813191d4 100644 (file)
--- 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