From 0ba2b78a07e1111208eef45813e14c33c95cef6d Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Thu, 17 Oct 2013 20:00:40 +0200 Subject: [PATCH] fdo#70393: move hyphen to a subdir of external Change-Id: I5a112b6f588a704e682e7b50d5399d3da77fbacf Reviewed-on: https://gerrit.libreoffice.org/6308 Tested-by: LibreOffice gerrit bot Reviewed-by: David Tardon Tested-by: David Tardon --- RepositoryModule_host.mk | 1 - external/Module_external.mk | 1 + {hyphen => external/hyphen}/ExternalPackage_hyphen.mk | 0 {hyphen => external/hyphen}/ExternalProject_hyphen.mk | 0 {hyphen => external/hyphen}/Makefile | 0 {hyphen => external/hyphen}/Module_hyphen.mk | 0 {hyphen => external/hyphen}/README | 0 {hyphen => external/hyphen}/StaticLibrary_hyphen.mk | 0 {hyphen => external/hyphen}/UnpackedTarball_hyphen.mk | 10 +++++----- {hyphen => external/hyphen}/hyphen-android.patch | 0 {hyphen => external/hyphen}/hyphen-build.patch | 0 {hyphen => external/hyphen}/hyphen-fdo43931.patch | 0 {hyphen => external/hyphen}/hyphen-lenwaswrong.patch | 0 {hyphen => external/hyphen}/hyphen-rhmin.patch | 0 14 files changed, 6 insertions(+), 6 deletions(-) rename {hyphen => external/hyphen}/ExternalPackage_hyphen.mk (100%) rename {hyphen => external/hyphen}/ExternalProject_hyphen.mk (100%) rename {hyphen => external/hyphen}/Makefile (100%) rename {hyphen => external/hyphen}/Module_hyphen.mk (100%) rename {hyphen => external/hyphen}/README (100%) rename {hyphen => external/hyphen}/StaticLibrary_hyphen.mk (100%) rename {hyphen => external/hyphen}/UnpackedTarball_hyphen.mk (72%) rename {hyphen => external/hyphen}/hyphen-android.patch (100%) rename {hyphen => external/hyphen}/hyphen-build.patch (100%) rename {hyphen => external/hyphen}/hyphen-fdo43931.patch (100%) rename {hyphen => external/hyphen}/hyphen-lenwaswrong.patch (100%) rename {hyphen => external/hyphen}/hyphen-rhmin.patch (100%) 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 similarity index 100% rename from hyphen/ExternalPackage_hyphen.mk rename to external/hyphen/ExternalPackage_hyphen.mk diff --git a/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk similarity index 100% rename from hyphen/ExternalProject_hyphen.mk rename to external/hyphen/ExternalProject_hyphen.mk diff --git a/hyphen/Makefile b/external/hyphen/Makefile similarity index 100% rename from hyphen/Makefile rename to external/hyphen/Makefile diff --git a/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk similarity index 100% rename from hyphen/Module_hyphen.mk rename to external/hyphen/Module_hyphen.mk diff --git a/hyphen/README b/external/hyphen/README similarity index 100% rename from hyphen/README rename to external/hyphen/README diff --git a/hyphen/StaticLibrary_hyphen.mk b/external/hyphen/StaticLibrary_hyphen.mk similarity index 100% rename from hyphen/StaticLibrary_hyphen.mk rename to external/hyphen/StaticLibrary_hyphen.mk diff --git a/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk similarity index 72% rename from hyphen/UnpackedTarball_hyphen.mk rename to 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 similarity index 100% rename from hyphen/hyphen-android.patch rename to external/hyphen/hyphen-android.patch diff --git a/hyphen/hyphen-build.patch b/external/hyphen/hyphen-build.patch similarity index 100% rename from hyphen/hyphen-build.patch rename to external/hyphen/hyphen-build.patch diff --git a/hyphen/hyphen-fdo43931.patch b/external/hyphen/hyphen-fdo43931.patch similarity index 100% rename from hyphen/hyphen-fdo43931.patch rename to external/hyphen/hyphen-fdo43931.patch diff --git a/hyphen/hyphen-lenwaswrong.patch b/external/hyphen/hyphen-lenwaswrong.patch similarity index 100% rename from hyphen/hyphen-lenwaswrong.patch rename to external/hyphen/hyphen-lenwaswrong.patch diff --git a/hyphen/hyphen-rhmin.patch b/external/hyphen/hyphen-rhmin.patch similarity index 100% rename from hyphen/hyphen-rhmin.patch rename to external/hyphen/hyphen-rhmin.patch