Kaydet (Commit) c9795112 authored tarafından Khaled Hosny's avatar Khaled Hosny Kaydeden (comit) David Tardon

fdo#70393: move libwpd to a subdir of external

Change-Id: I599cf45b455b59e082078d6b2d5ed2efb99b5862
Reviewed-on: https://gerrit.libreoffice.org/6336Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 5c077d3b
...@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ ...@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmfwk \ jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
librelogo \ librelogo \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \ $(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \ $(call gb_Helper_optional,WPS,libwps) \
$(call gb_Helper_optional,LIBXML2,libxml2) \ $(call gb_Helper_optional,LIBXML2,libxml2) \
......
...@@ -51,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ ...@@ -51,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) 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: # vim: set noet sw=4 ts=4:
...@@ -9,13 +9,9 @@ ...@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libwpd)) $(eval $(call gb_Module_Module,libwpd))
ifeq ($(SYSTEM_WPD),NO)
$(eval $(call gb_Module_add_targets,libwpd,\ $(eval $(call gb_Module_add_targets,libwpd,\
ExternalProject_libwpd \ ExternalProject_libwpd \
UnpackedTarball_libwpd \ UnpackedTarball_libwpd \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment