-TARGETS= minimise primer view lumpy.cfm sgtatham.cfm ring.cfm
+
+VIEWDIMS=33 44 55
+TARGETS= minimise primer lumpy.cfm sgtatham.cfm ring.cfm \
+ $(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
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
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
ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
./$^ -o$@
+
+# this ridiculous repetition is due to make being too lame
+
+view+%: view+%.o mgraph+%.o common.o
+ $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+
+view+%.o: view.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+
+mgraph+%.o: mgraph.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+
+.PRECIOUS: view+%.o mgraph+%.o
+
+
clean:
rm -f prime.data $(TARGETS)
rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~