fdo#70393: move libwpg to a subdir of external

Change-Id: I28c0a18f9e85ca913a29f85e647a547cde2d40a1
Reviewed-on: https://gerrit.libreoffice.org/6337
Reviewed-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,WPG,libwpg) \
 	$(call gb_Helper_optional,WPS,libwps) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
 	libxmlsec \

external/Module_external.mk

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

external/libwpg/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:

external/libwpg/Module_libwpg.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libwpg))
 
-ifeq ($(SYSTEM_WPG),NO)
-
 $(eval $(call gb_Module_add_targets,libwpg,\
 	ExternalProject_libwpg \
 	UnpackedTarball_libwpg \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4: