libwpd: convert to gbuild

Change-Id: I5a8d3979e8b3e1e3d33882715fbb61f37bf27e35

Makefile.top

@@ -89,6 +89,7 @@ l10ntools\
 libcdr\
 libmspub\
 libvisio\
+libwpd\
 libwpg\
 libwps\
 lingucomponent\
@@ -216,7 +217,6 @@ liblangtag\
 liborcus\
 libpng\
 librsvg\
-libwpd\
 libxml2\
 libxmlsec\
 libxslt\

Module_tail_build.mk

@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	libcdr \
 	libmspub \
 	libvisio \
+	libwpd \
 	libwpg \
 	libwps \
     lingucomponent \

RepositoryModule_ooo.mk

@@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	libcdr \
 	libmspub \
 	libvisio \
+	libwpd \
 	libwpg \
 	libwps \
     lingucomponent \

config_host.mk.in

@@ -620,6 +620,7 @@ export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
 export WORK_STAMP=@SOURCEVERSION@
 export WPD_CFLAGS=@WPD_CFLAGS@
 export WPD_LIBS=@WPD_LIBS@
+export WPD_TARBALL=@WPD_TARBALL@
 export WPG_CFLAGS=@WPG_CFLAGS@
 export WPG_LIBS=@WPG_LIBS@
 export WPG_TARBALL=@WPG_TARBALL@

configure.in

@@ -6700,11 +6700,12 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPD=NO
-    BUILD_TYPE="$BUILD_TYPE LIBWPD"
+    WPD_TARBALL=c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBWPD)
 AC_SUBST(WPD_CFLAGS)
 AC_SUBST(WPD_LIBS)
+AC_SUBST(WPD_TARBALL)
 
 dnl ===================================================================
 dnl Check for system lcms2

libcdr/prj/build.lst

-cdr	libcdr	: LIBWPD:libwpd libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL
+cdr	libcdr	: libwpd libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL
 cdr	libcdr	usr1	-	all	cdr_mkout NULL
 cdr	libcdr	nmake	-	all	cdr_libcdr NULL

libmspub/prj/build.lst

-mspub	libmspub	: LIBWPD:libwpd libwpg ZLIB:zlib BOOST:boost soltools NULL
+mspub	libmspub	: libwpd libwpg ZLIB:zlib BOOST:boost soltools NULL
 mspub	libmspub	usr1	-	all	mspub_mkout NULL
 mspub	libmspub	nmake	-	all	mspub_libmspub NULL

libvisio/prj/build.lst

-vsd	libvisio	: LIBWPD:libwpd libwpg BOOST:boost soltools NULL
+vsd	libvisio	: libwpd libwpg BOOST:boost soltools NULL
 vsd	libvisio	usr1	-	all	vsd_mkout NULL
 vsd	libvisio	nmake	-	all	vsd_libvisio NULL

libwpd/Makefile

+# -*- 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:

libwpd/Module_libwpd.mk

+# -*- 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_LIBWPD),NO)
+
+$(eval $(call gb_Module_add_targets,libwpd,\
+	Package_libwpd \
+	StaticLibrary_wpd \
+	UnpackedTarball_wpd \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:

libwpd/Package_libwpd.mk

+# -*- 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_Package_Package,libwpd_inc,$(call gb_UnpackedTarball_get_dir,wpd/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libwpd_inc,wpd))
+
+$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\
+	libwpd.h \
+	WPDocument.h \
+	WPXBinaryData.h \
+	WPXDocumentInterface.h \
+	WPXProperty.h \
+	WPXPropertyList.h \
+	WPXString.h \
+	WPXPropertyListVector.h \
+))
+
+$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd-stream,\
+	libwpd-stream.h \
+	WPXStream.h \
+	WPXStreamImplementation.h \
+))
+
+# vim: set noet sw=4 ts=4:

libwpd/StaticLibrary_wpd.mk

