diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:52:45 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 08:08:39 +0000 |
| commit | 164b3e74e77a220e524fd077e4c6a55a5ea9f0f4 (patch) | |
| tree | 7254d2543341516e6348878ae46ac63c0219d5e2 | |
| parent | f38b5ce9b87d86e73893a3d3384621da994d1499 (diff) | |
fdo#70393: move moz to a subdir of external
Change-Id: I9e9b47a3b8fc298b0a371ef609f342a8366b0039
Reviewed-on: https://gerrit.libreoffice.org/6345
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/moz/ExternalPackage_moz_lib.mk (renamed from moz/ExternalPackage_moz_lib.mk) | 0 | ||||
| -rw-r--r-- | external/moz/ExternalPackage_runtime.mk (renamed from moz/ExternalPackage_runtime.mk) | 0 | ||||
| -rw-r--r-- | external/moz/Makefile (renamed from moz/Makefile) | 2 | ||||
| -rw-r--r-- | external/moz/Module_moz.mk (renamed from moz/Module_moz.mk) | 0 | ||||
| -rw-r--r-- | external/moz/README (renamed from moz/README) | 0 | ||||
| -rw-r--r-- | external/moz/UnpackedTarball_moz_inc.mk (renamed from moz/UnpackedTarball_moz_inc.mk) | 0 | ||||
| -rw-r--r-- | external/moz/UnpackedTarball_moz_lib.mk (renamed from moz/UnpackedTarball_moz_lib.mk) | 0 | ||||
| -rw-r--r-- | external/moz/UnpackedTarball_mozruntime.mk (renamed from moz/UnpackedTarball_mozruntime.mk) | 0 |
10 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 70eb666d30bc..5caf81a622d5 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ linguistic \ lotuswordpro \ $(call gb_Helper_optional,DESKTOP,l10ntools) \ - $(call gb_Helper_optional,MOZ,moz) \ $(call gb_Helper_optional,MARIADBC,mysqlc) \ $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ np_sdk \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 8e7b93a99134..ae4580f79c9c 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,MARIADB,libmariadb) \ $(call gb_Helper_optional,MDDS,mdds) \ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ + $(call gb_Helper_optional,MOZ,moz) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ diff --git a/moz/ExternalPackage_moz_lib.mk b/external/moz/ExternalPackage_moz_lib.mk index 6246b212cdc6..6246b212cdc6 100644 --- a/moz/ExternalPackage_moz_lib.mk +++ b/external/moz/ExternalPackage_moz_lib.mk diff --git a/moz/ExternalPackage_runtime.mk b/external/moz/ExternalPackage_runtime.mk index ca1cb11ef08b..ca1cb11ef08b 100644 --- a/moz/ExternalPackage_runtime.mk +++ b/external/moz/ExternalPackage_runtime.mk diff --git a/moz/Makefile b/external/moz/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/moz/Makefile +++ b/external/moz/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/moz/Module_moz.mk b/external/moz/Module_moz.mk index d2cad1723230..d2cad1723230 100644 --- a/moz/Module_moz.mk +++ b/external/moz/Module_moz.mk diff --git a/moz/README b/external/moz/README index 50a639abab63..50a639abab63 100644 --- a/moz/README +++ b/external/moz/README diff --git a/moz/UnpackedTarball_moz_inc.mk b/external/moz/UnpackedTarball_moz_inc.mk index 94a1615e2b9b..94a1615e2b9b 100644 --- a/moz/UnpackedTarball_moz_inc.mk +++ b/external/moz/UnpackedTarball_moz_inc.mk diff --git a/moz/UnpackedTarball_moz_lib.mk b/external/moz/UnpackedTarball_moz_lib.mk index 8a324ad9fc25..8a324ad9fc25 100644 --- a/moz/UnpackedTarball_moz_lib.mk +++ b/external/moz/UnpackedTarball_moz_lib.mk diff --git a/moz/UnpackedTarball_mozruntime.mk b/external/moz/UnpackedTarball_mozruntime.mk index ac181db7628e..ac181db7628e 100644 --- a/moz/UnpackedTarball_mozruntime.mk +++ b/external/moz/UnpackedTarball_mozruntime.mk |