new edge enumeration arrangements; bugfixes

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index 9e3aa83e3b8a14a5bb23fce18620b9f00a3cfebb..cd1aa6c71f134872503aff514939acfd650659ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,31 @@
 
-TARGETS=minimise
+TARGETS= minimise primer initial project
 
-CFLAGS=        -Wall -Wwrite-strings -Wpointer-arith -Werror
+CWARNS=        -Wall -Wwrite-strings -Wpointer-arith -Werror
+
+OPTIMISE=      -O2
+CFLAGS=                $(CWARNS) -MMD $(OPTIMISE) -g
+CXXFLAGS=      $(CWARNS) -MMD $(OPTIMISE) -g
+
+LIBGSL= -lgsl -lgslcblas
 
 all:           $(TARGETS)
 
 minimise:      energy.o bgl.o common.o mgraph.o
+               $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
+
+primer:                primer.o common.o
+               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+
+project:       project.o common.o mgraph.o
+               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+
+initial:       generator primer sgtatham/z.typescript
+               ./$^ -o$@
 
 clean:
-               rm -f *.o $(TARGETS) *.new
+               rm -f *.o $(TARGETS) *.new *.tmp
                rm -f best initial
+               rm -f *.d
+
+-include *.d