use -O3

[moebius2.git] / Makefile

diff --git a/Makefile b/Makefile
index d3ddd4f8facfc7bb21bb85d9963aec99bc643d0f..221eadbe3f14d45bfa20510cefbba88a86434847 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,10 @@ SGTATHAM=sgtatham
 CWARNS=        -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
-OPTIMISE=      -O2
-CFLAGS=                -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
+OPTIMISE=      -O3
+CFLAGS_UNIPROC=        -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=      -MMD $(OPTIMISE) -g $(CXXWARNS)
+CFLAGS=                $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
 
 LIBGSL= -lgsl -lgslcblas
 
@@ -32,12 +33,21 @@ primer:             primer.o common.o
                $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
 nprocessors:   nprocessors.o common.o
-               $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+               $(CC) $(CFLAGS_UNIPROC) -o $@ $^ $(LIBGSL)
+
+common.o nprocessors.o: %.o: %.c
+               $(CC) -c $(CPPFLAGS) $(CFLAGS_UNIPROC) $< -o $@
+
+.nprocessors.make: ./nprocessors
+       set -e; n=`./nprocessors`; \
+       echo "NPROCCFLAGS := -DNPROCESSORS=$$n" $o
+
+include .nprocessors.make
+
 
 prime.data:    primer
                ./$^ $o
 
-
 sgtatham.cfm:  sgtatham-regenerator prime.data $(SGTATHAM)/z.typescript
                ./$^ -T -o$@
 
@@ -47,7 +57,6 @@ lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
 ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
                ./$^ -o$@
 
-
 best-33.CFM:
                ./minimise-33 sgtatham.cfm -iwip-33.cfm -o$@
 
@@ -76,8 +85,9 @@ output-%:     output+%.o mgraph+%.o common.o
 interpolate-%: interpolate+%.o mgraph+%.o common.o
                $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
-minimise-%:    energy+%.o graph+%.o mgraph+%.o minimise+%.o half+%.o common.o
-               $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
+minimise-%:    energy+%.o graph+%.o mgraph+%.o minimise+%.o \
+                       half+%.o parallel.o common.o
+               $(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL) -lpthread
 
 # this ridiculous repetition is due to make being too lame