diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:12:43 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:36:47 +0000 |
commit | 9b4b718b5b049aff0077202c26d057b14bc29511 (patch) | |
tree | 73281b97da6b8fe927141aab6d1ee12ac9a4b668 /external | |
parent | 2728c6e8da276c1955878f766c71acd0fd59c9ce (diff) |
fdo#70393: move libodfgen to a subdir of external
Change-Id: If43571222806df4c3d25ab88eab3b1755f583d5a
Reviewed-on: https://gerrit.libreoffice.org/6333
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/libodfgen/ExternalProject_libodfgen.mk | 41 | ||||
-rw-r--r-- | external/libodfgen/Makefile | 7 | ||||
-rw-r--r-- | external/libodfgen/Module_libodfgen.mk | 17 | ||||
-rw-r--r-- | external/libodfgen/README | 1 | ||||
-rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 14 |
6 files changed, 81 insertions, 0 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index e3bcd470a8c6..5e60a64c6974 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBPNG,libpng) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ + $(call gb_Helper_optional,ODFGEN,libodfgen) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk new file mode 100644 index 000000000000..8514282c57b4 --- /dev/null +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -0,0 +1,41 @@ +# -*- 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,libodfgen)) + +$(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build)) + +$(eval $(call gb_ExternalProject_register_targets,libodfgen,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libodfgen,\ + boost_headers \ + wpd \ + wpg \ +)) + +$(call gb_ExternalProject_get_state_target,libodfgen,build) : + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --disable-debug \ + --disable-werror \ + --disable-weffc \ + CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && (cd $(EXTERNAL_WORKDIR)/src && \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE)) \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/Makefile b/external/libodfgen/Makefile new file mode 100644 index 000000000000..e4968cf85fb6 --- /dev/null +++ b/external/libodfgen/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/libodfgen/Module_libodfgen.mk b/external/libodfgen/Module_libodfgen.mk new file mode 100644 index 000000000000..d94d34f7c596 --- /dev/null +++ b/external/libodfgen/Module_libodfgen.mk @@ -0,0 +1,17 @@ +# -*- 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,libodfgen)) + +$(eval $(call gb_Module_add_targets,libodfgen,\ + ExternalProject_libodfgen \ + UnpackedTarball_libodfgen \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/README b/external/libodfgen/README new file mode 100644 index 000000000000..efeffac5dc21 --- /dev/null +++ b/external/libodfgen/README @@ -0,0 +1 @@ +From [http://libwpg.sourceforge.net/]. Library to generate ODT and ODG documents from libwpd and libwpg API calls. diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk new file mode 100644 index 000000000000..1a7f26cf9a8c --- /dev/null +++ b/external/libodfgen/UnpackedTarball_libodfgen.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_UnpackedTarball_UnpackedTarball,libodfgen)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) + +# vim: set noet sw=4 ts=4: |