diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-27 19:05:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-30 20:34:03 +0000 |
| commit | ed0b160041c46d74c81ba849f1f841eb5bdaba1c (patch) | |
| tree | 4ca2574fa47b0ddd1c04361bd010aec19ada289a /libwpd | |
| parent | 036f86db553494c781f58cbb5cbb567774217ec4 (diff) | |
fix parallelism variables and let's have only --with-parallelism from now on
Rationale:
- it is advised to use max-jobs and num-cpus with the same value in wiki
- max-jobs was used only for lcms2 and few gbuild
modules outside of tail_build anyway.
Also fixes:
- really use CHECK_PARALLELISM when meant to
- EXTMAXPROCESS is not defined in gbuild;
use parent's jobservers in sub-make where possible
Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Reviewed-on: https://gerrit.libreoffice.org/930
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/ExternalProject_libwpd.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk index 4d1ea615d9ff..b0cb6927e3e9 100644 --- a/libwpd/ExternalProject_libwpd.mk +++ b/libwpd/ExternalProject_libwpd.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : --disable-debug \ $(if $(filter MACOSX,$(OS)),--disable-werror) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(GNUMAKE) -j$(EXTMAXPROCESS) \ + && $(MAKE) \ && touch $@ endif |