Trying to consolidate the libwpd module

Change-Id: I3ce8cd24eee7f2256f2a4b1d1220562a84bf5fac

libwpd/StaticLibrary_wpd.mk → 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

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 \
 ))