diff options
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libcmis/Makefile (renamed from libcmis/Makefile) | 2 | ||||
| -rw-r--r-- | external/libcmis/Module_libcmis.mk (renamed from libcmis/Module_libcmis.mk) | 4 | ||||
| -rw-r--r-- | external/libcmis/README (renamed from libcmis/README) | 0 | ||||
| -rw-r--r-- | external/libcmis/StaticLibrary_cmis.mk (renamed from libcmis/StaticLibrary_cmis.mk) | 0 | ||||
| -rw-r--r-- | external/libcmis/UnpackedTarball_cmis.mk (renamed from libcmis/UnpackedTarball_cmis.mk) | 6 | ||||
| -rw-r--r-- | external/libcmis/boost-win.patch (renamed from libcmis/boost-win.patch) | 0 | ||||
| -rw-r--r-- | external/libcmis/libcmis-0.4.1-empty-path.patch (renamed from libcmis/libcmis-0.4.1-empty-path.patch) | 0 | ||||
| -rw-r--r-- | external/libcmis/libcmis-0.4.1.patch (renamed from libcmis/libcmis-0.4.1.patch) | 0 |
10 files changed, 5 insertions, 9 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index fe4fc94ebb59..f7f85d7120ae 100644 --- a/RepositoryModule_host.mk +++ b/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) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 6764ac4126b3..c65474e84d01 100644 --- a/external/Module_external.mk +++ b/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) \ diff --git a/libcmis/Makefile b/external/libcmis/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libcmis/Makefile +++ b/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: diff --git a/libcmis/Module_libcmis.mk b/external/libcmis/Module_libcmis.mk index ad8aa7a2965f..b45f1ed8b0f8 100644 --- a/libcmis/Module_libcmis.mk +++ b/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: diff --git a/libcmis/README b/external/libcmis/README index c39861a7614f..c39861a7614f 100644 --- a/libcmis/README +++ b/external/libcmis/README diff --git a/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk index f87df26dea9f..f87df26dea9f 100644 --- a/libcmis/StaticLibrary_cmis.mk +++ b/external/libcmis/StaticLibrary_cmis.mk diff --git a/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk index d984c8535577..75f5753a21f8 100644 --- a/libcmis/UnpackedTarball_cmis.mk +++ b/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: diff --git a/libcmis/boost-win.patch b/external/libcmis/boost-win.patch index 7d9508bea071..7d9508bea071 100644 --- a/libcmis/boost-win.patch +++ b/external/libcmis/boost-win.patch diff --git a/libcmis/libcmis-0.4.1-empty-path.patch b/external/libcmis/libcmis-0.4.1-empty-path.patch index c48265d21681..c48265d21681 100644 --- a/libcmis/libcmis-0.4.1-empty-path.patch +++ b/external/libcmis/libcmis-0.4.1-empty-path.patch diff --git a/libcmis/libcmis-0.4.1.patch b/external/libcmis/libcmis-0.4.1.patch index 214475fc575d..214475fc575d 100644 --- a/libcmis/libcmis-0.4.1.patch +++ b/external/libcmis/libcmis-0.4.1.patch |