summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-12-19 02:39:32 +0100
committerJan Engelhardt <jengelh@medozas.de>2010-12-19 03:05:59 +0100
commit7009adda3d6ded19cfcf4fb41b239c067e2805b0 (patch)
treec14399b12e8e15ee3999ae79ff5a6379096fba35
parent06366c172c487b3038b52e8fe640747b4092a544 (diff)
build: enable parallel building
$ make modules -j8 cd kernel; make -C /lib/modules/`uname -r`/build M=`pwd` V=0 \ IP_SET_MAX=256 \ NETLINK_DUMP_CONST=const \ NFNL_CB_CONST=const modules make[1]: Entering directory "/usr/src/linux-2.6.36-rc8-34-obj/x86_64/default" make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. The "fix" here is that we have to use ${MAKE} instead of make. (NB: The extra cd is redundant and can be appended to M=.)
-rw-r--r--Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index aa0d64b..ab552dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,16 +23,16 @@ endif
SUBDIRS = lib src
modules:
- cd kernel; make -C $(KBUILD_OUTPUT) M=`pwd` V=$V \
+ ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel V=$V \
IP_SET_MAX=$(IP_SET_MAX) \
NETLINK_DUMP_CONST=$(NETLINK_DUMP_CONST) \
NFNL_CB_CONST=$(NFNL_CB_CONST) modules
modules_install:
- cd kernel; make -C $(KBUILD_OUTPUT) M=`pwd` modules_install
+ ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel modules_install
modules_clean:
- cd kernel; make -C $(KBUILD_OUTPUT) M=`pwd` clean
+ ${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel clean
update_includes:
./update ip_set.h