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>

15 files changed, 8 insertions, 10 deletions

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index c7d174896821..2fd24005c644 100644
--- a/RepositoryModule_host.mk
+++ b/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) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 6902a7142af3..2b8e83603321 100644
--- a/external/Module_external.mk
+++ b/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) \
 ))
diff --git a/hsqldb/ExternalPackage_hsqldb.mk b/external/hsqldb/ExternalPackage_hsqldb.mk
index 770ca063d714..770ca063d714 100644
--- a/hsqldb/ExternalPackage_hsqldb.mk
+++ b/external/hsqldb/ExternalPackage_hsqldb.mk
diff --git a/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk
index c32a2bfc6129..c32a2bfc6129 100644
--- a/hsqldb/ExternalProject_hsqldb.mk
+++ b/external/hsqldb/ExternalProject_hsqldb.mk
diff --git a/hsqldb/Makefile b/external/hsqldb/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/hsqldb/Makefile
+++ b/external/hsqldb/Makefile
diff --git a/hsqldb/Module_hsqldb.mk b/external/hsqldb/Module_hsqldb.mk
index 7bf4da1bc68a..d748faa2e0e2 100644
--- a/hsqldb/Module_hsqldb.mk
+++ b/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:
diff --git a/hsqldb/README b/external/hsqldb/README
index 8e43980bc99a..8e43980bc99a 100644
--- a/hsqldb/README
+++ b/external/hsqldb/README
diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
index fc31af5464f3..a13aa9ba886e 100644
--- a/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/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 \
 	) \
 ))
 
diff --git a/hsqldb/patches/fdo36824.patch b/external/hsqldb/patches/fdo36824.patch
index ad753e335bad..ad753e335bad 100644
--- a/hsqldb/patches/fdo36824.patch
+++ b/external/hsqldb/patches/fdo36824.patch
diff --git a/hsqldb/patches/i103528.patch b/external/hsqldb/patches/i103528.patch
index 3cc7d2f1d80d..3cc7d2f1d80d 100644
--- a/hsqldb/patches/i103528.patch
+++ b/external/hsqldb/patches/i103528.patch
diff --git a/hsqldb/patches/i104901.patch b/external/hsqldb/patches/i104901.patch
index a38773f4ba1e..a38773f4ba1e 100644
--- a/hsqldb/patches/i104901.patch
+++ b/external/hsqldb/patches/i104901.patch
diff --git a/hsqldb/patches/i96823.patch b/external/hsqldb/patches/i96823.patch
index bea4a2b7e4f5..bea4a2b7e4f5 100644
--- a/hsqldb/patches/i96823.patch
+++ b/external/hsqldb/patches/i96823.patch
diff --git a/hsqldb/patches/i97032.patch b/external/hsqldb/patches/i97032.patch
index 9703b89613d4..9703b89613d4 100644
--- a/hsqldb/patches/i97032.patch
+++ b/external/hsqldb/patches/i97032.patch
diff --git a/hsqldb/patches/jdbc-4.1.patch b/external/hsqldb/patches/jdbc-4.1.patch
index 7884148c5fb4..7884148c5fb4 100644
--- a/hsqldb/patches/jdbc-4.1.patch
+++ b/external/hsqldb/patches/jdbc-4.1.patch
diff --git a/hsqldb/patches/limit_as_table_alias.patch b/external/hsqldb/patches/limit_as_table_alias.patch
index 09f49ccd561d..09f49ccd561d 100644
--- a/hsqldb/patches/limit_as_table_alias.patch
+++ b/external/hsqldb/patches/limit_as_table_alias.patch