libcmis: remove ExternalPackage_libcmis.mk

Change-Id: Ib81300d8606281d7de46382c4f251f58ffffb5ad

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 \
 )

libcmis/ExternalPackage_libcmis.mk

-# -*- 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:

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 \
 ))

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 \