diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 20:00:40 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 06:58:44 +0000 |
| commit | 0ba2b78a07e1111208eef45813e14c33c95cef6d (patch) | |
| tree | 4f033ed3a0a1654f2da8f92b3849de82d6da704b | |
| parent | 64b6499371fa22d52648523e65a28c041dd6579f (diff) | |
fdo#70393: move hyphen to a subdir of external
Change-Id: I5a112b6f588a704e682e7b50d5399d3da77fbacf
Reviewed-on: https://gerrit.libreoffice.org/6308
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
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/hyphen/ExternalPackage_hyphen.mk (renamed from hyphen/ExternalPackage_hyphen.mk) | 0 | ||||
| -rw-r--r-- | external/hyphen/ExternalProject_hyphen.mk (renamed from hyphen/ExternalProject_hyphen.mk) | 0 | ||||
| -rw-r--r-- | external/hyphen/Makefile (renamed from hyphen/Makefile) | 0 | ||||
| -rw-r--r-- | external/hyphen/Module_hyphen.mk (renamed from hyphen/Module_hyphen.mk) | 0 | ||||
| -rw-r--r-- | external/hyphen/README (renamed from hyphen/README) | 0 | ||||
| -rw-r--r-- | external/hyphen/StaticLibrary_hyphen.mk (renamed from hyphen/StaticLibrary_hyphen.mk) | 0 | ||||
| -rw-r--r-- | external/hyphen/UnpackedTarball_hyphen.mk (renamed from hyphen/UnpackedTarball_hyphen.mk) | 10 | ||||
| -rw-r--r-- | external/hyphen/hyphen-android.patch (renamed from hyphen/hyphen-android.patch) | 0 | ||||
| -rw-r--r-- | external/hyphen/hyphen-build.patch (renamed from hyphen/hyphen-build.patch) | 0 | ||||
| -rw-r--r-- | external/hyphen/hyphen-fdo43931.patch (renamed from hyphen/hyphen-fdo43931.patch) | 0 | ||||
| -rw-r--r-- | external/hyphen/hyphen-lenwaswrong.patch (renamed from hyphen/hyphen-lenwaswrong.patch) | 0 | ||||
| -rw-r--r-- | external/hyphen/hyphen-rhmin.patch (renamed from hyphen/hyphen-rhmin.patch) | 0 |
14 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 484d380b2d2b..2c21a6c9b600 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -58,7 +58,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HELP,helpcontent2) \ hwpfilter \ - $(call gb_Helper_optional,HYPHEN,hyphen) \ i18nlangtag \ i18npool \ i18nutil \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 46bceafc5d23..dac8d0af3150 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ $(call gb_Helper_optional,HUNSPELL,hunspell) \ + $(call gb_Helper_optional,HYPHEN,hyphen) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/hyphen/ExternalPackage_hyphen.mk b/external/hyphen/ExternalPackage_hyphen.mk index 13303cc7c903..13303cc7c903 100644 --- a/hyphen/ExternalPackage_hyphen.mk +++ b/external/hyphen/ExternalPackage_hyphen.mk diff --git a/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk index e7d36730fd70..e7d36730fd70 100644 --- a/hyphen/ExternalProject_hyphen.mk +++ b/external/hyphen/ExternalProject_hyphen.mk diff --git a/hyphen/Makefile b/external/hyphen/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/hyphen/Makefile +++ b/external/hyphen/Makefile diff --git a/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk index 2ab3245d17a3..2ab3245d17a3 100644 --- a/hyphen/Module_hyphen.mk +++ b/external/hyphen/Module_hyphen.mk diff --git a/hyphen/README b/external/hyphen/README index 327b5b6e8954..327b5b6e8954 100644 --- a/hyphen/README +++ b/external/hyphen/README diff --git a/hyphen/StaticLibrary_hyphen.mk b/external/hyphen/StaticLibrary_hyphen.mk index 81eddf17d850..81eddf17d850 100644 --- a/hyphen/StaticLibrary_hyphen.mk +++ b/external/hyphen/StaticLibrary_hyphen.mk diff --git a/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk index 58049e92b5fe..5cd0af80bd22 100644 --- a/hyphen/UnpackedTarball_hyphen.mk +++ b/external/hyphen/UnpackedTarball_hyphen.mk @@ -12,11 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hyphen)) $(eval $(call gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\ - hyphen/hyphen-lenwaswrong.patch \ - hyphen/hyphen-fdo43931.patch \ - hyphen/hyphen-android.patch \ - hyphen/hyphen-rhmin.patch \ - hyphen/hyphen-build.patch \ + external/hyphen/hyphen-lenwaswrong.patch \ + external/hyphen/hyphen-fdo43931.patch \ + external/hyphen/hyphen-android.patch \ + external/hyphen/hyphen-rhmin.patch \ + external/hyphen/hyphen-build.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/hyphen/hyphen-android.patch b/external/hyphen/hyphen-android.patch index d092d786f6f0..d092d786f6f0 100644 --- a/hyphen/hyphen-android.patch +++ b/external/hyphen/hyphen-android.patch diff --git a/hyphen/hyphen-build.patch b/external/hyphen/hyphen-build.patch index 6df2bb680cdb..6df2bb680cdb 100644 --- a/hyphen/hyphen-build.patch +++ b/external/hyphen/hyphen-build.patch diff --git a/hyphen/hyphen-fdo43931.patch b/external/hyphen/hyphen-fdo43931.patch index 0a1f0b9cbdee..0a1f0b9cbdee 100644 --- a/hyphen/hyphen-fdo43931.patch +++ b/external/hyphen/hyphen-fdo43931.patch diff --git a/hyphen/hyphen-lenwaswrong.patch b/external/hyphen/hyphen-lenwaswrong.patch index f42694ff1aae..f42694ff1aae 100644 --- a/hyphen/hyphen-lenwaswrong.patch +++ b/external/hyphen/hyphen-lenwaswrong.patch diff --git a/hyphen/hyphen-rhmin.patch b/external/hyphen/hyphen-rhmin.patch index 12fff19f4466..12fff19f4466 100644 --- a/hyphen/hyphen-rhmin.patch +++ b/external/hyphen/hyphen-rhmin.patch |