From 526c9bdd0408cc0b983c11b35a0aaefda93fad13 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 23 Oct 2012 21:42:24 +0200 Subject: fontconfig: convert to gbuild Change-Id: Ia0ba9294e36c30147ed52826eac4b0059cfed200 --- fontconfig/ExternalPackage_fontconfig.mk | 24 ++++++++++++ fontconfig/ExternalProject_fontconfig.mk | 34 ++++++++++++++++ fontconfig/Makefile | 7 ++++ fontconfig/Module_fontconfig.mk | 22 +++++++++++ fontconfig/UnpackedTarball_fontconfig.mk | 20 ++++++++++ fontconfig/makefile.mk | 67 -------------------------------- fontconfig/prj/d.lst | 4 -- fontconfig/prj/dmake | 0 8 files changed, 107 insertions(+), 71 deletions(-) create mode 100644 fontconfig/ExternalPackage_fontconfig.mk create mode 100644 fontconfig/ExternalProject_fontconfig.mk create mode 100644 fontconfig/Makefile create mode 100644 fontconfig/Module_fontconfig.mk create mode 100644 fontconfig/UnpackedTarball_fontconfig.mk delete mode 100644 fontconfig/makefile.mk delete mode 100644 fontconfig/prj/dmake (limited to 'fontconfig') diff --git a/fontconfig/ExternalPackage_fontconfig.mk b/fontconfig/ExternalPackage_fontconfig.mk new file mode 100644 index 000000000000..7f074e8ee15c --- /dev/null +++ b/fontconfig/ExternalPackage_fontconfig.mk @@ -0,0 +1,24 @@ +# -*- 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_unpacked_files,fontconfig,inc/fontconfig,\ + fontconfig/fcfreetype.h \ + fontconfig/fcprivate.h \ + fontconfig/fontconfig.h \ +)) + +$(eval $(call gb_ExternalPackage_add_files,fontconfig,lib,\ + src/.libs/libfontconfig.a \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk new file mode 100644 index 000000000000..b7d2eb5843f9 --- /dev/null +++ b/fontconfig/ExternalProject_fontconfig.mk @@ -0,0 +1,34 @@ +# -*- 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_ExternalProject_ExternalProject,fontconfig)) + +$(eval $(call gb_ExternalProject_use_unpacked,fontconfig,fontconfig)) + +$(eval $(call gb_ExternalProject_use_packages,fontconfig,\ + freetype \ +)) + +$(eval $(call gb_ExternalProject_register_targets,fontconfig,\ + build \ +)) + +$(call gb_ExternalProject_get_state_target,fontconfig,build) : + cd $(EXTERNAL_WORKDIR) \ + && $(if $(debug),CFLAGS=-g) ./configure \ + --disable-shared \ + --with-arch=arm \ + --with-expat-includes=$(OUTDIR)/inc/external \ + --with-expat-lib=$(OUTDIR)/lib \ + --with-freetype-config=$(OUTDIR)/bin/freetype-config \ + --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + && $(GNUMAKE) \ + && touch $@ + +# vim: set noet sw=4 ts=4: diff --git a/fontconfig/Makefile b/fontconfig/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/fontconfig/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/fontconfig/Module_fontconfig.mk b/fontconfig/Module_fontconfig.mk new file mode 100644 index 000000000000..1bfcbdb7878a --- /dev/null +++ b/fontconfig/Module_fontconfig.mk @@ -0,0 +1,22 @@ +# -*- 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_Module_Module,fontconfig)) + +ifeq ($(OS),ANDROID) + +$(eval $(call gb_Module_add_targets,fontconfig,\ + ExternalPackage_fontconfig \ + ExternalProject_fontconfig \ + UnpackedTarball_fontconfig \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/fontconfig/UnpackedTarball_fontconfig.mk b/fontconfig/UnpackedTarball_fontconfig.mk new file mode 100644 index 000000000000..7a6cfcbcf6b6 --- /dev/null +++ b/fontconfig/UnpackedTarball_fontconfig.mk @@ -0,0 +1,20 @@ +# -*- 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_UnpackedTarball_UnpackedTarball,fontconfig)) + +$(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,3)) + +$(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\ + fontconfig/fontconfig-2.8.0.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk deleted file mode 100644 index 55375c6758be..000000000000 --- a/fontconfig/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=fontconfig -TARGET=fontconfig - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=fontconfig-2.8.0 -TARFILE_MD5=77e15a92006ddc2adbb06f840d591c0e - -PATCH_FILES=$(TARFILE_NAME).patch - -CONFIGURE_ACTION=./configure - -.IF "$(debug)" != "" -CONFIGURE_ACTION!:=CFLAGS=-g $(CONFIGURE_ACTION) -.ENDIF - -# This "bundled" fontconfig is built only when cross-compiling for Android - -CONFIGURE_FLAGS=\ - --disable-shared \ - --with-arch=arm \ - --with-expat-includes=$(SOLARVER)/$(INPATH)/inc/external \ - --with-expat-lib=$(SOLARVER)/$(INPATH)/lib \ - --with-freetype-config=$(SOLARVER)/$(INPATH)/bin/freetype-config \ - --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) - -BUILD_ACTION=$(GNUMAKE) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - diff --git a/fontconfig/prj/d.lst b/fontconfig/prj/d.lst index aeb7edf32a7e..e69de29bb2d1 100644 --- a/fontconfig/prj/d.lst +++ b/fontconfig/prj/d.lst @@ -1,4 +0,0 @@ -..\%__SRC%\misc\build\fontconfig*\src\.libs\*.a %_DEST%\lib - -mkdir: %_DEST%\inc\external\fontconfig -..\%__SRC%\misc\build\fontconfig*\fontconfig\*.h %_DEST%\inc\external\fontconfig diff --git a/fontconfig/prj/dmake b/fontconfig/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 -- cgit