sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use JOBS instead of NPROCS for controlling build concurrency

Browse source
This commit is contained in:
Dane Springmeyer 2013-02-26 15:22:22 -05:00
parent 9f27b02435
commit e04b8284ce
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -7,26 +7,26 @@ endif
OS:=$(shell uname -s) OS:=$(shell uname -s)
ifeq ($(NPROCS),) ifeq ($(JOBS),)
NPROCS:=1 JOBS:=1
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) JOBS:=$(shell grep -c ^processor /proc/cpuinfo)
endif endif
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
NPROCS:=$(shell sysctl -n hw.ncpu) JOBS:=$(shell sysctl -n hw.ncpu)
endif endif
endif endif
all: mapnik all: mapnik
install: 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: 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: 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 ".sconsign.dblite"; then rm ".sconsign.dblite"; fi
@if test -e "config.log"; then rm "config.log"; fi @if test -e "config.log"; then rm "config.log"; fi
@if test -e ".sconf_temp/"; then rm -r ".sconf_temp/"; 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 make uninstall && make clean && time make && make install
uninstall: 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: test:
@ ./run_tests @ ./run_tests