minor improvements

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index c40fb3285be394a1b0c70a874699bbdb4d4d2254..15e4ae0f1eb983d28c66d84fe104baf35b875ca8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 
-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
+CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
 OPTIMISE=      -O2
 CFLAGS=                -MMD $(OPTIMISE) -g $(CWARNS)
@@ -10,23 +10,34 @@ CXXFLAGS=   -MMD $(OPTIMISE) -g $(CXXWARNS)
 
 LIBGSL= -lgsl -lgslcblas
 
+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 minimise.o half.o
                $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
 
 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