X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile;h=15e4ae0f1eb983d28c66d84fe104baf35b875ca8;hb=abb4c2044743cd5cb2da0675b263388461a64de9;hp=4726f04c344629cd7dea2626de03e74dd28b196e;hpb=651274dc0845b6f1a5922268b479ab1c9b41c0e6;p=moebius2.git diff --git a/Makefile b/Makefile index 4726f04..15e4ae0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -TARGETS= minimise primer view lumpy.cfm sgtatham.cfm +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,7 +14,7 @@ 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 @@ -32,6 +32,9 @@ sgtatham.cfm: sgtatham-regenerator prime.data sgtatham/z.typescript 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 prime.data $(TARGETS) rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~