diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 20:00:06 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:35:24 +0000 |
| commit | 1359fba53064d726d55853881d24d793598a5008 (patch) | |
| tree | f0b1c20b163125e2cd934326c4c4a92c59fe714a | |
| parent | fc26490252a63b851560be0af97e14b784a20350 (diff) | |
fdo#70393: move libmspub to a subdir of external
Change-Id: Ib93e41b2ebd7f466c28e6a52ea6ad16dd216642e
Reviewed-on: https://gerrit.libreoffice.org/6331
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libmspub/ExternalProject_libmspub.mk (renamed from libmspub/ExternalProject_libmspub.mk) | 0 | ||||
| -rw-r--r-- | external/libmspub/Makefile (renamed from libmspub/Makefile) | 2 | ||||
| -rw-r--r-- | external/libmspub/Module_libmspub.mk (renamed from libmspub/Module_libmspub.mk) | 4 | ||||
| -rw-r--r-- | external/libmspub/README (renamed from libmspub/README) | 0 | ||||
| -rw-r--r-- | external/libmspub/UnpackedTarball_libmspub.mk (renamed from libmspub/UnpackedTarball_libmspub.mk) | 0 |
7 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 7a2acad849c2..87ece57fbeb5 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmaccess \ jvmfwk \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ - $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ORCUS,liborcus) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 30249aa67e7f..81c97ae81a28 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBPNG,libpng) \ + $(call gb_Helper_optional,MSPUB,libmspub) \ )) # vim: set noet sw=4 ts=4: diff --git a/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index 9da4dc5156e3..9da4dc5156e3 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk diff --git a/libmspub/Makefile b/external/libmspub/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libmspub/Makefile +++ b/external/libmspub/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/libmspub/Module_libmspub.mk b/external/libmspub/Module_libmspub.mk index 0755acae9c6e..81ea7e91d547 100644 --- a/libmspub/Module_libmspub.mk +++ b/external/libmspub/Module_libmspub.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libmspub)) -ifeq ($(SYSTEM_MSPUB),NO) - $(eval $(call gb_Module_add_targets,libmspub,\ ExternalProject_libmspub \ UnpackedTarball_libmspub \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libmspub/README b/external/libmspub/README index 6d2765a1e7f2..6d2765a1e7f2 100644 --- a/libmspub/README +++ b/external/libmspub/README diff --git a/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index 044ce9656c49..044ce9656c49 100644 --- a/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk |