diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 19:22:46 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 06:49:50 +0000 |
| commit | 39f73d93874114e2bacfd73da137180aad95a3f6 (patch) | |
| tree | 721dea6ac2f80fb60f9d6b71ee79e60029d12279 | |
| parent | 30b3367605025acf70c2a25ec04b303c11eada62 (diff) | |
fdo#70393: move ct2n to a subdir of external
Change-Id: If93ae0fa968539f72c9dbf29b4496355b6d66e05
Reviewed-on: https://gerrit.libreoffice.org/6297
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/ct2n/ConvertTextToNumber-1.3.2-no-license.patch (renamed from ct2n/ConvertTextToNumber-1.3.2-no-license.patch) | 0 | ||||
| -rw-r--r-- | external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch (renamed from ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch) | 0 | ||||
| -rw-r--r-- | external/ct2n/ExternalPackage_ct2n.mk (renamed from ct2n/ExternalPackage_ct2n.mk) | 0 | ||||
| -rw-r--r-- | external/ct2n/Makefile (renamed from ct2n/Makefile) | 0 | ||||
| -rw-r--r-- | external/ct2n/Module_ct2n.mk (renamed from ct2n/Module_ct2n.mk) | 4 | ||||
| -rw-r--r-- | external/ct2n/README (renamed from ct2n/README) | 0 | ||||
| -rw-r--r-- | external/ct2n/UnpackedTarball_ct2n.mk (renamed from ct2n/UnpackedTarball_ct2n.mk) | 4 | ||||
| -rw-r--r-- | external/ct2n/description-en-US.txt (renamed from ct2n/description-en-US.txt) | 0 |
10 files changed, 3 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index ee95730f8e1b..e88deaf0a8f9 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ cppuhelper \ cpputools \ $(call gb_Helper_optional,CRASHREP,crashrep) \ - $(call gb_Helper_optional,CT2N,ct2n) \ cui \ $(call gb_Helper_optional,CURL,curl) \ dbaccess \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2c8b492e2e6f..9be3b5a20c24 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CAIRO,cairo) \ $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,CPPUNIT,cppunit) \ + $(call gb_Helper_optional,CT2N,ct2n) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch b/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch index cd17fc00da70..cd17fc00da70 100644 --- a/ct2n/ConvertTextToNumber-1.3.2-no-license.patch +++ b/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch diff --git a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch b/external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch index 50dd4b5f4775..50dd4b5f4775 100644 --- a/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch +++ b/external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch diff --git a/ct2n/ExternalPackage_ct2n.mk b/external/ct2n/ExternalPackage_ct2n.mk index 599e4335a3f1..599e4335a3f1 100644 --- a/ct2n/ExternalPackage_ct2n.mk +++ b/external/ct2n/ExternalPackage_ct2n.mk diff --git a/ct2n/Makefile b/external/ct2n/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/ct2n/Makefile +++ b/external/ct2n/Makefile diff --git a/ct2n/Module_ct2n.mk b/external/ct2n/Module_ct2n.mk index 873f31bbe738..55fdcce46d8c 100644 --- a/ct2n/Module_ct2n.mk +++ b/external/ct2n/Module_ct2n.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,ConvertTextToNumber)) -ifneq (,$(filter CT2N,$(BUILD_TYPE))) - $(eval $(call gb_Module_add_targets,ConvertTextToNumber,\ ExternalPackage_ct2n \ UnpackedTarball_ct2n \ )) -endif - # vim:set noet sw=4 ts=4: diff --git a/ct2n/README b/external/ct2n/README index 7d5d278883ff..7d5d278883ff 100644 --- a/ct2n/README +++ b/external/ct2n/README diff --git a/ct2n/UnpackedTarball_ct2n.mk b/external/ct2n/UnpackedTarball_ct2n.mk index df9f4664dc06..8e90ae92a3d1 100644 --- a/ct2n/UnpackedTarball_ct2n.mk +++ b/external/ct2n/UnpackedTarball_ct2n.mk @@ -12,8 +12,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,ConvertTextToNumber)) $(eval $(call gb_UnpackedTarball_set_tarball,ConvertTextToNumber,$(CT2N_TARBALL),0)) $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\ - ct2n/ConvertTextToNumber-1.3.2-no-license.patch \ - ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \ + external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch \ + external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \ )) $(eval $(call gb_UnpackedTarball_fix_end_of_line,ConvertTextToNumber,\ diff --git a/ct2n/description-en-US.txt b/external/ct2n/description-en-US.txt index a91393b5acf5..a91393b5acf5 100644 --- a/ct2n/description-en-US.txt +++ b/external/ct2n/description-en-US.txt |