mirror of
git://git.code.sf.net/p/xtables-addons/xtables-addons
synced 2025-09-06 12:45:13 +02:00
build: restore parallel build capability
It seems that ${MAKE} must be in the first expansion level.
This commit is contained in:
@@ -8,7 +8,7 @@ export XA_SRCDIR
|
|||||||
export XA_TOPSRCDIR
|
export XA_TOPSRCDIR
|
||||||
export XA_ABSTOPSRCDIR
|
export XA_ABSTOPSRCDIR
|
||||||
|
|
||||||
_mcall = ${MAKE} -f ${top_builddir}/Makefile.iptrules
|
_mcall = -f ${top_builddir}/Makefile.iptrules
|
||||||
|
|
||||||
all-local: user-all-local
|
all-local: user-all-local
|
||||||
|
|
||||||
@@ -17,13 +17,13 @@ install-exec-local: user-install-local
|
|||||||
clean-local: user-clean-local
|
clean-local: user-clean-local
|
||||||
|
|
||||||
user-all-local:
|
user-all-local:
|
||||||
${_mcall} all;
|
${MAKE} ${_mcall} all;
|
||||||
|
|
||||||
# Have no user-install-data-local ATM
|
# Have no user-install-data-local ATM
|
||||||
user-install-local: user-install-exec-local
|
user-install-local: user-install-exec-local
|
||||||
|
|
||||||
user-install-exec-local:
|
user-install-exec-local:
|
||||||
${_mcall} install;
|
${MAKE} ${_mcall} install;
|
||||||
|
|
||||||
user-clean-local:
|
user-clean-local:
|
||||||
${_mcall} clean;
|
${MAKE} ${_mcall} clean;
|
||||||
|
@@ -4,16 +4,16 @@
|
|||||||
# Not having Kbuild in Makefile.extra because it will already recurse
|
# Not having Kbuild in Makefile.extra because it will already recurse
|
||||||
.PHONY: modules modules_install clean_modules
|
.PHONY: modules modules_install clean_modules
|
||||||
|
|
||||||
_kcall = ${MAKE} -C ${kbuilddir} M=${abs_srcdir}
|
_kcall = -C ${kbuilddir} M=${abs_srcdir}
|
||||||
|
|
||||||
modules:
|
modules:
|
||||||
${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${_kcall} modules; fi;
|
${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
|
||||||
|
|
||||||
modules_install:
|
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:
|
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
|
all-local: modules
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user