diff options
| -rw-r--r-- | Makefile.fetch | 2 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 18 | ||||
| -rw-r--r-- | config_host.mk.in | 8 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/Module_external.mk | 2 | ||||
| -rw-r--r-- | external/libcmis/Module_libcmis.mk | 4 | ||||
| -rw-r--r-- | external/libcmis/StaticLibrary_cmis.mk | 96 | ||||
| -rw-r--r-- | external/libcmis/StaticLibrary_libcmis.mk | 96 | ||||
| -rw-r--r-- | external/libcmis/UnpackedTarball_libcmis.mk (renamed from external/libcmis/UnpackedTarball_cmis.mk) | 10 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 | ||||
| -rw-r--r-- | ucb/Library_ucpcmis1.mk | 2 | ||||
| -rw-r--r-- | ucb/Module_ucb.mk | 2 |
13 files changed, 127 insertions, 127 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 35946e0ffde8..bb7d0ad6eddf 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -112,7 +112,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \ $(call fetch_Optional,CDR,CDR_TARBALL) \ $(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \ - $(call fetch_Optional,CMIS,CMIS_TARBALL) \ + $(call fetch_Optional,LIBCMIS,LIBCMIS_TARBALL) \ $(call fetch_Optional,COINMP,COINMP_TARBALL) \ $(call fetch_Optional,COLLADA2GLTF,COLLADA2GLTF_TARBALL) \ $(call fetch_Optional,CPPUNIT,CPPUNIT_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2e5d5556b9e9..469ff43944e8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -686,31 +686,31 @@ endef endif # SYSTEM_BOOST -ifneq ($(SYSTEM_CMIS),) +ifneq ($(SYSTEM_LIBCMIS),) -define gb_LinkTarget__use_cmis +define gb_LinkTarget__use_libcmis $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(CMIS_CFLAGS) \ + $(LIBCMIS_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(CMIS_LIBS)) +$(call gb_LinkTarget_add_libs,$(1),$(LIBCMIS_LIBS)) endef -else # !SYSTEM_CMIS +else # !SYSTEM_LIBCMIS -define gb_LinkTarget__use_cmis +define gb_LinkTarget__use_libcmis $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,cmis)/src \ + -I$(call gb_UnpackedTarball_get_dir,libcmis)/src \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - cmislib \ + libcmis \ ) endef -endif # SYSTEM_CMIS +endif # SYSTEM_LIBCMIS ifeq ($(ENABLE_JAVA),TRUE) diff --git a/config_host.mk.in b/config_host.mk.in index 187cdf45a861..c180e472ae4d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -62,8 +62,8 @@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ export CLANGDIR=@CLANGDIR@ export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@ -export CMIS_CFLAGS=$(gb_SPACE)@CMIS_CFLAGS@ -export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@ +export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@ +export LIBCMIS_LIBS=$(gb_SPACE)@LIBCMIS_LIBS@ export COLLADA2GLTF_CFLAGS=$(gb_SPACE)@COLLADA2GLTF_CFLAGS@ export COLLADA2GLTF_LIBS=$(gb_SPACE)@COLLADA2GLTF_LIBS@ export COM=@COM@ @@ -109,7 +109,7 @@ export ENABLE_AVAHI=@ENABLE_AVAHI@ export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@ -export ENABLE_CMIS=@ENABLE_CMIS@ +export ENABLE_LIBCMIS=@ENABLE_LIBCMIS@ export ENABLE_COINMP=@ENABLE_COINMP@ export SYSTEM_COINMP=@SYSTEM_COINMP@ export COINMP_CFLAGS=@COINMP_CFLAGS@ @@ -521,7 +521,7 @@ export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@ export SYSTEM_LIBJPEG=@SYSTEM_LIBJPEG@ export SYSTEM_LCMS2=@SYSTEM_LCMS2@ export SYSTEM_CDR=@SYSTEM_CDR@ -export SYSTEM_CMIS=@SYSTEM_CMIS@ +export SYSTEM_LIBCMIS=@SYSTEM_LIBCMIS@ export SYSTEM_EBOOK=@SYSTEM_EBOOK@ export SYSTEM_ETONYEK=@SYSTEM_ETONYEK@ export SYSTEM_EPUBGEN=@SYSTEM_EPUBGEN@ diff --git a/configure.ac b/configure.ac index a8375341f5aa..614896089908 100644 --- a/configure.ac +++ b/configure.ac @@ -7751,12 +7751,12 @@ dnl Check for system libcmis dnl =================================================================== # libcmis requires curl and we can't build curl for iOS if test $_os != iOS; then - libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.5 >= 0.5.0]) - ENABLE_CMIS=TRUE + libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.0]) + ENABLE_LIBCMIS=TRUE else - ENABLE_CMIS= + ENABLE_LIBCMIS= fi -AC_SUBST(ENABLE_CMIS) +AC_SUBST(ENABLE_LIBCMIS) dnl =================================================================== dnl Check for system lcms2 diff --git a/download.lst b/download.lst index 4ff62f162b74..fd210ce49518 100644 --- a/download.lst +++ b/download.lst @@ -20,8 +20,8 @@ export CDR_SHA256SUM := 5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca23 export CDR_TARBALL := libcdr-0.1.3.tar.bz2 export CLUCENE_SHA256SUM := ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz -export CMIS_SHA256SUM := 6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e -export CMIS_TARBALL :=libcmis-0.5.1.tar.gz +export LIBCMIS_SHA256SUM := 6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e +export LIBCMIS_TARBALL := libcmis-0.5.1.tar.gz export COINMP_SHA256SUM := 86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f export COINMP_TARBALL := CoinMP-1.7.6.tgz export COLLADA2GLTF_SHA256SUM := b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb diff --git a/external/Module_external.mk b/external/Module_external.mk index 02af9df08ae3..6c72a1624165 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,CDR,libcdr) \ $(call gb_Helper_optional,OPENCL,clew) \ $(call gb_Helper_optional,CLUCENE,clucene) \ - $(call gb_Helper_optional,CMIS,libcmis) \ + $(call gb_Helper_optional,LIBCMIS,libcmis) \ $(call gb_Helper_optional,COINMP,coinmp) \ $(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \ $(call gb_Helper_optional,CPPUNIT,cppunit) \ 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: diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index c2ce94aa6835..0d9481318769 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -92,7 +92,7 @@ $(eval $(call gb_Rdb_add_components,services,\ ucb/source/sorter/srtrs1 \ ucb/source/core/ucb1 \ ucb/source/cacher/cached1 \ - $(if $(ENABLE_CMIS),ucb/source/ucp/cmis/ucpcmis1) \ + $(if $(ENABLE_LIBCMIS),ucb/source/ucp/cmis/ucpcmis1) \ ucb/source/ucp/expand/ucpexpand1 \ ucb/source/ucp/ext/ucpext \ ucb/source/ucp/file/ucpfile1 \ diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk index 0d0b83b573c1..03117a16a0d1 100644 --- a/ucb/Library_ucpcmis1.mk +++ b/ucb/Library_ucpcmis1.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_libraries,ucpcmis1,\ $(eval $(call gb_Library_use_externals,ucpcmis1,\ boost_headers \ boost_date_time \ - cmis \ + libcmis \ curl \ libxml2 \ )) diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk index fca05b8f4f5f..dc1405e72992 100644 --- a/ucb/Module_ucb.mk +++ b/ucb/Module_ucb.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,ucb,\ Library_cached1 \ Library_srtrs1 \ Library_ucb1 \ - $(if $(ENABLE_CMIS),Library_ucpcmis1) \ + $(if $(ENABLE_LIBCMIS),Library_ucpcmis1) \ $(if $(WITH_WEBDAV),Library_ucpdav1) \ Library_ucpexpand1 \ Library_ucpext \ |