diff options
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libwps/ExternalProject_libwps.mk (renamed from libwps/ExternalProject_libwps.mk) | 0 | ||||
| -rw-r--r-- | external/libwps/Makefile (renamed from libwps/Makefile) | 2 | ||||
| -rw-r--r-- | external/libwps/Module_libwps.mk (renamed from libwps/Module_libwps.mk) | 4 | ||||
| -rw-r--r-- | external/libwps/README (renamed from libwps/README) | 0 | ||||
| -rw-r--r-- | external/libwps/UnpackedTarball_libwps.mk (renamed from libwps/UnpackedTarball_libwps.mk) | 0 |
7 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f89f6b391620..cc3d4d66fcda 100644 --- a/RepositoryModule_host.mk +++ b/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,WPS,libwps) \ $(call gb_Helper_optional,LIBXML2,libxml2) \ libxmlsec \ $(call gb_Helper_optional,LIBXSLT,libxslt) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 840081a598e8..a583184d8d56 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ + $(call gb_Helper_optional,WPS,libwps) \ )) # vim: set noet sw=4 ts=4: diff --git a/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk index 5af9deda7052..5af9deda7052 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/external/libwps/ExternalProject_libwps.mk diff --git a/libwps/Makefile b/external/libwps/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libwps/Makefile +++ b/external/libwps/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: diff --git a/libwps/Module_libwps.mk b/external/libwps/Module_libwps.mk index ee163f09060b..a6870faa9a08 100644 --- a/libwps/Module_libwps.mk +++ b/external/libwps/Module_libwps.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libwps)) -ifeq ($(SYSTEM_WPS),NO) - $(eval $(call gb_Module_add_targets,libwps,\ ExternalProject_libwps \ UnpackedTarball_libwps \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libwps/README b/external/libwps/README index 3ce52187d520..3ce52187d520 100644 --- a/libwps/README +++ b/external/libwps/README diff --git a/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index 1fd633acbe90..1fd633acbe90 100644 --- a/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk |