diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 12:08:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 13:10:38 +0200 |
| commit | b242cee828704e136a47165fb473513b9b909b27 (patch) | |
| tree | 3ca73586cf317ae9d154ce34df3d401d68b8caec /external | |
| parent | 76596b39484fdc3ffd54f68b966574ff4651ad8e (diff) | |
freetype: use libraries from WORKDIR
Change-Id: Ia31a6f56fd8347f6fc50677e86a414f4c5ed81b1
Diffstat (limited to 'external')
| -rw-r--r-- | external/fontconfig/ExternalProject_fontconfig.mk | 2 | ||||
| -rw-r--r-- | external/freetype/ExternalPackage_freetype.mk | 22 | ||||
| -rw-r--r-- | external/freetype/Module_freetype.mk | 1 |
3 files changed, 1 insertions, 24 deletions
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index a956e70c0807..74438d09d54b 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : --with-arch=arm \ --with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \ --with-expat-lib=$(gb_StaticLibrary_WORKDIR) \ - --with-freetype-config=$(OUTDIR)/bin/freetype-config \ + --with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/builds/unix/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ && $(MAKE) \ ) diff --git a/external/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk deleted file mode 100644 index 87067ad18407..000000000000 --- a/external/freetype/ExternalPackage_freetype.mk +++ /dev/null @@ -1,22 +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,freetype,freetype)) - -$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype)) - -$(eval $(call gb_ExternalPackage_add_files,freetype,lib,\ - objs/.libs/libfreetype.a \ -)) - -$(eval $(call gb_ExternalPackage_add_files,freetype,bin,\ - builds/unix/freetype-config \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index e0965a0deb2b..51badc871998 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,freetype)) ifeq ($(OS),ANDROID) $(eval $(call gb_Module_add_targets,freetype,\ - ExternalPackage_freetype \ ExternalProject_freetype \ UnpackedTarball_freetype \ )) |