consistent naming of externals: cmis -> libcmis

Change-Id: If710b416111dd26a67693d9f6d7d194ea607069b
Reviewed-on: https://gerrit.libreoffice.org/42292
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

4 files changed, 103 insertions, 103 deletions

diff --git a/external/libcmis/Module_libcmis.mk b/external/libcmis/Module_libcmis.mk
index b45f1ed8b0f8..78ab61c51920 100644
--- a/external/libcmis/Module_libcmis.mk
+++ b/external/libcmis/Module_libcmis.mk
@@ -10,8 +10,8 @@
 $(eval $(call gb_Module_Module,libcmis))
 
 $(eval $(call gb_Module_add_targets,libcmis,\
-	StaticLibrary_cmis \
-	UnpackedTarball_cmis \
+	StaticLibrary_libcmis \
+	UnpackedTarball_libcmis \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk
deleted file mode 100644
index 4eb1c97d017c..000000000000
--- a/external/libcmis/StaticLibrary_cmis.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,cmislib))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,cmislib))
-
-ifeq ($(COM_IS_CLANG),TRUE)
-# Avoid narrowing conversion error (even though the option is technically a warning)
-# caused by boost.
-# Also avoid -Wdynamic-exception-spec errors in C++17 mode.
-$(eval $(call gb_StaticLibrary_add_cxxflags,cmislib,\
-    -Wno-error=c++11-narrowing \
-    $(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
-            $(CXXFLAGS_CXX11)), \
-        -Wno-error=dynamic-exception-spec) \
-))
-endif
-
-$(eval $(call gb_StaticLibrary_use_unpacked,cmislib,cmis))
-
-$(eval $(call gb_StaticLibrary_use_externals,cmislib,\
-	boost_headers \
-	curl \
-	libxml2 \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cmislib,\
-	UnpackedTarball/cmis/src/libcmis/allowable-actions \
-	UnpackedTarball/cmis/src/libcmis/atom-document \
-	UnpackedTarball/cmis/src/libcmis/atom-folder \
-	UnpackedTarball/cmis/src/libcmis/atom-object-type \
-	UnpackedTarball/cmis/src/libcmis/atom-object \
-	UnpackedTarball/cmis/src/libcmis/atom-session \
-	UnpackedTarball/cmis/src/libcmis/atom-workspace \
-	UnpackedTarball/cmis/src/libcmis/base-session \
-	UnpackedTarball/cmis/src/libcmis/document \
-	UnpackedTarball/cmis/src/libcmis/folder \
-	UnpackedTarball/cmis/src/libcmis/gdrive-document \
-	UnpackedTarball/cmis/src/libcmis/gdrive-folder \
-	UnpackedTarball/cmis/src/libcmis/gdrive-object \
-	UnpackedTarball/cmis/src/libcmis/gdrive-object-type \
-	UnpackedTarball/cmis/src/libcmis/gdrive-property \
-	UnpackedTarball/cmis/src/libcmis/gdrive-repository \
-	UnpackedTarball/cmis/src/libcmis/gdrive-session \
-	UnpackedTarball/cmis/src/libcmis/gdrive-utils \
-	UnpackedTarball/cmis/src/libcmis/http-session \
-	UnpackedTarball/cmis/src/libcmis/json-utils \
-	UnpackedTarball/cmis/src/libcmis/oauth2-data \
-	UnpackedTarball/cmis/src/libcmis/oauth2-handler \
-	UnpackedTarball/cmis/src/libcmis/oauth2-providers \
-	UnpackedTarball/cmis/src/libcmis/object \
-	UnpackedTarball/cmis/src/libcmis/object-type \
-	UnpackedTarball/cmis/src/libcmis/onedrive-document \
-	UnpackedTarball/cmis/src/libcmis/onedrive-folder \
-	UnpackedTarball/cmis/src/libcmis/onedrive-object \
-	UnpackedTarball/cmis/src/libcmis/onedrive-object-type \
-	UnpackedTarball/cmis/src/libcmis/onedrive-property \
-	UnpackedTarball/cmis/src/libcmis/onedrive-repository \
-	UnpackedTarball/cmis/src/libcmis/onedrive-session \
-	UnpackedTarball/cmis/src/libcmis/onedrive-utils \
-	UnpackedTarball/cmis/src/libcmis/property \
-	UnpackedTarball/cmis/src/libcmis/property-type \
-	UnpackedTarball/cmis/src/libcmis/rendition \
-	UnpackedTarball/cmis/src/libcmis/repository \
-	UnpackedTarball/cmis/src/libcmis/session-factory \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-document \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-folder \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-object \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-object-type \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-property \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-repository \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-session \
-	UnpackedTarball/cmis/src/libcmis/sharepoint-utils \
-	UnpackedTarball/cmis/src/libcmis/ws-document \
-	UnpackedTarball/cmis/src/libcmis/ws-folder \
-	UnpackedTarball/cmis/src/libcmis/ws-navigationservice \
-	UnpackedTarball/cmis/src/libcmis/ws-object \
-	UnpackedTarball/cmis/src/libcmis/ws-object-type \
-	UnpackedTarball/cmis/src/libcmis/ws-objectservice \
-	UnpackedTarball/cmis/src/libcmis/ws-relatedmultipart \
-	UnpackedTarball/cmis/src/libcmis/ws-repositoryservice \
-	UnpackedTarball/cmis/src/libcmis/ws-requests \
-	UnpackedTarball/cmis/src/libcmis/ws-session \
-	UnpackedTarball/cmis/src/libcmis/ws-soap \
-	UnpackedTarball/cmis/src/libcmis/ws-versioningservice \
-	UnpackedTarball/cmis/src/libcmis/xml-utils \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk
new file mode 100644
index 000000000000..705cc6c6451d
--- /dev/null
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -0,0 +1,96 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,libcmis))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libcmis))
+
+ifeq ($(COM_IS_CLANG),TRUE)
+# Avoid narrowing conversion error (even though the option is technically a warning)
+# caused by boost.
+# Also avoid -Wdynamic-exception-spec errors in C++17 mode.
+$(eval $(call gb_StaticLibrary_add_cxxflags,libcmis,\
+    -Wno-error=c++11-narrowing \
+    $(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
+            $(CXXFLAGS_CXX11)), \
+        -Wno-error=dynamic-exception-spec) \
+))
+endif
+
+$(eval $(call gb_StaticLibrary_use_unpacked,libcmis,libcmis))
+
+$(eval $(call gb_StaticLibrary_use_externals,libcmis,\
+	boost_headers \
+	curl \
+	libxml2 \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,libcmis,\
+	UnpackedTarball/libcmis/src/libcmis/allowable-actions \
+	UnpackedTarball/libcmis/src/libcmis/atom-document \
+	UnpackedTarball/libcmis/src/libcmis/atom-folder \
+	UnpackedTarball/libcmis/src/libcmis/atom-object-type \
+	UnpackedTarball/libcmis/src/libcmis/atom-object \
+	UnpackedTarball/libcmis/src/libcmis/atom-session \
+	UnpackedTarball/libcmis/src/libcmis/atom-workspace \
+	UnpackedTarball/libcmis/src/libcmis/base-session \
+	UnpackedTarball/libcmis/src/libcmis/document \
+	UnpackedTarball/libcmis/src/libcmis/folder \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-document \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-folder \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-object \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-object-type \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-property \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-repository \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-session \
+	UnpackedTarball/libcmis/src/libcmis/gdrive-utils \
+	UnpackedTarball/libcmis/src/libcmis/http-session \
+	UnpackedTarball/libcmis/src/libcmis/json-utils \
+	UnpackedTarball/libcmis/src/libcmis/oauth2-data \
+	UnpackedTarball/libcmis/src/libcmis/oauth2-handler \
+	UnpackedTarball/libcmis/src/libcmis/oauth2-providers \
+	UnpackedTarball/libcmis/src/libcmis/object \
+	UnpackedTarball/libcmis/src/libcmis/object-type \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-document \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-folder \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-object \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-object-type \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-property \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-repository \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-session \
+	UnpackedTarball/libcmis/src/libcmis/onedrive-utils \
+	UnpackedTarball/libcmis/src/libcmis/property \
+	UnpackedTarball/libcmis/src/libcmis/property-type \
+	UnpackedTarball/libcmis/src/libcmis/rendition \
+	UnpackedTarball/libcmis/src/libcmis/repository \
+	UnpackedTarball/libcmis/src/libcmis/session-factory \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-document \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-folder \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-object \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-object-type \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-property \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-repository \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-session \
+	UnpackedTarball/libcmis/src/libcmis/sharepoint-utils \
+	UnpackedTarball/libcmis/src/libcmis/ws-document \
+	UnpackedTarball/libcmis/src/libcmis/ws-folder \
+	UnpackedTarball/libcmis/src/libcmis/ws-navigationservice \
+	UnpackedTarball/libcmis/src/libcmis/ws-object \
+	UnpackedTarball/libcmis/src/libcmis/ws-object-type \
+	UnpackedTarball/libcmis/src/libcmis/ws-objectservice \
+	UnpackedTarball/libcmis/src/libcmis/ws-relatedmultipart \
+	UnpackedTarball/libcmis/src/libcmis/ws-repositoryservice \
+	UnpackedTarball/libcmis/src/libcmis/ws-requests \
+	UnpackedTarball/libcmis/src/libcmis/ws-session \
+	UnpackedTarball/libcmis/src/libcmis/ws-soap \
+	UnpackedTarball/libcmis/src/libcmis/ws-versioningservice \
+	UnpackedTarball/libcmis/src/libcmis/xml-utils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk
index a29b1e7cd6f8..3730888bf6b5 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -7,13 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,cmis))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libcmis))
 
-$(eval $(call gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libcmis,$(LIBCMIS_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libcmis,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,cmis, \
+$(eval $(call gb_UnpackedTarball_add_patches,libcmis, \
 						external/libcmis/libcmis-libxml2_compatibility.patch \
 						external/libcmis/libcmis-fix-google-drive.patch \
 						external/libcmis/libcmis-google-2FA-implementation.patch \
@@ -23,7 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch))
+$(eval $(call gb_UnpackedTarball_add_patches,libcmis,external/libcmis/boost-win.patch))
 endif
 
 # vim: set noet sw=4 ts=4: