fdo#70393: move clucene to a subdir of external

Change-Id: Ia9b7b18526119e29e21eb315d84d099861e15ea0
Reviewed-on: https://gerrit.libreoffice.org/6285
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

24 files changed, 19 insertions, 19 deletions

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1f358f6e3926..0ec4fca64a59 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	canvas \
 	chart2 \
 	cli_ure \
-	$(call gb_Helper_optional,CLUCENE,clucene) \
 	$(call gb_Helper_optional,DESKTOP,codemaker) \
 	comphelper \
 	configmgr \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 85fb1708609c..7d6880eae13f 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,BOOST,boost) \
 	$(call gb_Helper_optional,BSH,beanshell) \
 	$(call gb_Helper_optional,CAIRO,cairo) \
+	$(call gb_Helper_optional,CLUCENE,clucene) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk
index 7ac8a48a19a2..7ac8a48a19a2 100644
--- a/clucene/Library_clucene.mk
+++ b/external/clucene/Library_clucene.mk
diff --git a/clucene/Makefile b/external/clucene/Makefile
index 5f46a974f7fe..5f46a974f7fe 100644
--- a/clucene/Makefile
+++ b/external/clucene/Makefile
diff --git a/clucene/Module_clucene.mk b/external/clucene/Module_clucene.mk
index aa4a57b0b1f2..aee86111ef28 100644
--- a/clucene/Module_clucene.mk
+++ b/external/clucene/Module_clucene.mk
@@ -9,13 +9,13 @@
 
 $(eval $(call gb_Module_Module,clucene))
 
-ifeq ($(SYSTEM_CLUCENE),NO)
+# do we need the Android check below? Shouldn't it be already covered by
+# gb_Helper_optional in Module_external.mk?
 ifneq ($(OS),ANDROID)
 $(eval $(call gb_Module_add_targets,clucene,\
     Library_clucene \
 	UnpackedTarball_clucene \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/clucene/README b/external/clucene/README
index 458762a6dfe0..458762a6dfe0 100644
--- a/clucene/README
+++ b/external/clucene/README
diff --git a/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk
index 5328bb248434..cda5b3aafee6 100644
--- a/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -23,42 +23,42 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0))
 # clucene-multimap-put.patch was proposed upstream, see
 # http://sourceforge.net/mailarchive/message.php?msg_id=29143260
 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
-	clucene/patches/clucene-debug.patch \
-	clucene/patches/clucene-multimap-put.patch \
-	clucene/patches/clucene-narrowing-conversions.patch \
-	clucene/patches/clucene-nullptr.patch \
-	clucene/patches/clucene-warnings.patch \
-	clucene/patches/clucene-aix.patch \
-	clucene/patches/clucene-git1-win64.patch \
+	external/clucene/patches/clucene-debug.patch \
+	external/clucene/patches/clucene-multimap-put.patch \
+	external/clucene/patches/clucene-narrowing-conversions.patch \
+	external/clucene/patches/clucene-nullptr.patch \
+	external/clucene/patches/clucene-warnings.patch \
+	external/clucene/patches/clucene-aix.patch \
+	external/clucene/patches/clucene-git1-win64.patch \
 ))
 
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
-	clucene/patches/clucene-libcpp.patch \
+	external/clucene/patches/clucene-libcpp.patch \
 ))
 endif
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-MSVC.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-MSVC.h))
 ifeq ($(COM),MSC)
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MSVC.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MSVC.h))
 else
 ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE)
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MINGW-atomic.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MINGW-atomic.h))
 else
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MINGW.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MINGW.h))
 endif
 endif
 else # ! $(OS),WNT
 ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE)
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-GCC-atomic.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-GCC-atomic.h))
 else
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-generic.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-generic.h))
 endif
 ifeq ($(OS),LINUX)
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-LINUX.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-LINUX.h))
 else
-$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-generic.h))
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-generic.h))
 endif
 endif # $(OS),WNT
 
