fdo#70393: move ct2n to a subdir of external

Change-Id: If93ae0fa968539f72c9dbf29b4496355b6d66e05
Reviewed-on: https://gerrit.libreoffice.org/6297Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

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 \

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) \
 ))

ct2n/Module_ct2n.mk → 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:

ct2n/UnpackedTarball_ct2n.mk → 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,\