make ring.cfm

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 12f1eee73edbf688c5a3ca3c1f86e273813191d4..3bb3ef9e1075276ac985ea1cf3e2f8a79a0a9691 100644 (file)
--- 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
@@ -10,6 +10,8 @@ CXXFLAGS=     -MMD $(OPTIMISE) -g $(CXXWARNS)
 
 LIBGSL= -lgsl -lgslcblas
 
+o= >$@.new && mv -f $@.new $@
+
 all:           $(TARGETS)
 
 minimise:      energy.o bgl.o common.o mgraph.o
@@ -18,15 +20,24 @@ minimise:   energy.o bgl.o common.o mgraph.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
 
-initial:       generator primer sgtatham/z.typescript
+sgtatham.cfm:  sgtatham-regenerator prime.data sgtatham/z.typescript
+               ./$^ -T -o$@
+
+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
-               rm -f initial
+               rm -f prime.data $(TARGETS)
+               rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
                rm -f *.d
 
 realclean:     clean