interpolation more flexible

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 4726f04c344629cd7dea2626de03e74dd28b196e..bb869a1843a295b716b4cf064a1ee2eb899be425 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,16 @@
 
-TARGETS= minimise primer view lumpy.cfm sgtatham.cfm
+
+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=                -MMD $(OPTIMISE) -g $(CWARNS)
+CFLAGS=                -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=      -MMD $(OPTIMISE) -g $(CXXWARNS)
 
 LIBGSL= -lgsl -lgslcblas
@@ -14,7 +19,9 @@ 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
@@ -23,21 +30,69 @@ 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$@
+
+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 prime.data $(TARGETS)
                rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
-               rm -f *.d
+               rm -f *.d *.cfm
 
 realclean:     clean
-               rm -f best
+               rm -f *.CFM
+
+%.d:
 
 -include *.d