From e04b8284cee1a38b5cbae842fb11c1461054245b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 26 Feb 2013 15:22:22 -0500 Subject: [PATCH] use JOBS instead of NPROCS for controlling build concurrency --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d612d00c4..8907c5bf9 100755 --- a/Makefile +++ b/Makefile @@ -7,26 +7,26 @@ endif OS:=$(shell uname -s) -ifeq ($(NPROCS),) - NPROCS:=1 +ifeq ($(JOBS),) + JOBS:=1 ifeq ($(OS),Linux) - NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) + JOBS:=$(shell grep -c ^processor /proc/cpuinfo) endif ifeq ($(OS),Darwin) - NPROCS:=$(shell sysctl -n hw.ncpu) + JOBS:=$(shell sysctl -n hw.ncpu) endif endif all: mapnik install: - @python scons/scons.py -j$(NPROCS) --config=cache --implicit-cache --max-drift=1 install + @python scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install mapnik: - @python scons/scons.py -j$(NPROCS) --config=cache --implicit-cache --max-drift=1 + @python scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 clean: - @python scons/scons.py -j$(NPROCS) -c --config=cache --implicit-cache --max-drift=1 + @python scons/scons.py -j$(JOBS) -c --config=cache --implicit-cache --max-drift=1 @if test -e ".sconsign.dblite"; then rm ".sconsign.dblite"; fi @if test -e "config.log"; then rm "config.log"; fi @if test -e ".sconf_temp/"; then rm -r ".sconf_temp/"; fi @@ -46,7 +46,7 @@ rebuild: make uninstall && make clean && time make && make install uninstall: - @python scons/scons.py -j$(NPROCS) --config=cache --implicit-cache --max-drift=1 uninstall + @python scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall test: @ ./run_tests