X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile;h=927f45d1a8e60855abc87ebb43f1652cc1f26387;hb=b955d8410f03c81aaac9406a8e335229bb8baf51;hp=a0b643ad32012771c1163fd74dbc8f7557b94236;hpb=09c0156fef9837ca0eff4bf8b158d5638f18775e;p=moebius2.git

diff --git a/Makefile b/Makefile
index a0b643a..927f45d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,6 @@ SGTATHAM=sgtatham
 CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
-NPROCCFLAGS := -DNPROCESSORS=$(shell ./nprocessors)
-
 OPTIMISE=	-O2
 CFLAGS_UNIPROC=	-MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=	-MMD $(OPTIMISE) -g $(CXXWARNS)
@@ -40,6 +38,13 @@ nprocessors:	nprocessors.o common.o
 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
 
@@ -80,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