+# -*- 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_StaticLibrary_StaticLibrary,wpdlib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,wpdlib,wpd))
+
+$(eval $(call gb_StaticLibrary_use_package,wpdlib,libwpd_inc))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpdlib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpdlib,\
+	UnpackedTarball/wpd/src/lib/libwpd_internal \
+	UnpackedTarball/wpd/src/lib/libwpd_math \
+	UnpackedTarball/wpd/src/lib/WP1BottomMarginGroup \
+	UnpackedTarball/wpd/src/lib/WP1CenterTextGroup \
+	UnpackedTarball/wpd/src/lib/WP1ContentListener \
+	UnpackedTarball/wpd/src/lib/WP1ExtendedCharacterGroup \
+	UnpackedTarball/wpd/src/lib/WP1FileStructure \
+	UnpackedTarball/wpd/src/lib/WP1FixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP1FlushRightGroup \
+	UnpackedTarball/wpd/src/lib/WP1FontIdGroup \
+	UnpackedTarball/wpd/src/lib/WP1FootnoteEndnoteGroup \
+	UnpackedTarball/wpd/src/lib/WP1HeaderFooterGroup \
+	UnpackedTarball/wpd/src/lib/WP1Heuristics \
+	UnpackedTarball/wpd/src/lib/WP1JustificationGroup \
+	UnpackedTarball/wpd/src/lib/WP1LeftIndentGroup \
+	UnpackedTarball/wpd/src/lib/WP1LeftRightIndentGroup \
+	UnpackedTarball/wpd/src/lib/WP1Listener \
+	UnpackedTarball/wpd/src/lib/WP1MarginReleaseGroup \
+	UnpackedTarball/wpd/src/lib/WP1MarginResetGroup \
+	UnpackedTarball/wpd/src/lib/WP1Parser \
+	UnpackedTarball/wpd/src/lib/WP1Part \
+	UnpackedTarball/wpd/src/lib/WP1PictureGroup \
+	UnpackedTarball/wpd/src/lib/WP1PointSizeGroup \
+	UnpackedTarball/wpd/src/lib/WP1SetTabsGroup \
+	UnpackedTarball/wpd/src/lib/WP1SpacingResetGroup \
+	UnpackedTarball/wpd/src/lib/WP1StylesListener \
+	UnpackedTarball/wpd/src/lib/WP1SubDocument \
+	UnpackedTarball/wpd/src/lib/WP1SuppressPageCharacteristicsGroup \
+	UnpackedTarball/wpd/src/lib/WP1TopMarginGroup \
+	UnpackedTarball/wpd/src/lib/WP1UnsupportedFixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP1UnsupportedVariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP1VariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP3AttributeGroup \
+	UnpackedTarball/wpd/src/lib/WP3ContentListener \
+	UnpackedTarball/wpd/src/lib/WP3DefinitionGroup \
+	UnpackedTarball/wpd/src/lib/WP3DisplayGroup \
+	UnpackedTarball/wpd/src/lib/WP3DoubleByteScriptCharacterGroup \
+	UnpackedTarball/wpd/src/lib/WP3EndOfLinePageGroup \
+	UnpackedTarball/wpd/src/lib/WP3ExtendedCharacterGroup \
+	UnpackedTarball/wpd/src/lib/WP3FileStructure \
+	UnpackedTarball/wpd/src/lib/WP3FixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP3FontGroup \
+	UnpackedTarball/wpd/src/lib/WP3FootnoteEndnoteGroup \
+	UnpackedTarball/wpd/src/lib/WP3Header \
+	UnpackedTarball/wpd/src/lib/WP3HeaderFooterGroup \
+	UnpackedTarball/wpd/src/lib/WP3IndentGroup \
+	UnpackedTarball/wpd/src/lib/WP3Listener \
+	UnpackedTarball/wpd/src/lib/WP3MiscellaneousGroup \
+	UnpackedTarball/wpd/src/lib/WP3PageFormatGroup \
+	UnpackedTarball/wpd/src/lib/WP3Parser \
+	UnpackedTarball/wpd/src/lib/WP3Part \
+	UnpackedTarball/wpd/src/lib/WP3Resource \
+	UnpackedTarball/wpd/src/lib/WP3ResourceFork \
+	UnpackedTarball/wpd/src/lib/WP3SingleByteFunction \
+	UnpackedTarball/wpd/src/lib/WP3StylesListener \
+	UnpackedTarball/wpd/src/lib/WP3SubDocument \
+	UnpackedTarball/wpd/src/lib/WP3TabGroup \
+	UnpackedTarball/wpd/src/lib/WP3TablesGroup \
+	UnpackedTarball/wpd/src/lib/WP3UndoGroup \
+	UnpackedTarball/wpd/src/lib/WP3UnsupportedFixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP3UnsupportedVariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP3VariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP3WindowGroup \
+	UnpackedTarball/wpd/src/lib/WP42ContentListener \
+	UnpackedTarball/wpd/src/lib/WP42DefineColumnsGroup \
+	UnpackedTarball/wpd/src/lib/WP42ExtendedCharacterGroup \
+	UnpackedTarball/wpd/src/lib/WP42FileStructure \
+	UnpackedTarball/wpd/src/lib/WP42HeaderFooterGroup \
+	UnpackedTarball/wpd/src/lib/WP42Heuristics \
+	UnpackedTarball/wpd/src/lib/WP42Listener \
+	UnpackedTarball/wpd/src/lib/WP42MarginResetGroup \
+	UnpackedTarball/wpd/src/lib/WP42MultiByteFunctionGroup \
+	UnpackedTarball/wpd/src/lib/WP42Parser \
+	UnpackedTarball/wpd/src/lib/WP42Part \
+	UnpackedTarball/wpd/src/lib/WP42StylesListener \
+	UnpackedTarball/wpd/src/lib/WP42SubDocument \
+	UnpackedTarball/wpd/src/lib/WP42SuppressPageCharacteristicsGroup \
+	UnpackedTarball/wpd/src/lib/WP42UnsupportedMultiByteFunctionGroup \
+	UnpackedTarball/wpd/src/lib/WP5AttributeGroup \
+	UnpackedTarball/wpd/src/lib/WP5BoxGroup \
+	UnpackedTarball/wpd/src/lib/WP5ContentListener \
+	UnpackedTarball/wpd/src/lib/WP5DefinitionGroup \
+	UnpackedTarball/wpd/src/lib/WP5ExtendedCharacterGroup \
+	UnpackedTarball/wpd/src/lib/WP5FileStructure \
+	UnpackedTarball/wpd/src/lib/WP5FixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP5FontGroup \
+	UnpackedTarball/wpd/src/lib/WP5FontNameStringPoolPacket \
+	UnpackedTarball/wpd/src/lib/WP5FootnoteEndnoteGroup \
+	UnpackedTarball/wpd/src/lib/WP5GeneralPacketData \
+	UnpackedTarball/wpd/src/lib/WP5GeneralPacketIndex \
+	UnpackedTarball/wpd/src/lib/WP5GraphicsInformationPacket \
+	UnpackedTarball/wpd/src/lib/WP5Header \
+	UnpackedTarball/wpd/src/lib/WP5HeaderFooterGroup \
+	UnpackedTarball/wpd/src/lib/WP5IndentGroup \
+	UnpackedTarball/wpd/src/lib/WP5Listener \
+	UnpackedTarball/wpd/src/lib/WP5ListFontsUsedPacket \
+	UnpackedTarball/wpd/src/lib/WP5PageFormatGroup \
+	UnpackedTarball/wpd/src/lib/WP5Parser \
+	UnpackedTarball/wpd/src/lib/WP5Part \
+	UnpackedTarball/wpd/src/lib/WP5PrefixData \
+	UnpackedTarball/wpd/src/lib/WP5SingleByteFunction \
+	UnpackedTarball/wpd/src/lib/WP5SpecialHeaderIndex \
+	UnpackedTarball/wpd/src/lib/WP5StylesListener \
+	UnpackedTarball/wpd/src/lib/WP5SubDocument \
+	UnpackedTarball/wpd/src/lib/WP5TabGroup \
+	UnpackedTarball/wpd/src/lib/WP5TableEOLGroup \
+	UnpackedTarball/wpd/src/lib/WP5TableEOPGroup \
+	UnpackedTarball/wpd/src/lib/WP5UnsupportedFixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP5UnsupportedVariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP5VariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP60Header \
+	UnpackedTarball/wpd/src/lib/WP61Header \
+	UnpackedTarball/wpd/src/lib/WP6AttributeGroup \
+	UnpackedTarball/wpd/src/lib/WP6BoxGroup \
+	UnpackedTarball/wpd/src/lib/WP6CharacterGroup \
+	UnpackedTarball/wpd/src/lib/WP6ColumnGroup \
+	UnpackedTarball/wpd/src/lib/WP6CommentAnnotationPacket \
+	UnpackedTarball/wpd/src/lib/WP6ContentListener \
+	UnpackedTarball/wpd/src/lib/WP6DefaultInitialFontPacket \
+	UnpackedTarball/wpd/src/lib/WP6DisplayNumberReferenceGroup \
+	UnpackedTarball/wpd/src/lib/WP6EOLGroup \
+	UnpackedTarball/wpd/src/lib/WP6ExtendedCharacterGroup \
+	UnpackedTarball/wpd/src/lib/WP6ExtendedDocumentSummaryPacket \
+	UnpackedTarball/wpd/src/lib/WP6FileStructure \
+	UnpackedTarball/wpd/src/lib/WP6FillStylePacket \
+	UnpackedTarball/wpd/src/lib/WP6FixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP6FontDescriptorPacket \
+	UnpackedTarball/wpd/src/lib/WP6FootnoteEndnoteGroup \
+	UnpackedTarball/wpd/src/lib/WP6GeneralTextPacket \
+	UnpackedTarball/wpd/src/lib/WP6GraphicsBoxStylePacket \
+	UnpackedTarball/wpd/src/lib/WP6GraphicsCachedFileDataPacket \
+	UnpackedTarball/wpd/src/lib/WP6GraphicsFilenamePacket \
+	UnpackedTarball/wpd/src/lib/WP6Header \
+	UnpackedTarball/wpd/src/lib/WP6HeaderFooterGroup \
+	UnpackedTarball/wpd/src/lib/WP6HighlightGroup \
+	UnpackedTarball/wpd/src/lib/WP6Listener \
+	UnpackedTarball/wpd/src/lib/WP6NumberingMethodGroup \
+	UnpackedTarball/wpd/src/lib/WP6OutlineStylePacket \
+	UnpackedTarball/wpd/src/lib/WP6PageGroup \
+	UnpackedTarball/wpd/src/lib/WP6ParagraphGroup \
+	UnpackedTarball/wpd/src/lib/WP6Parser \
+	UnpackedTarball/wpd/src/lib/WP6Part \
+	UnpackedTarball/wpd/src/lib/WP6PrefixData \
+	UnpackedTarball/wpd/src/lib/WP6PrefixDataPacket \
+	UnpackedTarball/wpd/src/lib/WP6PrefixIndice \
+	UnpackedTarball/wpd/src/lib/WP6SetNumberGroup \
+	UnpackedTarball/wpd/src/lib/WP6SingleByteFunction \
+	UnpackedTarball/wpd/src/lib/WP6StyleGroup \
+	UnpackedTarball/wpd/src/lib/WP6StylesListener \
+	UnpackedTarball/wpd/src/lib/WP6SubDocument \
+	UnpackedTarball/wpd/src/lib/WP6TabGroup \
+	UnpackedTarball/wpd/src/lib/WP6TableStylePacket \
+	UnpackedTarball/wpd/src/lib/WP6UndoGroup \
+	UnpackedTarball/wpd/src/lib/WP6UnsupportedFixedLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP6UnsupportedVariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WP6VariableLengthGroup \
+	UnpackedTarball/wpd/src/lib/WPDocument \
+	UnpackedTarball/wpd/src/lib/WPXBinaryData \
+	UnpackedTarball/wpd/src/lib/WPXContentListener \
+	UnpackedTarball/wpd/src/lib/WPXEncryption \
+	UnpackedTarball/wpd/src/lib/WPXHeader \
+	UnpackedTarball/wpd/src/lib/WPXListener \
+	UnpackedTarball/wpd/src/lib/WPXMemoryStream \
+	UnpackedTarball/wpd/src/lib/WPXPageSpan \
+	UnpackedTarball/wpd/src/lib/WPXParser \
+	UnpackedTarball/wpd/src/lib/WPXProperty \
+	UnpackedTarball/wpd/src/lib/WPXPropertyList \
+	UnpackedTarball/wpd/src/lib/WPXPropertyListVector \
+	UnpackedTarball/wpd/src/lib/WPXString \
+	UnpackedTarball/wpd/src/lib/WPXStylesListener \
+	UnpackedTarball/wpd/src/lib/WPXSubDocument \
+	UnpackedTarball/wpd/src/lib/WPXTable \
+))
+
+# vim: set noet sw=4 ts=4:

