best interpolation so far

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index a2409fc4aa49f6128509671b81e526400cc7f94d..ecccd72524fcd94b895bfd509ddc5e4ccd7da876 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 
 
-VIEWDIMS=33 44 55
+VIEWDIMS=33 64 125
 TARGETS= minimise primer lumpy.cfm sgtatham.cfm ring.cfm \
-       interpolate-44 \
+       interpolate-64 \
        $(addprefix view-, $(VIEWDIMS))
 SGTATHAM=sgtatham
 
@@ -40,8 +40,8 @@ lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
 ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
                ./$^ -o$@
 
-best.CFM:      minimise sgtatham.cfm
-               ./$^ -iwip.cfm -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
@@ -49,16 +49,24 @@ view-%:             view+%.o mgraph+%.o common.o
 interpolate-%: interpolate+%.o mgraph+%.o common.o
                $(CC) $(CFLAGS) -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) -DDEFBITS=$* $< -o $@
+               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
 
 mgraph+%.o: mgraph.c
-               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
 
 interpolate+%.o: interpolate.c
-               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
 
 .PRECIOUS: view+%.o mgraph+%.o interpolate+%.o