diff options
| -rw-r--r-- | RepositoryExternal.mk | 1 | ||||
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 1 | ||||
| -rw-r--r-- | external/fontconfig/ExternalPackage_fontconfig.mk | 18 | ||||
| -rw-r--r-- | external/fontconfig/Module_fontconfig.mk | 1 |
4 files changed, 2 insertions, 19 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1f4ab02c26d1..2c16904122ed 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1115,6 +1115,7 @@ endef else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_fontconfig +$(call gb_LinkTarget_use_external_project,$(1),fontconfig) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,fontconfig) \ $$(INCLUDE) \ diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 0d1bfc1b670e..73d7d0a6a0e8 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -89,6 +89,7 @@ LIBS = \ $(HYPHEN_LIB) \ $(MYTHES_LIBS) \ $(wildcard $(WORKDIR)/UnpackedTarball/curl/lib/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \ 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 \ )) |