diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 11:01:41 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 13:10:38 +0200 |
commit | 76596b39484fdc3ffd54f68b966574ff4651ad8e (patch) | |
tree | 606cd15e4bcafe988a7262563d5ff4de78ef6c23 /external/fontconfig | |
parent | 5b90662d7a93cc0e77501ad2487f5e136bbc3fbf (diff) |
fontconfig: use libraries from WORKDIR
Change-Id: I4b967187bca35527a3c3d718952ae0a3ae6ebae9
Diffstat (limited to 'external/fontconfig')
-rw-r--r-- | external/fontconfig/ExternalPackage_fontconfig.mk | 18 | ||||
-rw-r--r-- | external/fontconfig/Module_fontconfig.mk | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/external/fontconfig/ExternalPackage_fontconfig.mk b/external/fontconfig/ExternalPackage_fontconfig.mk deleted file mode 100644 index bee7f01d94af..000000000000 --- a/external/fontconfig/ExternalPackage_fontconfig.mk +++ /dev/null @@ -1,18 +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,fontconfig,fontconfig)) - -$(eval $(call gb_ExternalPackage_use_external_project,fontconfig,fontconfig)) - -$(eval $(call gb_ExternalPackage_add_files,fontconfig,lib,\ - src/.libs/libfontconfig.a \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk index 1bfcbdb7878a..764af35cdb6e 100644 --- a/external/fontconfig/Module_fontconfig.mk +++ b/external/fontconfig/Module_fontconfig.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,fontconfig)) ifeq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,fontconfig,\ - ExternalPackage_fontconfig \ ExternalProject_fontconfig \ UnpackedTarball_fontconfig \ )) |