compiles and most output facets are right; needs debugging

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 8d3d188aa9093b58d779c92ad7d0245111c99182..b41c543b25f800691cda9c7b3c198b39a76faea8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,11 @@
 
-TARGETS= minimise primer view+33 view+44 lumpy.cfm sgtatham.cfm ring.cfm
+
+ALLDIMS=33 64 125 246 487 968
+TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
+       minimise-33 minimise-64 \
+       $(addprefix interpolate-, $(ALLDIMS)) \
+       $(addprefix view-, $(ALLDIMS)) \
+       $(addprefix output-, $(ALLDIMS))
 SGTATHAM=sgtatham
 
 CWARNS=        -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
@@ -15,6 +21,10 @@ o= >$@.new && mv -f $@.new $@
 
 all:           $(TARGETS)
 
+compute:       all
+               $(MAKE) best-33.CFM
+               $(MAKE) best-968.CFM
+
 minimise:      energy.o graph.o common.o mgraph.o minimise.o half.o
                $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
 
@@ -35,26 +45,73 @@ ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
                ./$^ -o$@
 
 
-# this ridiculous repetition is due to make being too lame
+best-33.CFM:
+               ./minimise-33 sgtatham.cfm -iwip-33.cfm -o$@
+
+start-64.cfm:  best-33.CFM
+               ./interpolate-64 -a4 $< -o$@
+
+best-64.CFM:
+               ./minimise-64 start-64.cfm -iwip-64.CFM -o$@
+
+define interpolate_aa
+best-$1.cfm:   interpolate-$1 $2
+               ./$$< -aa $2 -o$$@
+endef
 
-view+%:                view+%.o mgraph+%.o common.o
+$(eval $(call interpolate_aa,968, best-487.cfm))
+$(eval $(call interpolate_aa,487, best-246.cfm))
+$(eval $(call interpolate_aa,246, best-125.cfm))
+$(eval $(call interpolate_aa,125, best-64.CFM))
+
+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 $@
+output-%:      output+%.o mgraph+%.o common.o
+               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
 
-mgraph+%.o:    mgraph.c
-               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+interpolate-%: interpolate+%.o mgraph+%.o common.o
+               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
-.PRECIOUS: view+%.o mgraph+%.o
+minimise-%:    energy+%.o graph+%.o mgraph+%.o minimise+%.o half+%.o common.o
+               $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
 
+# this ridiculous repetition is due to make being too lame
+
+view+%.o: view.c
+               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+output+%.o: output.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 output+%.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