diff options
| -rw-r--r-- | RepositoryModule_build.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/ucpp/Executable_ucpp.mk (renamed from ucpp/Executable_ucpp.mk) | 0 | ||||
| -rw-r--r-- | external/ucpp/Makefile (renamed from ucpp/Makefile) | 2 | ||||
| -rw-r--r-- | external/ucpp/Module_ucpp.mk (renamed from ucpp/Module_ucpp.mk) | 0 | ||||
| -rw-r--r-- | external/ucpp/UnpackedTarball_ucpp.mk (renamed from ucpp/UnpackedTarball_ucpp.mk) | 2 | ||||
| -rw-r--r-- | external/ucpp/ucpp.patch (renamed from ucpp/ucpp.patch) | 0 |
8 files changed, 3 insertions, 4 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index acd899b58f9e..1a4c033dda50 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -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) \ )) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index a878824005cb..92ff4f131a3a 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -132,7 +132,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ tubes \ ucb \ ucbhelper \ - $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ UnoControls \ unodevtools \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2a6977fdd753..f5484e400e34 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -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) \ diff --git a/ucpp/Executable_ucpp.mk b/external/ucpp/Executable_ucpp.mk index a2e64e644eed..a2e64e644eed 100644 --- a/ucpp/Executable_ucpp.mk +++ b/external/ucpp/Executable_ucpp.mk diff --git a/ucpp/Makefile b/external/ucpp/Makefile index 0997e628485b..569ad8a0ba7a 100644 --- a/ucpp/Makefile +++ b/external/ucpp/Makefile @@ -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: diff --git a/ucpp/Module_ucpp.mk b/external/ucpp/Module_ucpp.mk index dc4c02f5307b..dc4c02f5307b 100644 --- a/ucpp/Module_ucpp.mk +++ b/external/ucpp/Module_ucpp.mk diff --git a/ucpp/UnpackedTarball_ucpp.mk b/external/ucpp/UnpackedTarball_ucpp.mk index ee0543f7f970..04d7113b8513 100644 --- a/ucpp/UnpackedTarball_ucpp.mk +++ b/external/ucpp/UnpackedTarball_ucpp.mk @@ -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: diff --git a/ucpp/ucpp.patch b/external/ucpp/ucpp.patch index c9c4b92b7f79..c9c4b92b7f79 100644 --- a/ucpp/ucpp.patch +++ b/external/ucpp/ucpp.patch |