fdo#70393: move firebird to a subdir of external

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

12 files changed, 6 insertions, 8 deletions

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 7b6cb0792b91..4701511c9463 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	extras \
 	fileaccess \
 	filter \
-	$(call gb_Helper_optional,FIREBIRD,firebird) \
 	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
 	formula \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index db245e5b0bfe..97a2181e851c 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,CURL,curl) \
 	$(call gb_Helper_optional,EPM,epm) \
 	$(call gb_Helper_optional,EXPAT,expat) \
+	$(call gb_Helper_optional,FIREBIRD,firebird) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
diff --git a/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk
index 6419c30ccc43..6419c30ccc43 100644
--- a/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
diff --git a/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index bf6b45368ba7..bf6b45368ba7 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
diff --git a/firebird/Makefile b/external/firebird/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/firebird/Makefile
+++ b/external/firebird/Makefile
diff --git a/firebird/Module_firebird.mk b/external/firebird/Module_firebird.mk
index b1b1455b8658..d74963f7f4b5 100644
--- a/firebird/Module_firebird.mk
+++ b/external/firebird/Module_firebird.mk
@@ -9,12 +9,10 @@
 
 $(eval $(call gb_Module_Module,firebird))
 
-ifeq ($(SYSTEM_FIREBIRD),NO)
 $(eval $(call gb_Module_add_targets,firebird,\
 	ExternalPackage_firebird \
 	ExternalProject_firebird \
 	UnpackedTarball_firebird \
 ))
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 46baf71d25ba..c4119a022bb7 100644
--- a/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -12,23 +12,23 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,firebird))
 $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-icu.patch.1 \
-	firebird/firebird-rpath.patch.0 \
+	external/firebird/firebird-icu.patch.1 \
+	external/firebird/firebird-rpath.patch.0 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-c++11.patch.1 \
+	external/firebird/firebird-c++11.patch.1 \
 ))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-cygwin-msvc.patch.1 \
+	external/firebird/firebird-cygwin-msvc.patch.1 \
 ))
 endif
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
-	firebird/firebird-macosx.patch.1 \
+	external/firebird/firebird-macosx.patch.1 \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/firebird-c++11.patch.1 b/external/firebird/firebird-c++11.patch.1
index e8cb52d4d7fd..e8cb52d4d7fd 100644
--- a/firebird/firebird-c++11.patch.1
+++ b/external/firebird/firebird-c++11.patch.1
diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/external/firebird/firebird-cygwin-msvc.patch.1
index 5e2368b89bcf..5e2368b89bcf 100644
--- a/firebird/firebird-cygwin-msvc.patch.1
+++ b/external/firebird/firebird-cygwin-msvc.patch.1
diff --git a/firebird/firebird-icu.patch.1 b/external/firebird/firebird-icu.patch.1
index 6045ee19f0b0..6045ee19f0b0 100644
--- a/firebird/firebird-icu.patch.1
+++ b/external/firebird/firebird-icu.patch.1
diff --git a/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index adede1c98688..adede1c98688 100644
--- a/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
diff --git a/firebird/firebird-rpath.patch.0 b/external/firebird/firebird-rpath.patch.0
index a92f0064b20f..a92f0064b20f 100644
--- a/firebird/firebird-rpath.patch.0
+++ b/external/firebird/firebird-rpath.patch.0