fdo#70393: move libcmis to a subdir of external

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

RepositoryModule_host.mk

@@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	$(call gb_Helper_optional,CDR,libcdr) \
-	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \

external/Module_external.mk

@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,BSH,beanshell) \
 	$(call gb_Helper_optional,CAIRO,cairo) \
 	$(call gb_Helper_optional,CLUCENE,clucene) \
+	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,CPPUNIT,cppunit) \
 	$(call gb_Helper_optional,CT2N,ct2n) \
 	$(call gb_Helper_optional,CURL,curl) \

libcmis/Makefile → external/libcmis/Makefile

@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:

libcmis/Module_libcmis.mk → external/libcmis/Module_libcmis.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
-ifeq ($(SYSTEM_CMIS),NO)
-
 $(eval $(call gb_Module_add_targets,libcmis,\
 	StaticLibrary_cmis \
 	UnpackedTarball_cmis \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:

libcmis/UnpackedTarball_cmis.mk → external/libcmis/UnpackedTarball_cmis.mk

@@ -14,11 +14,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
-						libcmis/libcmis-0.4.1.patch \
-						libcmis/libcmis-0.4.1-empty-path.patch))
+						external/libcmis/libcmis-0.4.1.patch \
+						external/libcmis/libcmis-0.4.1-empty-path.patch))
 
 ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/boost-win.patch))
+$(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch))
 endif
 
 # vim: set noet sw=4 ts=4: