The following commit has been merged in the next branch: commit 63b3c662a1b5ec2a288091bbc0d01ce6197873bf Author: Sven Eckelmann sven@narfation.org Date: Sun Dec 4 20:10:45 2011 +0100

batman-adv: 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 3374687..15f099e 100644 --- a/Makefile +++ b/Makefile @@ -33,12 +33,10 @@ REVISION= $(shell if [ -d .git ]; then \ echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi)

-NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) - include $(PWD)/Makefile.kbuild

all: - $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) -j $(NUM_CPUS) modules + $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) modules

clean: $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean