6 files changed, 15 insertions, 21 deletions
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index d12173d79dad..f30a317e0aa4 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -41,8 +41,8 @@ TARGET=wpd
     @echo "Using system libwpd..."
 .ENDIF
 
-TARFILE_NAME=libwpd-0.8.14
-TARFILE_MD5=64d66018897d759358f454010b6e75d2
+TARFILE_NAME=libwpd-0.9.0
+TARFILE_MD5=86e390f015e505dd71a66f0123c62f09
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 
diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst
index beb6d5879bde..ef6944359362 100644
--- a/libwpd/prj/d.lst
+++ b/libwpd/prj/d.lst
@@ -1,12 +1,15 @@
 mkdir: %_DEST%\inc%_EXT%\libwpd
+mkdir: %_DEST%\inc%_EXT%\libwpd-stream
 ..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd_types.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc%_EXT%\libwpd\
 ..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc%_EXT%\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXHLListenerImpl.h %_DEST%\inc%_EXT%\libwpd\
+..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc%_EXT%\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc%_EXT%\libwpd-stream\
+..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc%_EXT%\libwpd-stream\
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index 424fd9896c0c..0fa701f10075 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -46,10 +46,11 @@ TARGET=wpg
 INCPRE+=$(LIBWPD_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
 .ENDIF
 
-TARFILE_NAME=libwpg-0.1.3
-TARFILE_MD5=db556b750bf3eac8481a4cc5e29e5af1
+TARFILE_NAME=libwpg-0.2.0
+TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib
 
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
index d01a25a0c772..2093e0d69a26 100644
--- a/libwpg/prj/d.lst
+++ b/libwpg/prj/d.lst
@@ -1,16 +1,6 @@
 mkdir: %_DEST%\inc%_EXT%\libwpg
 ..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGBitmap.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGBinaryData.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGBrush.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGColor.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGGradient.h %_DEST%\inc%_EXT%\libwpg\
 ..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPath.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPen.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPoint.h %_DEST%\inc%_EXT%\libwpg\
 ..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGRect.h %_DEST%\inc%_EXT%\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGString.h %_DEST%\inc%_EXT%\libwpg\
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 3d9cefe0f4ed..0a8bd6a8db86 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -46,10 +46,11 @@ TARGET=wps
 INCPRE+=$(LIBWPD_CFLAGS)
 .ELSE
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
 .ENDIF
 
-TARFILE_NAME=libwps-0.1.2
-TARFILE_MD5=799fc3b835a79adce8c88a3fee0150c1
+TARFILE_NAME=libwps-0.2.0
+TARFILE_MD5=9e436bff44c60dc8b97cba0c7fc11a5c
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib
 
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
index fe897d7fd386..a71985a7ae1a 100644
--- a/libwps/prj/d.lst
+++ b/libwps/prj/d.lst
@@ -1,6 +1,5 @@
 mkdir: %_DEST%\inc%_EXT%\libwps
 ..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc%_EXT%\libwps\
-..\%__SRC%\misc\build\libwps*\src\lib\WPSStream.h %_DEST%\inc%_EXT%\libwps\
 ..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc%_EXT%\libwps\
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib