fdo#70393: move hsqldb to a subdir of external

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

RepositoryModule_host.mk

@@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	framework \
 	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
 	$(call gb_Helper_optional,HELP,helpcontent2) \
-	$(call gb_Helper_optional,HSQLDB,hsqldb) \
 	$(call gb_Helper_optional,HUNSPELL,hunspell) \
 	hwpfilter \
 	$(call gb_Helper_optional,HYPHEN,hyphen) \

external/Module_external.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,FREETYPE,freetype) \
 	$(call gb_Helper_optional,GRAPHITE,graphite) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
+	$(call gb_Helper_optional,HSQLDB,hsqldb) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))

external/hsqldb/Module_hsqldb.mk

@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,hsqldb))
 
-ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,hsqldb,\
 	ExternalPackage_hsqldb \
 	ExternalProject_hsqldb \
 	UnpackedTarball_hsqldb \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:

external/hsqldb/UnpackedTarball_hsqldb.mk

@@ -18,14 +18,14 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
-	hsqldb/patches/i96823.patch \
-	hsqldb/patches/i97032.patch \
-	hsqldb/patches/i103528.patch \
-	hsqldb/patches/i104901.patch \
-	hsqldb/patches/fdo36824.patch \
-	hsqldb/patches/limit_as_table_alias.patch \
+	external/hsqldb/patches/i96823.patch \
+	external/hsqldb/patches/i97032.patch \
+	external/hsqldb/patches/i103528.patch \
+	external/hsqldb/patches/i104901.patch \
+	external/hsqldb/patches/fdo36824.patch \
+	external/hsqldb/patches/limit_as_table_alias.patch \
 	$(if $(filter YES,$(HSQLDB_USE_JDBC_4_1)),\
-		hsqldb/patches/jdbc-4.1.patch \
+		external/hsqldb/patches/jdbc-4.1.patch \
 	) \
 ))