]> git.ipfire.org Git - thirdparty/xtables-addons.git/commitdiff
build: restore parallel build capability
authorJan Engelhardt <jengelh@medozas.de>
Fri, 25 Sep 2009 19:18:09 +0000 (21:18 +0200)
committerJan Engelhardt <jengelh@medozas.de>
Fri, 25 Sep 2009 19:18:09 +0000 (21:18 +0200)
It seems that ${MAKE} must be in the first expansion level.

Makefile.extra
extensions/Makefile.am

index f68977404f4c7c9d8442957bb6eae2d5f03d5a03..061617149c197c88d54b4f3bcbee0eac456ea97d 100644 (file)
@@ -8,7 +8,7 @@ export XA_SRCDIR
 export XA_TOPSRCDIR
 export XA_ABSTOPSRCDIR
 
-_mcall = ${MAKE} -f ${top_builddir}/Makefile.iptrules
+_mcall = -f ${top_builddir}/Makefile.iptrules
 
 all-local: user-all-local
 
@@ -17,13 +17,13 @@ install-exec-local: user-install-local
 clean-local: user-clean-local
 
 user-all-local:
-       ${_mcall} all;
+       ${MAKE} ${_mcall} all;
 
 # Have no user-install-data-local ATM
 user-install-local: user-install-exec-local
 
 user-install-exec-local:
-       ${_mcall} install;
+       ${MAKE} ${_mcall} install;
 
 user-clean-local:
-       ${_mcall} clean;
+       ${MAKE} ${_mcall} clean;
index ea56f2c297500da4a21d3b373e10839a3aeb65dd..2c1fe2681f7de53b992e545c8bd7d673f425cdbd 100644 (file)
@@ -4,16 +4,16 @@
 # Not having Kbuild in Makefile.extra because it will already recurse
 .PHONY: modules modules_install clean_modules
 
-_kcall = ${MAKE} -C ${kbuilddir} M=${abs_srcdir}
+_kcall = -C ${kbuilddir} M=${abs_srcdir}
 
 modules:
-       ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${_kcall} modules; fi;
+       ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
 
 modules_install:
-       ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${_kcall} INSTALL_MOD_PATH=${DESTDIR} modules_install; fi;
+       ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} INSTALL_MOD_PATH=${DESTDIR} modules_install; fi;
 
 clean_modules:
-       ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${_kcall} clean; fi;
+       ${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} clean; fi;
 
 all-local: modules