fdo#70393: move clucene to a subdir of external

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

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 \

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

clucene/Module_clucene.mk → 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:

clucene/UnpackedTarball_clucene.mk → 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