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

fdo#70393: move xsltml to a subdir of external

Change-Id: I2d244cc2ea9390f3a118bb620d397faa59e4e491
Reviewed-on: https://gerrit.libreoffice.org/6555Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 112c60b4
...@@ -153,7 +153,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ ...@@ -153,7 +153,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
xmlreader \ xmlreader \
xmlscript \ xmlscript \
xmlsecurity \ xmlsecurity \
$(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \ $(call gb_Helper_optional,ZLIB,zlib) \
)) ))
......
...@@ -79,6 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ ...@@ -79,6 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,WPD,libwpd) \ $(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,XSLTML,xsltml) \
$(call gb_Helper_optional_for_host,DESKTOP, \ $(call gb_Helper_optional_for_host,DESKTOP, \
$(if $(filter YES,$(WITH_GALLERY_BUILD)), \ $(if $(filter YES,$(WITH_GALLERY_BUILD)), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
......
...@@ -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:
...@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,xsltml,\ ...@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,xsltml,\
)) ))
$(eval $(call gb_UnpackedTarball_add_patches,xsltml,\ $(eval $(call gb_UnpackedTarball_add_patches,xsltml,\
xsltml/xsltml_2.1.2.patch \ external/xsltml/xsltml_2.1.2.patch \
)) ))
# 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