X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=Makefile;h=fc74681e0e4b665f103753745e045dc5df7cd339;hp=d0e7f2e70cf70e28642d7f640cc7a1d1cc591da1;hb=f5fef8bc75d9d5658705763fa7c083ae75a501ba;hpb=79a8db502c53f3fe497267466ead8f47f7b65b45

diff --git a/Makefile b/Makefile
index d0e7f2e..fc74681 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-TARGETS=minimise
+TARGETS= minimise primer initial
 
 CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror
 
@@ -7,11 +7,21 @@ OPTIMISE=	-O2
 CFLAGS=		$(CWARNS) $(OPTIMISE) -g
 CXXFLAGS=	$(CWARNS) $(OPTIMISE) -g
 
+LIBGSL= -lgsl -lgslcblas
+
 all:		$(TARGETS)
 
 minimise:	energy.o bgl.o common.o mgraph.o
-		$(CXX) $(CXXFLAGS) -o $@ $^ -lgsl -lgslcblas
+		$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
+
+primer:		primer.o common.o
+		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+
+initial:	generator primer sgtatham/z.typescript
+		./$^ -o$@
 
 clean:
-		rm -f *.o $(TARGETS) *.new
+		rm -f *.o $(TARGETS) *.new *.tmp
 		rm -f best initial
+
+%.o::		common.h mgraph.h bgl.h