X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=927f45d1a8e60855abc87ebb43f1652cc1f26387;hb=c9f085069bc4e555689dffedbfa08af250772f2a;hp=b41c543b25f800691cda9c7b3c198b39a76faea8;hpb=2e47daae84f617abb80defe005a87c239406a129;p=moebius2.git

diff --git a/Makefile b/Makefile
index b41c543..927f45d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,9 @@ CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
 CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
 
 OPTIMISE=	-O2
-CFLAGS=		-MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
+CFLAGS_UNIPROC=	-MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
 CXXFLAGS=	-MMD $(OPTIMISE) -g $(CXXWARNS)
+CFLAGS=		$(CFLAGS_UNIPROC) $(NPROCCFLAGS)
 
 LIBGSL= -lgsl -lgslcblas
 
@@ -31,10 +32,22 @@ minimise:	energy.o graph.o common.o mgraph.o minimise.o half.o
 primer:		primer.o common.o
 		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
 
+nprocessors:	nprocessors.o common.o
+		$(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$@
 
@@ -44,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$@
 
@@ -73,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