The following commit has been merged in the master branch: commit b2e3f83a290334d272f3c4a7ea7d834750a6f7d3 Author: Sven Eckelmann sven@narfation.org Date: Sat May 21 14:28:06 2011 +0200
batctl: 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 3b9e853..61a81fb 100644 --- a/Makefile +++ b/Makefile @@ -53,10 +53,7 @@ REVISION= $(shell if [ -d .git ]; then \
REVISION_VERSION ="\ $(REVISION)"
-NUM_CPUS = $(shell nproc 2> /dev/null || echo 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)