X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile;h=e1a54dd723204884cda7c5f36ae03ac2d2747156;hb=2377b968f55ddd5d6a8ff79ee9150316a218afc8;hp=a4b09dca05faae63cfd27247437570fe023b4d90;hpb=04d38304c34c5cac06e7fed4c20e3fe108330b7b;p=moebius2.git

diff --git a/Makefile b/Makefile
index a4b09dc..e1a54dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-TARGETS= minimise primer initial view
+TARGETS= minimise primer view lumpy.cfm sgtatham.cfm ring.cfm
 
 CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
@@ -14,27 +14,30 @@ o= >$@.new && mv -f $@.new $@
 
 all:		$(TARGETS)
 
-minimise:	energy.o bgl.o common.o mgraph.o
+minimise:	energy.o graph.o common.o mgraph.o
 		$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
 
-prime:		primer
-		./$^ $o
-
 primer:		primer.o common.o
 		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
+prime.data:	primer
+		./$^ $o
+
 view:		view.o common.o mgraph.o
 		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
 
-sgtatham:	generator prime sgtatham/z.typescript
+sgtatham.cfm:	sgtatham-regenerator prime.data sgtatham/z.typescript
 		./$^ -T -o$@
 
-lumpy:		approxmodel prime ../moebius/ins-new ../moebius/a.out
+lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
+		./$^ -o$@
+
+ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
 		./$^ -o$@
 
 clean:
-		rm -f *.o $(TARGETS) *.new *.tmp *.rej *.orig core vgcore.*
-		rm -f initial
+		rm -f prime.data $(TARGETS)
+		rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
 		rm -f *.d
 
 realclean:	clean