libwpd/UnpackedTarball_wpd.mk

+# -*- 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,wpd))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,wpd,\
+	libwpd/libwpd-0.9.4.patch \
+))
+
+# vim: set noet sw=4 ts=4:

libwpd/makefile.mk

-#*************************************************************************
-#
-# 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=wpd
-TARGET=wpd
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-@all:
-    @echo "Using system libwpd..."
-.ENDIF
-
-TARFILE_NAME=libwpd-0.9.4
-TARFILE_MD5=c01351d7db2b205de755d58769288224
-
-#PATCH_FILES=
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-PATCH_FILES=\
-	$(TARFILE_NAME).patch
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
-

libwpd/prj/d.lst

-mkdir: %_DEST%\inc\libwpd
-mkdir: %_DEST%\inc\libwpd-stream
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib

libwpg/prj/build.lst

-lwpg	libwpg	: LIBWPD:libwpd soltools NULL
+lwpg	libwpg	: libwpd soltools NULL
 lwpg	libwpg	usr1	-	all	lwpg_mkout NULL
 lwpg	libwpg	nmake	-	all	lwpg_libwpg NULL

libwps/prj/build.lst

-lwps	libwps	: LIBWPD:libwpd BOOST:boost soltools NULL
+lwps	libwps	: libwpd BOOST:boost soltools NULL
 lwps	libwps	usr1	-	all	lwps_mkout NULL
 lwps	libwps	nmake	-	all	lwps_libwps NULL

ooo.lst.in

@@ -82,7 +82,7 @@ b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
 a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 @WPG_TARBALL@
-c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
+@WPD_TARBALL@
 @WPS_TARBALL@
 @MDDS_TARBALL@
 @BOOST_TARBALL@

tail_build/prj/build.lst

-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL

writerperfect/prj/build.lst

-wp  writerperfect : libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp  writerperfect : libwpg libwps libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
 wp  writerperfect			usr1	-	all	wp_mkout NULL
 wp  writerperfect\prj		nmake	-	all	wp_prj NULL