[Libreoffice-commits] core.git: external/Module_external.mk external/moz moz/ExternalPackage_moz_lib.mk moz/ExternalPackage_runtime.mk moz/Makefile moz/Module_moz.mk moz/README moz/UnpackedTarball_moz_inc.mk moz/UnpackedTarball_moz_lib.mk moz/UnpackedTarball_mozruntime.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                   |    1 
 external/Module_external.mk                |    1 
 external/moz/ExternalPackage_moz_lib.mk    |   19 +++++++++
 external/moz/ExternalPackage_runtime.mk    |   57 +++++++++++++++++++++++++++++
 external/moz/Makefile                      |    7 +++
 external/moz/Module_moz.mk                 |   24 ++++++++++++
 external/moz/README                        |    6 +++
 external/moz/UnpackedTarball_moz_inc.mk    |   15 +++++++
 external/moz/UnpackedTarball_moz_lib.mk    |   15 +++++++
 external/moz/UnpackedTarball_mozruntime.mk |   14 +++++++
 moz/ExternalPackage_moz_lib.mk             |   19 ---------
 moz/ExternalPackage_runtime.mk             |   57 -----------------------------
 moz/Makefile                               |    7 ---
 moz/Module_moz.mk                          |   24 ------------
 moz/README                                 |    6 ---
 moz/UnpackedTarball_moz_inc.mk             |   15 -------
 moz/UnpackedTarball_moz_lib.mk             |   15 -------
 moz/UnpackedTarball_mozruntime.mk          |   14 -------
 18 files changed, 158 insertions(+), 158 deletions(-)

New commits:
commit 164b3e74e77a220e524fd077e4c6a55a5ea9f0f4
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 22:52:45 2013 +0200

    fdo#70393: move moz to a subdir of external
    
    Change-Id: I9e9b47a3b8fc298b0a371ef609f342a8366b0039
    Reviewed-on: https://gerrit.libreoffice.org/6345
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 70eb666..5caf81a 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 8e7b93a..ae4580f 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
similarity index 100%
rename from moz/ExternalPackage_moz_lib.mk
rename to external/moz/ExternalPackage_moz_lib.mk
diff --git a/moz/ExternalPackage_runtime.mk b/external/moz/ExternalPackage_runtime.mk
similarity index 100%
rename from moz/ExternalPackage_runtime.mk
rename to external/moz/ExternalPackage_runtime.mk
diff --git a/moz/Makefile b/external/moz/Makefile
similarity index 71%
rename from moz/Makefile
rename to external/moz/Makefile
index ccb1c85..e4968cf 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
similarity index 100%
rename from moz/Module_moz.mk
rename to external/moz/Module_moz.mk
diff --git a/moz/README b/external/moz/README
similarity index 100%
rename from moz/README
rename to external/moz/README
diff --git a/moz/UnpackedTarball_moz_inc.mk b/external/moz/UnpackedTarball_moz_inc.mk
similarity index 100%
rename from moz/UnpackedTarball_moz_inc.mk
rename to external/moz/UnpackedTarball_moz_inc.mk
diff --git a/moz/UnpackedTarball_moz_lib.mk b/external/moz/UnpackedTarball_moz_lib.mk
similarity index 100%
rename from moz/UnpackedTarball_moz_lib.mk
rename to external/moz/UnpackedTarball_moz_lib.mk
diff --git a/moz/UnpackedTarball_mozruntime.mk b/external/moz/UnpackedTarball_mozruntime.mk
similarity index 100%
rename from moz/UnpackedTarball_mozruntime.mk
rename to external/moz/UnpackedTarball_mozruntime.mk