convert writerperfect to gbuild

17 files changed, 442 insertions, 365 deletions

diff --git a/writerperfect/Library_msworks.mk b/writerperfect/Library_msworks.mk
new file mode 100644
index 000000000..02af9b941
--- /dev/null
+++ b/writerperfect/Library_msworks.mk
@@ -0,0 +1,67 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,msworks))
+
+$(eval $(call gb_Library_set_componentfile,msworks,writerperfect/util/msworksfilter))
+
+$(eval $(call gb_Library_set_include,msworks,\
+	$$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerperfect/source) \
+))
+
+$(eval $(call gb_Library_add_api,msworks,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,msworks,\
+	cppu \
+	cppuhelper \
+	sal \
+	sot \
+	ucbhelper \
+	tl \
+	utl \
+	xo \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,msworks,\
+	writerperfect \
+))
+
+$(eval $(call gb_Library_use_externals,msworks,\
+	wpd \
+	wps \
+))
+
+$(eval $(call gb_Library_add_exception_objects,msworks,\
+	writerperfect/source/wpsimp/MSWorksImportFilter \
+	writerperfect/source/wpsimp/msworks_genericfilter \
+))
+
+# vim: set noet sw=4:
diff --git a/writerperfect/Library_visioimport.mk b/writerperfect/Library_visioimport.mk
new file mode 100644
index 000000000..8e7254a95
--- /dev/null
+++ b/writerperfect/Library_visioimport.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,visioimport))
+
+$(eval $(call gb_Library_set_componentfile,visioimport,writerperfect/util/visiofilter))
+
+$(eval $(call gb_Library_set_include,visioimport,\
+	$$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerperfect/source) \
+))
+
+$(eval $(call gb_Library_add_api,visioimport,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,visioimport,\
+	cppu \
+	cppuhelper \
+	sal \
+	sot \
+	tl \
+	utl \
+	xo \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,visioimport,\
+	writerperfect \
+))
+
+$(eval $(call gb_Library_use_externals,visioimport,\
+	wpd \
+	visio \
+))
+
+$(eval $(call gb_Library_add_exception_objects,visioimport,\
+	writerperfect/source/vsdimp/VisioImportFilter \
+	writerperfect/source/vsdimp/visioimport_genericfilter \
+))
+
+# vim: set noet sw=4:
diff --git a/writerperfect/Library_wpft.mk b/writerperfect/Library_wpft.mk
new file mode 100644
index 000000000..defe69468
--- /dev/null
+++ b/writerperfect/Library_wpft.mk
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,wpft))
+
+$(eval $(call gb_Library_set_componentfile,wpft,writerperfect/util/wpft))
+
+$(eval $(call gb_Library_set_include,wpft,\
+	$$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerperfect/source) \
+))
+
+$(eval $(call gb_Library_add_api,wpft,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,wpft,\
+	cppu \
+	cppuhelper \
+	vcl \
+	sal \
+	sfx \
+	sot \
+	tl \
+	ucbhelper \
+	utl \
+	xo \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,wpft,\
+	writerperfect \
+))
+
+$(eval $(call gb_Library_use_externals,wpft,\
+	wpd \
+	wpg \
+))
+
+$(eval $(call gb_Library_add_exception_objects,wpft,\
+	writerperfect/source/wpdimp/WordPerfectImportFilter \
+	writerperfect/source/wpdimp/wpft_genericfilter \
+))
+
+# vim: set noet sw=4:
diff --git a/writerperfect/Library_wpgimport.mk b/writerperfect/Library_wpgimport.mk
new file mode 100644
index 000000000..c3a4cb63f
--- /dev/null
+++ b/writerperfect/Library_wpgimport.mk
@@ -0,0 +1,66 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,wpgimport))
+
+$(eval $(call gb_Library_set_componentfile,wpgimport,writerperfect/util/wpgfilter))
+
+$(eval $(call gb_Library_set_include,wpgimport,\
+	$$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerperfect/source) \
+))
+
+$(eval $(call gb_Library_add_api,wpgimport,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,wpgimport,\
+	cppu \
+	cppuhelper \
+	sal \
+	sot \
+	tl \
+	utl \
+	xo \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,wpgimport,\
+	writerperfect \
+))
+
+$(eval $(call gb_Library_use_externals,wpgimport,\
+	wpd \
+	wpg \
+))
+
+$(eval $(call gb_Library_add_exception_objects,wpgimport,\
+	writerperfect/source/wpgimp/WPGImportFilter \
+	writerperfect/source/wpgimp/wpgimport_genericfilter \
+))
+
+# vim: set noet sw=4:
diff --git a/writerperfect/Makefile b/writerperfect/Makefile
new file mode 100644
index 000000000..5bedaf0b9
--- /dev/null
+++ b/writerperfect/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
new file mode 100644
index 000000000..3f59197e2
--- /dev/null
+++ b/writerperfect/Module_writerperfect.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,writerperfect))
+
+$(eval $(call gb_Module_add_targets,writerperfect,\
+	Library_msworks \
+	Library_visioimport \
+	Library_wpft \
+	Library_wpgimport \
+	StaticLibrary_writerperfect \
+))
+
+# vim: set noet sw=4:
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
new file mode 100644
index 000000000..62702192f
--- /dev/null
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect))
+
+$(eval $(call gb_StaticLibrary_set_include,writerperfect,\
+	$$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/writerperfect/source) \
+))
+
+$(eval $(call gb_StaticLibrary_add_api,writerperfect,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect,\
+	writerperfect/source/filter/DocumentElement \
+	writerperfect/source/filter/DocumentHandler \
+	writerperfect/source/filter/FontStyle \
+	writerperfect/source/filter/InternalHandler \
+	writerperfect/source/filter/ListStyle \
+	writerperfect/source/filter/OdgGenerator \
+	writerperfect/source/filter/OdtGenerator \
+	writerperfect/source/filter/PageSpan \
+	writerperfect/source/filter/SectionStyle \
+	writerperfect/source/filter/TableStyle \
+	writerperfect/source/filter/TextRunStyle \
+	writerperfect/source/stream/WPXSvStream \
+))
+
+# vim: set noet sw=4:
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index 4c732907a..23f35dcc2 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,9 +1,3 @@
-wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
-wp	writerperfect			usr1	-	all	wp_mkout NULL
-wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
-wp	writerperfect\source\filter	nmake	-	all	wp_filter NULL
-wp	writerperfect\source\wpdimp	nmake	-	all	wp_wpdimp NULL
-wp	writerperfect\source\wpsimp	nmake	-	all	wp_wpsimp NULL
-wp  writerperfect\source\wpgimp nmake   -   all wp_wpgimp NULL
-wp  writerperfect\source\vsdimp nmake   -   all wp_vsdimp NULL
-wp	writerperfect\util		nmake	-	all	wp_util wp_vsdimp wp_wpgimp wp_wpsimp wp_wpdimp wp_filter wp_stream NULL
+wp  writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp  writerperfect			usr1	-	all	wp_mkout NULL
+wp  writerperfect\prj		nmake	-	all	wp_prj NULL
diff --git a/writerperfect/prj/d.lst b/writerperfect/prj/d.lst
index 8f7590ca3..e69de29bb 100644
--- a/writerperfect/prj/d.lst
+++ b/writerperfect/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\%__SRC%\bin\wpftgo.dll %_DEST%\bin\wpftgo.dll
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\misc\*.component %_DEST%\xml\*.component
diff --git a/writerperfect/prj/makefile.mk b/writerperfect/prj/makefile.mk
new file mode 100644
index 000000000..d30ff8a47
--- /dev/null
+++ b/writerperfect/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/writerperfect/source/filter/makefile.mk b/writerperfect/source/filter/makefile.mk
deleted file mode 100644
index eda3ec7e3..000000000
--- a/writerperfect/source/filter/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=writerperfect
-TARGET=filter
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(LIBWPG_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-INCPRE+=$(LIBWPS_CFLAGS)
-.ENDIF
-
-# broken but ... necessary, internal include shafted ...
-INCPRE+= -I..
-
-SLOFILES= \
-    $(SLO)$/DocumentElement.obj \
-    $(SLO)$/DocumentHandler.obj \
-    $(SLO)$/FontStyle.obj \
-    $(SLO)$/InternalHandler.obj \
-    $(SLO)$/ListStyle.obj \
-    $(SLO)$/OdgGenerator.obj \
-    $(SLO)$/OdtGenerator.obj \
-    $(SLO)$/PageSpan.obj \
-    $(SLO)$/SectionStyle.obj \
-    $(SLO)$/TableStyle.obj \
-    $(SLO)$/TextRunStyle.obj
-
-.INCLUDE :  target.mk
diff --git a/writerperfect/source/stream/makefile.mk b/writerperfect/source/stream/makefile.mk
deleted file mode 100644
index 97262e7b7..000000000
--- a/writerperfect/source/stream/makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=writerperfect
-TARGET=stream
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-INCPRE+=$(LIBWPS_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
-.ENDIF
-
-# broken but ... necessary, internal include shafted ...
-INCPRE+= -I..
-
-SLOFILES= $(SLO)$/WPXSvStream.obj
-
-.INCLUDE :  target.mk
diff --git a/writerperfect/source/vsdimp/makefile.mk b/writerperfect/source/vsdimp/makefile.mk
deleted file mode 100644
index b296640a8..000000000
--- a/writerperfect/source/vsdimp/makefile.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=writerperfect
-TARGET=vsdimp
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(LIBWPG_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBVISIO)" == "YES"
-INCPRE+=$(LIBVISIO_CFLAGS)
-.ENDIF
-
-# broken but ... necessary, internal include shafted ...
-INCPRE+= -I..
-
-SLOFILES= \
-    $(SLO)$/VisioImportFilter.obj \
-    $(SLO)$/visioimport_genericfilter.obj
-
-.INCLUDE :  target.mk
diff --git a/writerperfect/source/wpdimp/makefile.mk b/writerperfect/source/wpdimp/makefile.mk
deleted file mode 100644
index 1b7bdcf59..000000000
--- a/writerperfect/source/wpdimp/makefile.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=writerperfect
-TARGET=wpdimp
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(LIBWPG_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-INCPRE+=$(LIBWPS_CFLAGS)
-.ENDIF
-
-# broken but ... necessary, internal include shafted ...
-INCPRE+= -I..
-
-SLOFILES= \
-    $(SLO)$/WordPerfectImportFilter.obj  \
-    $(SLO)$/wpft_genericfilter.obj		
-
-.INCLUDE :  target.mk
diff --git a/writerperfect/source/wpgimp/makefile.mk b/writerperfect/source/wpgimp/makefile.mk
deleted file mode 100644
index ccf1d7df9..000000000
--- a/writerperfect/source/wpgimp/makefile.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=writerperfect
-TARGET=wpgimp
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(LIBWPG_CFLAGS)
-.ENDIF
-
-# broken but ... necessary, internal include shafted ...
-INCPRE+= -I..
-
-SLOFILES= \
-    $(SLO)$/WPGImportFilter.obj \
-    $(SLO)$/wpgimport_genericfilter.obj
-
-.INCLUDE :  target.mk
diff --git a/writerperfect/source/wpsimp/makefile.mk b/writerperfect/source/wpsimp/makefile.mk
deleted file mode 100644
index 4d6aa7714..000000000
--- a/writerperfect/source/wpsimp/makefile.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-PRJ=..$/..
-
-PRJNAME=writerperfect
-TARGET=wpsimp
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-INCPRE+=$(LIBWPS_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
-.ENDIF
-
-# broken but ... necessary, internal include shafted ...
-INCPRE+= -I..
-
-SLOFILES= \
-    $(SLO)$/MSWorksImportFilter.obj  \
-    $(SLO)$/msworks_genericfilter.obj
-
-.INCLUDE :  target.mk
-
diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk
deleted file mode 100644
index 1aa28bf1f..000000000
--- a/writerperfect/util/makefile.mk
+++ /dev/null
@@ -1,181 +0,0 @@
-PRJ=..
-PRJNAME=writerperfect
-TARGET=writerperfect
-
-.INCLUDE :  settings.mk
-
-
-.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-LIBWPD=$(LIBWPD_LIBS)
-.ELSE
-LIBWPD=-lwpdlib
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
-LIBWPS=$(LIBWPS_LIBS)
-.ELSE
-LIBWPS=-lwpslib
-.ENDIF
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-LIBWPG=$(LIBWPG_LIBS)
-.ELSE
-LIBWPG=-lwpglib
-.ENDIF
-
-.IF "$(SYSTEM_LIBVISIO)" == "YES"
-LIBVISIO=$(LIBVISIO_LIBS)
-.ELSE
-LIBVISIO=-lvisiolib
-.ENDIF
-
-.ELSE
-
-LIBWPD=$(LIBPRE) wpdlib.lib
-LIBWPS=$(LIBPRE) wpslib.lib
-LIBWPG=$(LIBPRE) wpglib.lib
-LIBVISIO=$(LIBPRE) visiolib.lib
-
-.ENDIF
-
-LIB1TARGET= $(SLB)$/wpft.lib
-LIB1FILES= \
-    $(SLB)$/stream.lib  \
-    $(SLB)$/filter.lib  \
-    $(SLB)$/wpdimp.lib
-SHL1LIBS=$(LIB1TARGET)
-SHL1STDLIBS+= \
-    $(SOTLIB) \
-    $(SO2LIB) \
-    $(SFXLIB) \
-    $(VCLLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB) \
-    $(XMLOFFLIB) \
-    $(LIBWPG) \
-    $(LIBWPD)
-
-SHL1TARGET = wpft$(DLLPOSTFIX)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1LIBS = $(LIB1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-DEF1NAME=$(SHL1TARGET)
-
-
-LIB2TARGET= $(SLB)$/msworks.lib
-LIB2FILES= \
-    $(SLB)$/stream.lib  \
-    $(SLB)$/filter.lib  \
-    $(SLB)$/wpsimp.lib
-SHL2LIBS=$(LIB2TARGET)
-SHL2STDLIBS+= \
-    $(SVLLIB) \
-    $(SOTLIB) \
-    $(SO2LIB) \
-    $(SVTOOLLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB) \
-    $(XMLOFFLIB) \
-    $(LIBWPS) \
-    $(LIBWPD)
-
-SHL2TARGET = msworks$(DLLPOSTFIX)
-SHL2IMPLIB = i$(SHL2TARGET)
-SHL2LIBS = $(LIB2TARGET)
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-DEF2NAME = $(SHL2TARGET)
-
-LIB3TARGET= $(SLB)$/wpgimport.lib
-LIB3FILES= \
-    $(SLB)$/stream.lib  \
-    $(SLB)$/filter.lib  \
-    $(SLB)$/wpgimp.lib
-SHL3LIBS=$(LIB3TARGET)
-SHL3STDLIBS+= \
-    $(SVLLIB) \
-    $(SOTLIB) \
-    $(SO2LIB) \
-    $(SVTOOLLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB) \
-    $(XMLOFFLIB) \
-    $(LIBWPG) \
-    $(LIBWPD)
-
-SHL3TARGET = wpgimport$(DLLPOSTFIX)
-SHL3IMPLIB = i$(SHL3TARGET)
-SHL3LIBS = $(LIB3TARGET)
-SHL3VERSIONMAP = $(SOLARENV)/src/component.map
-DEF3NAME = $(SHL3TARGET)
-
-LIB4TARGET= $(SLB)$/visioimport.lib
-LIB4FILES= \
-    $(SLB)$/stream.lib  \
-    $(SLB)$/filter.lib  \
-    $(SLB)$/vsdimp.lib
-SHL4LIBS=$(LIB4TARGET)
-SHL4STDLIBS+= \
-    $(SVLLIB) \
-    $(SOTLIB) \
-    $(SO2LIB) \
-    $(SVTOOLLIB) \
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB) \
-    $(XMLOFFLIB) \
-    $(LIBVISIO) \
-    $(LIBWPD)
-
-SHL4TARGET = visioimport$(DLLPOSTFIX)
-SHL4IMPLIB = i$(SHL4TARGET)
-SHL4LIBS = $(LIB4TARGET)
-SHL4VERSIONMAP = $(SOLARENV)/src/component.map
-DEF4NAME = $(SHL4TARGET)
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/wpft.component $(MISC)/wpgfilter.component $(MISC)/msworksfilter.component $(MISC)/visiofilter.component
-
-$(MISC)/wpft.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        wpft.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt wpft.component
-
-$(MISC)/msworksfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        msworksfilter.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt msworksfilter.component
-
-$(MISC)/wpgfilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        wpgfilter.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt wpgfilter.component
-
-$(MISC)/visiofilter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        visiofilter.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt visiofilter.component