X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=af7486da4c0eed0e80cd6e0938b21495db05d6cc;hb=3a831ca9695bf1befddb9d73c5cc8cdb34b6e92e;hp=15e4ae0f1eb983d28c66d84fe104baf35b875ca8;hpb=abb4c2044743cd5cb2da0675b263388461a64de9;p=moebius2.git

diff --git a/Makefile b/Makefile
index 15e4ae0..af7486d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 
 TARGETS= minimise primer view lumpy.cfm sgtatham.cfm ring.cfm
+SGTATHAM=sgtatham
 
 CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
 OPTIMISE=	-O2
-CFLAGS=		-MMD $(OPTIMISE) -g $(CWARNS)
+CFLAGS=		-MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=	-MMD $(OPTIMISE) -g $(CXXWARNS)
 
 LIBGSL= -lgsl -lgslcblas
@@ -26,7 +27,7 @@ prime.data:	primer
 view:		view.o common.o mgraph.o
 		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
 
-sgtatham.cfm:	sgtatham-regenerator prime.data 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
@@ -42,5 +43,6 @@ clean:
 
 realclean:	clean
 		rm -f best
+		rm -rf dim,*
 
 -include *.d