-TARGETS=minimise
+TARGETS= minimise primer view lumpy.cfm sgtatham.cfm ring.cfm
-CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror
+CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
+CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
OPTIMISE= -O2
-CFLAGS= $(CWARNS) $(OPTIMISE) -g
-CXXFLAGS= $(CWARNS) $(OPTIMISE) -g
+CFLAGS= -MMD $(OPTIMISE) -g $(CWARNS)
+CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
+
+LIBGSL= -lgsl -lgslcblas
+
+o= >$@.new && mv -f $@.new $@
all: $(TARGETS)
-minimise: energy.o bgl.o common.o mgraph.o
- $(CXX) $(CXXFLAGS) -o $@ $^ -lgsl -lgslcblas
+minimise: energy.o graph.o common.o mgraph.o
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
+
+primer: primer.o common.o
+ $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+
+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
+ ./$^ -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$@
clean:
- rm -f *.o $(TARGETS) *.new
- rm -f best initial
+ rm -f prime.data $(TARGETS)
+ rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
+ rm -f *.d
+
+realclean: clean
+ rm -f best
+
+-include *.d