interpolate and various sizes build

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 9c82be7b10a0e3dc4eff139e1a01b0ade6d3fe8f..42ebbd59caca045940666ede5f5396a780292cf5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@
 
 VIEWDIMS=33 44 55
 TARGETS= minimise primer lumpy.cfm sgtatham.cfm ring.cfm \
 
 VIEWDIMS=33 44 55
 TARGETS= minimise primer lumpy.cfm sgtatham.cfm ring.cfm \

-       $(addprefix view+, $(VIEWDIMS))
+       interpolate-44 \
+       $(addprefix view-, $(VIEWDIMS))

 SGTATHAM=sgtatham
 
 CWARNS=        -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 SGTATHAM=sgtatham
 
 CWARNS=        -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow


@@ -37,20 +38,24 @@ lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
 ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
                ./$^ -o$@
 
 ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
                ./$^ -o$@
 

+view-%:                view+%.o mgraph+%.o common.o
+               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11

 
 

-# this ridiculous repetition is due to make being too lame
+interpolate-%: interpolate+%.o mgraph+%.o common.o
+               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)

 
 

-view+%:                view+%.o mgraph+%.o common.o
-               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+# this ridiculous repetition is due to make being too lame

 
 

-view+%.o:      view.c
+view+%.o: view.c

                $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
 
                $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
 

-mgraph+%.o:    mgraph.c
+mgraph+%.o: mgraph.c

                $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
 
                $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
 

-.PRECIOUS: view+%.o mgraph+%.o
+interpolate+%.o: interpolate.c
+               $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@

 
 

+.PRECIOUS: view+%.o mgraph+%.o interpolate+%.o

 
 clean:
                rm -f prime.data $(TARGETS)
 
 clean:
                rm -f prime.data $(TARGETS)


@@ -60,4 +65,6 @@ clean:
 realclean:     clean
                rm -f best
 
 realclean:     clean
                rm -f best
 

+%.d:
+

 -include *.d
 -include *.d