The following commit has been merged in the master branch: commit 21f0d6faa338d075ee584699daf483c53b2dccc8 Author: Sven Eckelmann sven@narfation.org Date: Sat May 21 15:45:06 2011 +0200

vis: Don't automatically build in parallel

Distributions like Gentoo and Debian have policies which make it necessary to use some kind of environmental variable to control the parallel build.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/Makefile b/Makefile index ccfcfd5..f7bcef9 100644 --- a/Makefile +++ b/Makefile @@ -43,11 +43,7 @@ REVISION= $(shell if [ -d .git ]; then \ fi) REVISION_VERSION="\ $(REVISION)"

-NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) - - -all: - $(MAKE) -j $(NUM_CPUS) $(BINARY_NAME) +all: $(BINARY_NAME)

$(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile $(Q_LD)$(CC) -o $@ $(SRC_O) $(LDFLAGS)