summaryrefslogtreecommitdiff
path: root/libwpd
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-09-24 22:18:20 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-09-24 22:49:37 +0200
commitbc63efc586c1a3b9ba5af7087093174b0d6aeb97 (patch)
tree44c31ae0f3cd32ba9c714ca40537750416a0ecc5 /libwpd
parent9351d0e4181924c3f72be24081fc7af027aa41f7 (diff)
Trying to consolidate the libwpd module
Change-Id: I3ce8cd24eee7f2256f2a4b1d1220562a84bf5fac
Diffstat (limited to 'libwpd')
-rw-r--r--libwpd/ExternalProject_libwpd.mk (renamed from libwpd/StaticLibrary_wpd.mk)2
-rw-r--r--libwpd/Module_libwpd.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/ExternalProject_libwpd.mk
index adecdd3a5391..16ddad5bf2d0 100644
--- a/libwpd/StaticLibrary_wpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -35,7 +35,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) \
+ && $(GNUMAKE) -j$(EXTMAXPROCESS) \
&& touch $@
endif
diff --git a/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk
index 74ff85e19a38..bd74b12f9b48 100644
--- a/libwpd/Module_libwpd.mk
+++ b/libwpd/Module_libwpd.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,libwpd))
ifeq ($(SYSTEM_LIBWPD),NO)
$(eval $(call gb_Module_add_targets,libwpd,\
+ ExternalProject_libwpd \
ExternalPackage_libwpd \
- StaticLibrary_wpd \
UnpackedTarball_wpd \
))