diff --git a/clucene/configs/_clucene-config-LINUX.h b/external/clucene/configs/_clucene-config-LINUX.h
index 2b425b6b2b60..2b425b6b2b60 100644
--- a/clucene/configs/_clucene-config-LINUX.h
+++ b/external/clucene/configs/_clucene-config-LINUX.h
diff --git a/clucene/configs/_clucene-config-MSVC.h b/external/clucene/configs/_clucene-config-MSVC.h
index 09ef41cb67b7..09ef41cb67b7 100644
--- a/clucene/configs/_clucene-config-MSVC.h
+++ b/external/clucene/configs/_clucene-config-MSVC.h
diff --git a/clucene/configs/_clucene-config-generic.h b/external/clucene/configs/_clucene-config-generic.h
index 42cf27c7f2ce..42cf27c7f2ce 100644
--- a/clucene/configs/_clucene-config-generic.h
+++ b/external/clucene/configs/_clucene-config-generic.h
diff --git a/clucene/configs/clucene-config-GCC-atomic.h b/external/clucene/configs/clucene-config-GCC-atomic.h
index 3c034a1da831..3c034a1da831 100644
--- a/clucene/configs/clucene-config-GCC-atomic.h
+++ b/external/clucene/configs/clucene-config-GCC-atomic.h
diff --git a/clucene/configs/clucene-config-MINGW-atomic.h b/external/clucene/configs/clucene-config-MINGW-atomic.h
index 4b77b69ff8c5..4b77b69ff8c5 100644
--- a/clucene/configs/clucene-config-MINGW-atomic.h
+++ b/external/clucene/configs/clucene-config-MINGW-atomic.h
diff --git a/clucene/configs/clucene-config-MINGW.h b/external/clucene/configs/clucene-config-MINGW.h
index 009505edcf33..009505edcf33 100644
--- a/clucene/configs/clucene-config-MINGW.h
+++ b/external/clucene/configs/clucene-config-MINGW.h
diff --git a/clucene/configs/clucene-config-MSVC.h b/external/clucene/configs/clucene-config-MSVC.h
index edd4a3b3022f..edd4a3b3022f 100644
--- a/clucene/configs/clucene-config-MSVC.h
+++ b/external/clucene/configs/clucene-config-MSVC.h
diff --git a/clucene/configs/clucene-config-generic.h b/external/clucene/configs/clucene-config-generic.h
index b84dd4bc0100..b84dd4bc0100 100644
--- a/clucene/configs/clucene-config-generic.h
+++ b/external/clucene/configs/clucene-config-generic.h
diff --git a/clucene/patches/clucene-aix.patch b/external/clucene/patches/clucene-aix.patch
index 2b796fa45bdc..2b796fa45bdc 100644
--- a/clucene/patches/clucene-aix.patch
+++ b/external/clucene/patches/clucene-aix.patch
diff --git a/clucene/patches/clucene-debug.patch b/external/clucene/patches/clucene-debug.patch
index 640454e2fb2d..640454e2fb2d 100644
--- a/clucene/patches/clucene-debug.patch
+++ b/external/clucene/patches/clucene-debug.patch
diff --git a/clucene/patches/clucene-git1-win64.patch b/external/clucene/patches/clucene-git1-win64.patch
index dc07d380bb45..dc07d380bb45 100644
--- a/clucene/patches/clucene-git1-win64.patch
+++ b/external/clucene/patches/clucene-git1-win64.patch
diff --git a/clucene/patches/clucene-libcpp.patch b/external/clucene/patches/clucene-libcpp.patch
index 35235212c795..35235212c795 100644
--- a/clucene/patches/clucene-libcpp.patch
+++ b/external/clucene/patches/clucene-libcpp.patch
diff --git a/clucene/patches/clucene-multimap-put.patch b/external/clucene/patches/clucene-multimap-put.patch
index bfff31a8727b..bfff31a8727b 100644
--- a/clucene/patches/clucene-multimap-put.patch
+++ b/external/clucene/patches/clucene-multimap-put.patch
diff --git a/clucene/patches/clucene-narrowing-conversions.patch b/external/clucene/patches/clucene-narrowing-conversions.patch
index 64065acb1650..64065acb1650 100644
--- a/clucene/patches/clucene-narrowing-conversions.patch
+++ b/external/clucene/patches/clucene-narrowing-conversions.patch
diff --git a/clucene/patches/clucene-nullptr.patch b/external/clucene/patches/clucene-nullptr.patch
index a32ddb870b8c..a32ddb870b8c 100644
--- a/clucene/patches/clucene-nullptr.patch
+++ b/external/clucene/patches/clucene-nullptr.patch
diff --git a/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch
index b9676d90260c..b9676d90260c 100644
--- a/clucene/patches/clucene-warnings.patch
+++ b/external/clucene/patches/clucene-warnings.patch
diff --git a/clucene/patches/contribs-lib-makefile.patch b/external/clucene/patches/contribs-lib-makefile.patch
index 8cc05aea4cfb..8cc05aea4cfb 100644
--- a/clucene/patches/contribs-lib-makefile.patch
+++ b/external/clucene/patches/contribs-lib-makefile.patch