X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=706c35af1f06b2e09142dfbee730d62a178a96e6;hb=f67c0e9702cec922ccd0d3149f48bc881b42222b;hp=927f45d1a8e60855abc87ebb43f1652cc1f26387;hpb=c9f085069bc4e555689dffedbfa08af250772f2a;p=moebius2.git

diff --git a/Makefile b/Makefile
index 927f45d..706c35a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 ALLDIMS=33 64 125 246 487 968
 TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
-	minimise-33 minimise-64 \
+	minimise-33 minimise-64 minimise-125 minimise-246 \
 	$(addprefix interpolate-, $(ALLDIMS)) \
 	$(addprefix view-, $(ALLDIMS)) \
 	$(addprefix output-, $(ALLDIMS))
@@ -11,7 +11,7 @@ SGTATHAM=sgtatham
 CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
-OPTIMISE=	-O2
+OPTIMISE=	-O3
 CFLAGS_UNIPROC=	-MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=	-MMD $(OPTIMISE) -g $(CXXWARNS)
 CFLAGS=		$(CFLAGS_UNIPROC) $(NPROCCFLAGS)
@@ -24,7 +24,8 @@ all:		$(TARGETS)
 
 compute:	all
 		$(MAKE) best-33.CFM
-		$(MAKE) best-968.CFM
+		$(MAKE) best-64.CFM
+#		$(MAKE) best-968.CFM
 
 minimise:	energy.o graph.o common.o mgraph.o minimise.o half.o
 		$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
@@ -120,10 +121,10 @@ interpolate+%.o: interpolate.c
 clean:
 		rm -f prime.data $(TARGETS)
 		rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
-		rm -f *.d *.cfm
+		rm -f *.d .alternately_*
 
 realclean:	clean
-		rm -f *.CFM
+		rm -f *.cfm *.CFM
 
 %.d: