diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 20:00:06 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:35:24 +0000 |
commit | 1359fba53064d726d55853881d24d793598a5008 (patch) | |
tree | f0b1c20b163125e2cd934326c4c4a92c59fe714a /external | |
parent | fc26490252a63b851560be0af97e14b784a20350 (diff) |
fdo#70393: move libmspub to a subdir of external
Change-Id: Ib93e41b2ebd7f466c28e6a52ea6ad16dd216642e
Reviewed-on: https://gerrit.libreoffice.org/6331
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/libmspub/ExternalProject_libmspub.mk | 43 | ||||
-rw-r--r-- | external/libmspub/Makefile | 7 | ||||
-rw-r--r-- | external/libmspub/Module_libmspub.mk | 17 | ||||
-rw-r--r-- | external/libmspub/README | 1 | ||||
-rw-r--r-- | external/libmspub/UnpackedTarball_libmspub.mk | 14 |
6 files changed, 83 insertions, 0 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index 30249aa67e7f..81c97ae81a28 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBPNG,libpng) \ + $(call gb_Helper_optional,MSPUB,libmspub) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk new file mode 100644 index 000000000000..9da4dc5156e3 --- /dev/null +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -0,0 +1,43 @@ +# -*- 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,libmspub)) + +$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build)) + +$(eval $(call gb_ExternalProject_register_targets,libmspub,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libmspub,\ + boost_headers \ + icu \ + wpd \ + wpg \ +)) + +$(call gb_ExternalProject_get_state_target,libmspub,build) : + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-debug \ + --disable-werror \ + --disable-weffc \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && (cd $(EXTERNAL_WORKDIR)/src/lib && \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE)) \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/libmspub/Makefile b/external/libmspub/Makefile new file mode 100644 index 000000000000..e4968cf85fb6 --- /dev/null +++ b/external/libmspub/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/libmspub/Module_libmspub.mk b/external/libmspub/Module_libmspub.mk new file mode 100644 index 000000000000..81ea7e91d547 --- /dev/null +++ b/external/libmspub/Module_libmspub.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,libmspub)) + +$(eval $(call gb_Module_add_targets,libmspub,\ + ExternalProject_libmspub \ + UnpackedTarball_libmspub \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libmspub/README b/external/libmspub/README new file mode 100644 index 000000000000..6d2765a1e7f2 --- /dev/null +++ b/external/libmspub/README @@ -0,0 +1 @@ +Library parsing the Microsoft Publisher documents. diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk new file mode 100644 index 000000000000..044ce9656c49 --- /dev/null +++ b/external/libmspub/UnpackedTarball_libmspub.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,libmspub)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL))) + +# vim: set noet sw=4 ts=4: |