better machinery; before make view interpolate-compatible

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 42ebbd59caca045940666ede5f5396a780292cf5..a2409fc4aa49f6128509671b81e526400cc7f94d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@ o= >$@.new && mv -f $@.new $@
 
 all:           $(TARGETS)
 
+compute:       best.CFM
+
 minimise:      energy.o graph.o common.o mgraph.o minimise.o half.o
                $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
 
@@ -38,6 +40,9 @@ lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
 ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
                ./$^ -o$@
 
+best.CFM:      minimise sgtatham.cfm
+               ./$^ -iwip.cfm -o$@
+
 view-%:                view+%.o mgraph+%.o common.o
                $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
 
@@ -60,10 +65,10 @@ interpolate+%.o: interpolate.c
 clean:
                rm -f prime.data $(TARGETS)
                rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
-               rm -f *.d
+               rm -f *.d *.cfm
 
 realclean:     clean
-               rm -f best
+               rm -f *.CFM
 
 %.d: