diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 20:09:12 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:36:20 +0000 |
| commit | 2728c6e8da276c1955878f766c71acd0fd59c9ce (patch) | |
| tree | bc75fa75b68b2f9b4181f40b90cff3a9ff9d5be8 | |
| parent | fdo#70393: move libmspub to a subdir of external (diff) | |
| download | core-2728c6e8da276c1955878f766c71acd0fd59c9ce.tar.gz core-2728c6e8da276c1955878f766c71acd0fd59c9ce.zip | |
fdo#70393: move libmwaw to a subdir of external
Change-Id: I8ba2b928638cf3f16c4500eeaec5a5ce91dd85f6
Reviewed-on: https://gerrit.libreoffice.org/6332
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/libmwaw/ExternalProject_libmwaw.mk (renamed from libmwaw/ExternalProject_libmwaw.mk) | 0 | ||||
| -rw-r--r-- | external/libmwaw/Makefile (renamed from libmwaw/Makefile) | 2 | ||||
| -rw-r--r-- | external/libmwaw/Module_libmwaw.mk (renamed from libmwaw/Module_libmwaw.mk) | 4 | ||||
| -rw-r--r-- | external/libmwaw/README (renamed from libmwaw/README) | 0 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk (renamed from libmwaw/UnpackedTarball_libmwaw.mk) | 0 |
7 files changed, 2 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 87ece57fbeb5..e058f049b884 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,MWAW,libmwaw) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ORCUS,liborcus) \ librelogo \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 81c97ae81a28..e3bcd470a8c6 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBPNG,libpng) \ $(call gb_Helper_optional,MSPUB,libmspub) \ + $(call gb_Helper_optional,MWAW,libmwaw) \ )) # vim: set noet sw=4 ts=4: diff --git a/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index a5001925d23f..a5001925d23f 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk diff --git a/libmwaw/Makefile b/external/libmwaw/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libmwaw/Makefile +++ b/external/libmwaw/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/libmwaw/Module_libmwaw.mk b/external/libmwaw/Module_libmwaw.mk index 36e756121798..9ecb4cf8d4a4 100644 --- a/libmwaw/Module_libmwaw.mk +++ b/external/libmwaw/Module_libmwaw.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libmwaw)) -ifeq ($(SYSTEM_MWAW),NO) - $(eval $(call gb_Module_add_targets,libmwaw,\ ExternalProject_libmwaw \ UnpackedTarball_libmwaw \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libmwaw/README b/external/libmwaw/README index c10d26bb5b79..c10d26bb5b79 100644 --- a/libmwaw/README +++ b/external/libmwaw/README diff --git a/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 96fe9df6afa0..96fe9df6afa0 100644 --- a/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk |