X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=Makefile;h=9b8d469e1fce744bfaee6a7a5bdb29ec93be224d;hp=cf0bbd08caf158a7b6a07ac262cf90c23e213f93;hb=643eca14b9d7b6f9bfab24030cec1ccfd4df8ff0;hpb=4e53c82487592a5a490e3ac6daaae979e9812338

diff --git a/Makefile b/Makefile
index cf0bbd0..9b8d469 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,47 @@
 
-TARGETS= minimise primer initial project
+TARGETS= minimise primer view lumpy.cfm sgtatham.cfm ring.cfm
+SGTATHAM=sgtatham
 
-CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror
+CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
+CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
 OPTIMISE=	-O2
-CFLAGS=		$(CWARNS) $(OPTIMISE) -g
-CXXFLAGS=	$(CWARNS) $(OPTIMISE) -g
+CFLAGS=		-MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
+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)
 
-project:	project.o common.o mgraph.o
+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
-		rm -f best initial
+		rm -f prime.data $(TARGETS)
+		rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
+		rm -f *.d
+
+realclean:	clean
+		rm -f best
 
-%.o::		common.h mgraph.h bgl.h
+-include *.d