From a52215833280fd2c76d6df491a199f1ffab3e040 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 18 Oct 2013 18:55:45 +0200 Subject: [PATCH] fdo#70393: move libcmis to a subdir of external Change-Id: I602ae9b173e42d668cd9383fa0d2517576db12bf Reviewed-on: https://gerrit.libreoffice.org/6326 Reviewed-by: David Tardon Tested-by: David Tardon --- RepositoryModule_host.mk | 1 - external/Module_external.mk | 1 + {libcmis => external/libcmis}/Makefile | 2 +- {libcmis => external/libcmis}/Module_libcmis.mk | 4 ---- {libcmis => external/libcmis}/README | 0 {libcmis => external/libcmis}/StaticLibrary_cmis.mk | 0 {libcmis => external/libcmis}/UnpackedTarball_cmis.mk | 6 +++--- {libcmis => external/libcmis}/boost-win.patch | 0 .../libcmis}/libcmis-0.4.1-empty-path.patch | 0 {libcmis => external/libcmis}/libcmis-0.4.1.patch | 0 10 files changed, 5 insertions(+), 9 deletions(-) rename {libcmis => external/libcmis}/Makefile (71%) rename {libcmis => external/libcmis}/Module_libcmis.mk (93%) rename {libcmis => external/libcmis}/README (100%) rename {libcmis => external/libcmis}/StaticLibrary_cmis.mk (100%) rename {libcmis => external/libcmis}/UnpackedTarball_cmis.mk (76%) rename {libcmis => external/libcmis}/boost-win.patch (100%) rename {libcmis => external/libcmis}/libcmis-0.4.1-empty-path.patch (100%) rename {libcmis => external/libcmis}/libcmis-0.4.1.patch (100%) 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 similarity index 71% rename from libcmis/Makefile rename to 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 similarity index 93% rename from libcmis/Module_libcmis.mk rename to 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 similarity index 100% rename from libcmis/README rename to external/libcmis/README diff --git a/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk similarity index 100% rename from libcmis/StaticLibrary_cmis.mk rename to external/libcmis/StaticLibrary_cmis.mk diff --git a/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk similarity index 76% rename from libcmis/UnpackedTarball_cmis.mk rename to 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 similarity index 100% rename from libcmis/boost-win.patch rename to 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 similarity index 100% rename from libcmis/libcmis-0.4.1-empty-path.patch rename to 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 similarity index 100% rename from libcmis/libcmis-0.4.1.patch rename to external/libcmis/libcmis-0.4.1.patch