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

fdo#70393: move ucpp to a subdir of external

Change-Id: I05419939ca0d6c55d24088d4b4adf3e262e50083
Reviewed-on: https://gerrit.libreoffice.org/6553Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 79b81a34
......@@ -86,7 +86,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
xmlhelp \
) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
$(call gb_Helper_optional,UCPP,ucpp) \
$(call gb_Helper_optional,ZLIB,zlib) \
))
......
......@@ -132,7 +132,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
tubes \
ucb \
ucbhelper \
$(call gb_Helper_optional,UCPP,ucpp) \
udkapi \
UnoControls \
unodevtools \
......
......@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,RHINO,rhino) \
$(call gb_Helper_optional,UCPP,ucpp) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
......
......@@ -9,6 +9,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:
......@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,ucpp,$(UCPP_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,ucpp,0))
$(eval $(call gb_UnpackedTarball_add_patches,ucpp,\
ucpp/ucpp.patch \
external/ucpp/ucpp.patch \
))
# 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