diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | libcmis/ExternalPackage_libcmis.mk | 28 | ||||
| -rw-r--r-- | libcmis/Module_libcmis.mk | 1 | ||||
| -rw-r--r-- | libcmis/StaticLibrary_cmis.mk | 2 |
4 files changed, 4 insertions, 31 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 813cf4d94258..5a9c2d50505d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -659,6 +659,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ )) define gb_LinkTarget__use_cmis +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,cmis)/src \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ cmislib \ ) diff --git a/libcmis/ExternalPackage_libcmis.mk b/libcmis/ExternalPackage_libcmis.mk deleted file mode 100644 index 44f665594587..000000000000 --- a/libcmis/ExternalPackage_libcmis.mk +++ /dev/null @@ -1,28 +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_ExternalPackage_ExternalPackage,libcmis_inc,cmis)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,libcmis_inc,inc/external/libcmis,\ - src/libcmis/allowable-actions.hxx \ - src/libcmis/document.hxx \ - src/libcmis/exception.hxx \ - src/libcmis/folder.hxx \ - src/libcmis/object-type.hxx \ - src/libcmis/object.hxx \ - src/libcmis/property-type.hxx \ - src/libcmis/property.hxx \ - src/libcmis/repository.hxx \ - src/libcmis/session-factory.hxx \ - src/libcmis/session.hxx \ - src/libcmis/xml-utils.hxx \ - src/libcmis/xmlserializable.hxx \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk index a7fb0fd7ebbd..ad8aa7a2965f 100644 --- a/libcmis/Module_libcmis.mk +++ b/libcmis/Module_libcmis.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,libcmis)) ifeq ($(SYSTEM_CMIS),NO) $(eval $(call gb_Module_add_targets,libcmis,\ - ExternalPackage_libcmis \ StaticLibrary_cmis \ UnpackedTarball_cmis \ )) diff --git a/libcmis/StaticLibrary_cmis.mk b/libcmis/StaticLibrary_cmis.mk index d79f852746f0..ace0326496eb 100644 --- a/libcmis/StaticLibrary_cmis.mk +++ b/libcmis/StaticLibrary_cmis.mk @@ -21,8 +21,6 @@ endif $(eval $(call gb_StaticLibrary_use_unpacked,cmislib,cmis)) -$(eval $(call gb_StaticLibrary_use_package,cmislib,libcmis_inc)) - $(eval $(call gb_StaticLibrary_use_externals,cmislib,\ boost_headers \ curl \ |