The following commit has been merged in the master branch: commit d60a44a2d299a1881e257bac436625d62780021e Author: Sven Eckelmann sven@narfation.org Date: Wed Jun 23 14:12:58 2010 +0200
batmand: 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 b472805..ce94472 100644 --- a/Makefile +++ b/Makefile @@ -71,11 +71,8 @@ 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)