compute initial layout - not yet checked

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index d0e7f2e70cf70e28642d7f640cc7a1d1cc591da1..fc74681e0e4b665f103753745e045dc5df7cd339 100644 (file)
--- 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