X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=Makefile;h=42ebbd59caca045940666ede5f5396a780292cf5;hp=4726f04c344629cd7dea2626de03e74dd28b196e;hb=97ef96dd318b684d829ac950403582788df427d8;hpb=651274dc0845b6f1a5922268b479ab1c9b41c0e6

diff --git a/Makefile b/Makefile
index 4726f04..42ebbd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,16 @@
 
-TARGETS= minimise primer view lumpy.cfm sgtatham.cfm
+
+VIEWDIMS=33 44 55
+TARGETS= minimise primer lumpy.cfm sgtatham.cfm ring.cfm \
+	interpolate-44 \
+	$(addprefix view-, $(VIEWDIMS))
+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
@@ -14,7 +19,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
@@ -23,15 +28,35 @@ primer:		primer.o common.o
 prime.data:	primer
 		./$^ $o
 
-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
 		./$^ -o$@
 
+ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
+		./$^ -o$@
+
+view-%:		view+%.o mgraph+%.o common.o
+		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+
+interpolate-%:	interpolate+%.o mgraph+%.o common.o
+		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+
+# this ridiculous repetition is due to make being too lame
+
+view+%.o: view.c
+		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+
+mgraph+%.o: mgraph.c
+		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+
+interpolate+%.o: interpolate.c
+		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+
+.PRECIOUS: view+%.o mgraph+%.o interpolate+%.o
+
 clean:
 		rm -f prime.data $(TARGETS)
 		rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
@@ -40,4 +65,6 @@ clean:
 realclean:	clean
 		rm -f best
 
+%.d:
+
 -include *.d