diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-13 00:11:13 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 14:05:26 +0200 |
commit | ef0155814e096be38ac4511a3628e3e1a4d18da3 (patch) | |
tree | a930de19d90326f4b54ca4e8485535e123511ce1 /external/glyphy | |
parent | 25d60232ff5d882017ffb88453f16fd6cef5534c (diff) |
integrate glyphy into the build
The used glyphy is not directly the upstream version. We currently use a
patched version that allows to disable the build for the demos.
Change-Id: Ic03355e1ea8fbc56e57afa4f90a55741fe9a563a
Diffstat (limited to 'external/glyphy')
-rw-r--r-- | external/glyphy/ExternalPackage_glyphy.mk | 14 | ||||
-rw-r--r-- | external/glyphy/ExternalProject_glyphy.mk | 38 | ||||
-rw-r--r-- | external/glyphy/Makefile | 7 | ||||
-rw-r--r-- | external/glyphy/Module_glyphy.mk | 21 | ||||
-rw-r--r-- | external/glyphy/UnpackedTarball_glyphy.mk | 16 |
5 files changed, 96 insertions, 0 deletions
diff --git a/external/glyphy/ExternalPackage_glyphy.mk b/external/glyphy/ExternalPackage_glyphy.mk new file mode 100644 index 000000000000..484590d20919 --- /dev/null +++ b/external/glyphy/ExternalPackage_glyphy.mk @@ -0,0 +1,14 @@ +# -*- 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,glyphy,glyphy)) + +$(eval $(call gb_ExternalPackage_use_external_project,glyphy,glyphy)) + +# vim: set noet sw=4 ts=4: diff --git a/external/glyphy/ExternalProject_glyphy.mk b/external/glyphy/ExternalProject_glyphy.mk new file mode 100644 index 000000000000..1eda01561b66 --- /dev/null +++ b/external/glyphy/ExternalProject_glyphy.mk @@ -0,0 +1,38 @@ +# -*- 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,glyphy)) + +$(eval $(call gb_ExternalProject_use_autoconf,glyphy,build)) + +$(eval $(call gb_ExternalProject_register_targets,glyphy,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,glyphy, \ + glew \ +)) + +$(call gb_ExternalProject_get_state_target,glyphy,build) : + $(call gb_ExternalProject_run,build,\ + MAKE=$(MAKE) ./configure \ + --with-pic \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && $(if $(verbose),V=1) \ + $(MAKE) \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/glyphy/Makefile b/external/glyphy/Makefile new file mode 100644 index 000000000000..e4968cf85fb6 --- /dev/null +++ b/external/glyphy/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/external/glyphy/Module_glyphy.mk b/external/glyphy/Module_glyphy.mk new file mode 100644 index 000000000000..084c5425b6dc --- /dev/null +++ b/external/glyphy/Module_glyphy.mk @@ -0,0 +1,21 @@ +# -*- 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,glyphy)) + +$(eval $(call gb_Module_add_targets,liborcus,\ + UnpackedTarball_glyphy \ +)) + +$(eval $(call gb_Module_add_targets,glyphy,\ + ExternalPackage_glyphy \ + ExternalProject_glyphy \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/glyphy/UnpackedTarball_glyphy.mk b/external/glyphy/UnpackedTarball_glyphy.mk new file mode 100644 index 000000000000..8e2244b94451 --- /dev/null +++ b/external/glyphy/UnpackedTarball_glyphy.mk @@ -0,0 +1,16 @@ +# -*- 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,glyphy)) + +$(eval $(call gb_UnpackedTarball_set_tarball,glyphy,$(GLYPHY_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,glyphy,1)) + +# vim: set noet sw=4 ts=4: |