diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:19:06 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:38:23 +0000 |
| commit | c979511247aff27d33941b3c73224d948bcfceb2 (patch) | |
| tree | 6ef0155b402cd4a50ec97e1596e2b10d81695b30 /libwpd | |
| parent | 5c077d3b85f0fab70bc6e78fbc3c307e81f13ad7 (diff) | |
fdo#70393: move libwpd to a subdir of external
Change-Id: I599cf45b455b59e082078d6b2d5ed2efb99b5862
Reviewed-on: https://gerrit.libreoffice.org/6336
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/ExternalProject_libwpd.mk | 34 | ||||
| -rw-r--r-- | libwpd/Makefile | 7 | ||||
| -rw-r--r-- | libwpd/Module_libwpd.mk | 21 | ||||
| -rw-r--r-- | libwpd/README | 1 | ||||
| -rw-r--r-- | libwpd/UnpackedTarball_libwpd.mk | 14 |
5 files changed, 0 insertions, 77 deletions
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk deleted file mode 100644 index 86cf806fc217..000000000000 --- a/libwpd/ExternalProject_libwpd.mk +++ /dev/null @@ -1,34 +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_ExternalProject_ExternalProject,libwpd)) - -$(eval $(call gb_ExternalProject_use_autoconf,libwpd,build)) - -$(eval $(call gb_ExternalProject_register_targets,libwpd,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,libwpd,build) : - $(call gb_ExternalProject_run,build,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ - ./configure \ - --with-pic \ - --enable-static \ - --disable-shared \ - --without-stream \ - --without-docs \ - --disable-debug \ - $(if $(filter MACOSX,$(OS)),--disable-werror) \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(if $(VERBOSE)$(verbose),V=1) \ - $(MAKE) \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/libwpd/Makefile b/libwpd/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/libwpd/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- 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/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk deleted file mode 100644 index f852c5cc6281..000000000000 --- a/libwpd/Module_libwpd.mk +++ /dev/null @@ -1,21 +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_Module_Module,libwpd)) - -ifeq ($(SYSTEM_WPD),NO) - -$(eval $(call gb_Module_add_targets,libwpd,\ - ExternalProject_libwpd \ - UnpackedTarball_libwpd \ -)) - -endif - -# vim: set noet sw=4 ts=4: diff --git a/libwpd/README b/libwpd/README deleted file mode 100644 index 2cc9c8a18b8b..000000000000 --- a/libwpd/README +++ /dev/null @@ -1 +0,0 @@ -From [http://libwpd.sourceforge.net/]. Not modified. WordPerfect filter - SAX api - emits callbacks when things happen. diff --git a/libwpd/UnpackedTarball_libwpd.mk b/libwpd/UnpackedTarball_libwpd.mk deleted file mode 100644 index d4b4c7a99e8d..000000000000 --- a/libwpd/UnpackedTarball_libwpd.mk +++ /dev/null @@ -1,14 +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_UnpackedTarball_UnpackedTarball,libwpd)) - -$(eval $(call gb_UnpackedTarball_set_tarball,libwpd,$(WPD_TARBALL))) - -# vim: set noet sw=4 ts=4: |