-TARGETS= minimise primer initial view
-CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror
+VIEWDIMS=33 64 125 246
+TARGETS= minimise primer lumpy.cfm sgtatham.cfm ring.cfm \
+ interpolate-64 interpolate-125 interpolate-246 \
+ $(addprefix view-, $(VIEWDIMS))
+SGTATHAM=sgtatham
+
+CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
+CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
OPTIMISE= -O2
-CFLAGS= $(CWARNS) -MMD $(OPTIMISE) -g
-CXXFLAGS= $(CWARNS) -MMD $(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
+compute: best.CFM
+
+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)
-view: view.o common.o mgraph.o
- $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+prime.data: primer
+ ./$^ $o
+
+
+sgtatham.cfm: sgtatham-regenerator prime.data $(SGTATHAM)/z.typescript
+ ./$^ -T -o$@
+
+lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
+ ./$^ -o$@
-initial: generator primer sgtatham/z.typescript
+ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
./$^ -o$@
+best.CFM:
+ ./minimise sgtatham.cfm -iwip.cfm -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)
+
+minimise-%: energy+%.o graph+%.o mgraph+%.o minimise+%.o half+%.o common.o
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
+
+define interpolate
+dense-$1.cfm: interpolate-$1 $2
+ ./$$< <$2 $$o
+endef
+
+$(eval $(call interpolate,64, best.CFM))
+$(eval $(call interpolate,125, dense-64.cfm, dense-64.cfm))
+
+# this ridiculous repetition is due to make being too lame
+
+view+%.o: view.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+mgraph+%.o: mgraph.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+minimise+%.o: minimise.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+graph+%.o: graph.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+energy+%.o: energy.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+half+%.o: half.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+interpolate+%.o: interpolate.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+.PRECIOUS: view+%.o mgraph+%.o interpolate+%.o
+
clean:
- rm -f *.o $(TARGETS) *.new *.tmp
- rm -f initial
- rm -f *.d
+ rm -f prime.data $(TARGETS)
+ rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
+ rm -f *.d *.cfm
realclean: clean
- rm -f best
+ rm -f *.CFM
+
+%.d:
-include *.d