[Libreoffice-commits] core.git: external/Module_external.mk external/mythes mythes/ExternalProject_mythes.mk mythes/Makefile mythes/Module_mythes.mk mythes/mythes-1.2.0-android.patch mythes/mythes-1.2.0-vanilla-th-gen-idx.patch mythes/mythes-ssizet.patch mythes/README mythes/StaticLibrary_mythes.mk mythes/UnpackedTarball_mythes.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                              |    1 
 external/Module_external.mk                           |    1 
 external/mythes/ExternalProject_mythes.mk             |   26 +++++
 external/mythes/Makefile                              |    7 +
 external/mythes/Module_mythes.mk                      |   25 +++++
 external/mythes/README                                |    1 
 external/mythes/StaticLibrary_mythes.mk               |   21 ++++
 external/mythes/UnpackedTarball_mythes.mk             |   20 ++++
 external/mythes/mythes-1.2.0-android.patch            |   20 ++++
 external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch |   90 ++++++++++++++++++
 external/mythes/mythes-ssizet.patch                   |   20 ++++
 mythes/ExternalProject_mythes.mk                      |   26 -----
 mythes/Makefile                                       |    7 -
 mythes/Module_mythes.mk                               |   27 -----
 mythes/README                                         |    1 
 mythes/StaticLibrary_mythes.mk                        |   21 ----
 mythes/UnpackedTarball_mythes.mk                      |   20 ----
 mythes/mythes-1.2.0-android.patch                     |   20 ----
 mythes/mythes-1.2.0-vanilla-th-gen-idx.patch          |   90 ------------------
 mythes/mythes-ssizet.patch                            |   20 ----
 20 files changed, 231 insertions(+), 233 deletions(-)

New commits:
commit 67867f77d90eae4de276ef477a973ce68357d7d6
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 23:00:19 2013 +0200

    fdo#70393: move mythes to a subdir of external
    
    Change-Id: I132479fd26e45276f25af5615175b0fdaeaaeb01
    Reviewed-on: https://gerrit.libreoffice.org/6347
    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 e03523b..dba46e6 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MOZ,moz) \
 	$(call gb_Helper_optional,MARIADBC,mysqlc) \
-	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,NEON,neon) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
 	np_sdk \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index bb949c4..c0b95e0 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,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
+	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk
similarity index 100%
rename from mythes/ExternalProject_mythes.mk
rename to external/mythes/ExternalProject_mythes.mk
diff --git a/mythes/Makefile b/external/mythes/Makefile
similarity index 71%
rename from mythes/Makefile
rename to external/mythes/Makefile
index ccb1c85..e4968cf 100644
--- a/mythes/Makefile
+++ b/external/mythes/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/mythes/Module_mythes.mk b/external/mythes/Module_mythes.mk
similarity index 95%
rename from mythes/Module_mythes.mk
rename to external/mythes/Module_mythes.mk
index 4d9ac64..56d95fc 100644
--- a/mythes/Module_mythes.mk
+++ b/external/mythes/Module_mythes.mk
@@ -9,7 +9,6 @@
 
 $(eval $(call gb_Module_Module,mythes))
 
-ifeq ($(SYSTEM_MYTHES),NO)
 $(eval $(call gb_Module_add_targets,mythes,\
 	UnpackedTarball_mythes \
 ))
@@ -22,6 +21,5 @@ $(eval $(call gb_Module_add_targets,mythes,\
 	ExternalProject_mythes \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/mythes/README b/external/mythes/README
similarity index 100%
rename from mythes/README
rename to external/mythes/README
diff --git a/mythes/StaticLibrary_mythes.mk b/external/mythes/StaticLibrary_mythes.mk
similarity index 100%
rename from mythes/StaticLibrary_mythes.mk
rename to external/mythes/StaticLibrary_mythes.mk
diff --git a/mythes/UnpackedTarball_mythes.mk b/external/mythes/UnpackedTarball_mythes.mk
similarity index 79%
rename from mythes/UnpackedTarball_mythes.mk
rename to external/mythes/UnpackedTarball_mythes.mk
index a4928af..d2d4e1d 100644
--- a/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mythes))
 $(eval $(call gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
-	mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
-	mythes/mythes-1.2.0-android.patch \
-	mythes/mythes-ssizet.patch \
+	external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
+	external/mythes/mythes-1.2.0-android.patch \
+	external/mythes/mythes-ssizet.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/mythes/mythes-1.2.0-android.patch b/external/mythes/mythes-1.2.0-android.patch
similarity index 100%
rename from mythes/mythes-1.2.0-android.patch
rename to external/mythes/mythes-1.2.0-android.patch
diff --git a/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch b/external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
similarity index 100%
rename from mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
rename to external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch
diff --git a/mythes/mythes-ssizet.patch b/external/mythes/mythes-ssizet.patch
similarity index 100%
rename from mythes/mythes-ssizet.patch
rename to external/mythes/mythes-ssizet.patch