fdo#70393: move libwpd to a subdir of external

Change-Id: I599cf45b455b59e082078d6b2d5ed2efb99b5862
Reviewed-on: https://gerrit.libreoffice.org/6336Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	librelogo \
-	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
 	$(call gb_Helper_optional,WPS,libwps) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \

external/Module_external.mk

@@ -51,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
+	$(call gb_Helper_optional,WPD,libwpd) \
 ))
 
 # vim: set noet sw=4 ts=4:

libwpd/Makefile → external/libwpd/Makefile

@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:

libwpd/Module_libwpd.mk → external/libwpd/Module_libwpd.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libwpd))
 
-ifeq ($(SYSTEM_WPD),NO)
-
 $(eval $(call gb_Module_add_targets,libwpd,\
 	ExternalProject_libwpd \
 	UnpackedTarball_libwpd \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4: