CWS gnumake4: convert canvas to new build system [hg:04b466050e00]

15 files changed, 12 insertions, 846 deletions

diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst
index 2adfe155e0b1..978e8a452619 100644
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@ -1,10 +1,3 @@
 cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo LIBXSLT:libxslt NULL
-cv	canvas											 usr1	-	all	cv_mkout NULL
-cv	canvas\inc										 nmake	-	all	cv_inc NULL
-cv	canvas\source\tools								 nmake	-	all cv_tools cv_inc NULL
-cv	canvas\source\vcl								 nmake	-	all	cv_vcl cv_tools cv_inc NULL
-cv	canvas\source\simplecanvas						 nmake	-	all	cv_simplecanvas cv_tools cv_inc NULL
-cv	canvas\source\cairo								 nmake	-	all	cv_cairo cv_tools cv_inc NULL
-cv	canvas\source\directx							 nmake	-	w	cv_directx cv_tools cv_inc NULL
-cv	canvas\source\null								 nmake	-	all	cv_null cv_tools cv_inc NULL
-cv	canvas\source\factory							 nmake	-	all cv_factory cv_inc NULL
+cv	canvas\prj										 nmake	-	all	cv_prj NULL
+
diff --git a/canvas/prj/d.lst b/canvas/prj/d.lst
index a545cf03e1de..e69de29bb2d1 100644
--- a/canvas/prj/d.lst
+++ b/canvas/prj/d.lst
@@ -1,34 +0,0 @@
-..\%__SRC%\bin\canvasto*.dll %_DEST%\bin%_EXT%\canvasto*.dll
-..\%__SRC%\bin\cairocan*.dll %_DEST%\bin%_EXT%\cairocan*.dll
-..\%__SRC%\bin\directx*.dll  %_DEST%\bin%_EXT%\directx*.dll
-..\%__SRC%\bin\gdiplus*.dll  %_DEST%\bin%_EXT%\gdiplus*.dll
-..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin%_EXT%\vclcanva*.dll
-..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin%_EXT%\nullcanv*.dll
-..\%__SRC%\bin\simpleca*.dll %_DEST%\bin%_EXT%\simpleca*.dll
-..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin%_EXT%\canvasfa*.dll
-..\%__SRC%\lib\icanvastools.lib %_DEST%\lib%_EXT%\icanvastools.lib
-..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib%_EXT%\cairocanvas.uno.so
-..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib%_EXT%\vclcanvas.uno.so
-..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib%_EXT%\nullcanvas.uno.so
-..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib%_EXT%\simplecanvas.uno.so
-..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib%_EXT%\canvasfactory.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin%_EXT%\javacanvas.uno.jar
-..\%__SRC%\misc\cairocanvas.component %_DEST%\xml%_EXT%\cairocanvas.component
-
-mkdir: %_DEST%\inc%_EXT%\canvas\base
-..\inc\canvas\base\*.hxx %_DEST%\inc%_EXT%\canvas\base\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas\rendering
-..\inc\canvas\rendering\*.hxx %_DEST%\inc%_EXT%\canvas\rendering\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas
-..\inc\canvas\*.hxx %_DEST%\inc%_EXT%\canvas\*.hxx
-..\inc\canvas\*.h %_DEST%\inc%_EXT%\canvas\*.h
-..\%__SRC%\misc\canvasfactory.component %_DEST%\xml%_EXT%\canvasfactory.component
-..\%__SRC%\misc\directx5canvas.component %_DEST%\xml%_EXT%\directx5canvas.component
-..\%__SRC%\misc\directx9canvas.component %_DEST%\xml%_EXT%\directx9canvas.component
-..\%__SRC%\misc\gdipluscanvas.component %_DEST%\xml%_EXT%\gdipluscanvas.component
-..\%__SRC%\misc\simplecanvas.component %_DEST%\xml%_EXT%\simplecanvas.component
-..\%__SRC%\misc\vclcanvas.component %_DEST%\xml%_EXT%\vclcanvas.component
diff --git a/canvas/inc/makefile.mk b/canvas/prj/makefile.mk
index 6a74668fd4cd..88cd9dfe08b8 100644
--- a/canvas/inc/makefile.mk
+++ b/canvas/prj/makefile.mk
@@ -24,24 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=canvas
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ=..
+TARGET=prj
 
-.INCLUDE :  target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/canvas/source/cairo/exports.dxp b/canvas/source/cairo/exports.dxp
deleted file mode 100644
index f0e1c69934bc..000000000000
--- a/canvas/source/cairo/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk
deleted file mode 100644
index 040acd9ade8f..000000000000
--- a/canvas/source/cairo/makefile.mk
+++ /dev/null
@@ -1,140 +0,0 @@
-#*************************************************************************
-#
-# 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=canvas
-TARGET=cairocanvas
-TARGETTYPE=GUI
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-DLLPRE =
-
-# --- Nothing to do if we're compiling with --disable-cairo -----------
-.IF "$(ENABLE_CAIRO)" != "TRUE"
-@all:
-    @echo "Building without cairo support..."
-.ELSE
-# --- X11 Mac build currently doesn't work with cairo -----------
-.IF "$(OS)" == "MACOSX" && "$(GUIBASE)" == "unx"
-@all:   
-    @echo "Cannot build cairocanvas with X11..."
-.ENDIF
-.ENDIF
-
-# --- Common ----------------------------------------------------------
-
-
-.IF "$(SYSTEM_CAIRO)" == "YES"
-CFLAGS+=$(CAIRO_CFLAGS)
-.ELSE
-CFLAGS+=-I$(SOLARINCDIR)/cairo
-.ENDIF
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/cairo_cachedbitmap.obj \
-            $(SLO)$/cairo_cairo.obj \
-            $(SLO)$/cairo_canvas.obj \
-            $(SLO)$/cairo_canvasbitmap.obj \
-            $(SLO)$/cairo_canvascustomsprite.obj \
-            $(SLO)$/cairo_canvasfont.obj \
-            $(SLO)$/cairo_canvashelper.obj \
-            $(SLO)$/cairo_canvashelper_text.obj \
-            $(SLO)$/cairo_devicehelper.obj \
-            $(SLO)$/cairo_services.obj \
-            $(SLO)$/cairo_spritecanvas.obj \
-            $(SLO)$/cairo_spritecanvashelper.obj \
-            $(SLO)$/cairo_spritedevicehelper.obj \
-            $(SLO)$/cairo_spritehelper.obj \
-            $(SLO)$/cairo_textlayout.obj
-
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB) $(I18NISOLANGLIB)
-
-.IF "$(GUI)"=="UNX" 
-
-.IF "$(SYSTEM_CAIRO)" == "YES"
-SHL1STDLIBS+= $(CAIRO_LIBS)
-.ELSE
-SHL1STDLIBS+= -lcairo -lpixman-1
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-# native Mac OS X (Quartz)
-SLOFILES+= $(SLO)$/cairo_quartz_cairo.obj
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ELSE    # "$(GUIBASE)"=="aqua"
-
-# Xlib
-SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj
-SHL1STDLIBS+= -lfontconfig -lX11 -lXrender $(FREETYPE_LIBS)
-CFLAGS+=$(FREETYPE_CFLAGS)
-
-.ENDIF   # "$(GUIBASE)"=="aqua"
-
-.ELSE    # "$(GUI)"=="UNX" 
-
-.IF "$(GUI)"=="WNT"
-SLOFILES+= $(SLO)$/cairo_win32_cairo.obj
-.IF "$(COM)"=="GCC"
-SHL1STDLIBS+= -lcairo
-.ELSE
-SHL1STDLIBS+= cairo.lib
-.ENDIF
-SHL1STDLIBS+= $(GDI32LIB) $(MSIMG32LIB)
-.ENDIF
-
-.ENDIF   # "$(GUI)"=="UNX" 
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/cairocanvas.component
-
-$(MISC)/cairocanvas.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt cairocanvas.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt cairocanvas.component
diff --git a/canvas/source/directx/exports.dxp b/canvas/source/directx/exports.dxp
deleted file mode 100644
index f0e1c69934bc..000000000000
--- a/canvas/source/directx/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
diff --git a/canvas/source/directx/makefile.mk b/canvas/source/directx/makefile.mk
deleted file mode 100644
index 9547fef40cc7..000000000000
--- a/canvas/source/directx/makefile.mk
+++ /dev/null
@@ -1,241 +0,0 @@
-#*************************************************************************
-#
-# 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=canvas
-TARGET=directx9canvas
-TARGET2=directx5canvas
-TARGET3=gdipluscanvas
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-DLLPRE =
-
-# --- Nothing to do if we're compiling with --disable-directx -----------
-.IF "$(ENABLE_DIRECTX)" == ""
-@all:
-    @echo "Building without DirectX support..."
-.ENDIF
-
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!=""
-CDEFS+= -DDX_DEBUG_IMAGES
-.ENDIF
-
-# --- This is Windows only! { ----------------------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-SHARED_SLOFILES = \
-    $(SLO)$/dx_bitmap.obj			        \
-    $(SLO)$/dx_bitmapcanvashelper.obj		\
-    $(SLO)$/dx_canvasbitmap.obj 			\
-    $(SLO)$/dx_canvasfont.obj 				\
-    $(SLO)$/dx_canvashelper.obj			    \
-    $(SLO)$/dx_canvashelper_texturefill.obj \
-    $(SLO)$/dx_devicehelper.obj				\
-    $(SLO)$/dx_gdiplususer.obj				\
-    $(SLO)$/dx_impltools.obj 				\
-    $(SLO)$/dx_linepolypolygon.obj			\
-    $(SLO)$/dx_textlayout.obj				\
-    $(SLO)$/dx_textlayout_drawhelper.obj    \
-    $(SLO)$/dx_vcltools.obj
-
-DX_SLOFILES = \
-    $(SLO)$/dx_5rm.obj					    \
-    $(SLO)$/dx_9rm.obj					    \
-    $(SLO)$/dx_canvascustomsprite.obj 		\
-    $(SLO)$/dx_config.obj					\
-    $(SLO)$/dx_spritecanvas.obj 			\
-    $(SLO)$/dx_spritecanvashelper.obj		\
-    $(SLO)$/dx_spritedevicehelper.obj		\
-    $(SLO)$/dx_spritehelper.obj 			\
-    $(SLO)$/dx_surfacebitmap.obj		    \
-    $(SLO)$/dx_surfacegraphics.obj
-DX_SLOFILES += $(SHARED_SLOFILES)
-
-GDIPLUS_SLOFILES = \
-    $(SLO)$/dx_canvas.obj
-GDIPLUS_SLOFILES += $(SHARED_SLOFILES)
-
-STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(VCLLIB) $(TOOLSLIB) $(UNOTOOLSLIB) $(I18NISOLANGLIB)
-
-
-########################################################
-# DX9
-########################################################
-
-# Indicates the source obj files for the dx5 lib
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES = $(DX_SLOFILES)
-
-# Indicates the filename of the shared library.
-SHL1TARGET=$(TARGET).uno
-
-# Links import libraries.
-SHL1STDLIBS= $(STDLIBS)
-
-# Specifies an import library to create. For Win32 only.
-SHL1IMPLIB=i$(TARGET)
-
-# Specifies libraries from the same module to put into the shared library.
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-CDEFS+=-DDIRECTX_VERSION=0x0900
-
-SHL1STDLIBS += $(GDI32LIB)
-.IF "$(COM)" == "GCC"
-SHL1STDLIBS += $(DIRECTXSDK_LIB)/d3d9.lib
-.ELSE
-SHL1STDLIBS += d3d9.lib
-.ENDIF
-SHL1STDLIBS += $(GDIPLUSLIB)
-
-.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!=""
-SHL1STDLIBS += imdebug.lib
-.ENDIF
-
-
-########################################################
-# DX5
-########################################################
-
-.IF "$(USE_DIRECTX5)" != ""
-SECOND_BUILD=DX5
-DX5_SLOFILES=$(DX_SLOFILES)
-DX5CDEFS += -DDIRECTX_VERSION=0x0500
-
-LIB2TARGET= $(SLB)$/$(TARGET2).lib
-LIB2OBJFILES = $(REAL_DX5_SLOFILES)
-
-# Indicates the filename of the shared library.
-SHL2TARGET=$(TARGET2).uno
-
-# Links import libraries.
-SHL2STDLIBS= $(STDLIBS)
-
-# Specifies an import library to create. For Win32 only.
-SHL2IMPLIB=i$(TARGET2).lib
-
-# Specifies libraries from the same module to put into the shared library.
-SHL2LIBS=$(SLB)$/$(TARGET2).lib
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-
-DEF2NAME=$(SHL2TARGET)
-DEF2EXPORTFILE=exports.dxp
-
-SHL2STDLIBS += $(GDI32LIB)
-SHL2STDLIBS += $(DDRAWLIB)
-SHL2STDLIBS += $(GDIPLUSLIB)
-
-.IF "$(COM)" == "GCC"
-SHL2STDLIBS += $(DIRECTXSDK_LIB)/d3dx.lib
-.ELSE
-SHL2STDLIBS += d3dx.lib
-.ENDIF
-
-.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!=""
-SHL2STDLIBS += imdebug.lib
-.ENDIF
-.ENDIF # IF "$(USE_DIRECTX5)" != ""
-
-
-########################################################
-# GDI+
-########################################################
-
-LIB3TARGET= $(SLB)$/$(TARGET3).lib
-LIB3OBJFILES = $(GDIPLUS_SLOFILES)
-
-# Indicates the filename of the shared library.
-SHL3TARGET=$(TARGET3).uno
-
-# Links import libraries.
-SHL3STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(VCLLIB) $(TOOLSLIB) $(UNOTOOLSLIB) $(I18NISOLANGLIB)
-
-# Specifies an import library to create. For Win32 only.
-SHL3IMPLIB=i$(TARGET3).lib
-
-# Specifies libraries from the same module to put into the shared library.
-SHL3LIBS=$(SLB)$/$(TARGET3).lib
-SHL3DEF=$(MISC)$/$(SHL3TARGET).def
-
-DEF3NAME=$(SHL3TARGET)
-DEF3EXPORTFILE=exports.dxp
-
-SHL3STDLIBS += $(GDI32LIB)
-SHL3STDLIBS += $(GDIPLUSLIB)
-
-.IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!=""
-SHL3STDLIBS += imdebug.lib
-.ENDIF
-
-.ENDIF # IF "$(GUI)" == "WNT"
-
-# --- This is Windows only! } ----------------------------------------------------------------
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
-ALLTAR : \
-    $(MISC)/directx5canvas.component \
-    $(MISC)/directx9canvas.component \
-    $(MISC)/gdipluscanvas.component
-
-$(MISC)/directx5canvas.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt directx5canvas.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt directx5canvas.component
-
-$(MISC)/directx9canvas.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt directx9canvas.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt directx9canvas.component
-
-$(MISC)/gdipluscanvas.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt gdipluscanvas.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt gdipluscanvas.component
diff --git a/canvas/source/factory/makefile.mk b/canvas/source/factory/makefile.mk
deleted file mode 100644
index eee24ea8ba85..000000000000
--- a/canvas/source/factory/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# 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 = canvas
-TARGET = canvasfactory.uno
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-DLLPRE =
-.IF "$(L10N_framework)"==""
-SLOFILES = \
-        $(SLO)$/cf_service.obj
-
-SHL1TARGET = $(TARGET)
-
-SHL1STDLIBS = \
-        $(CPPULIB) \
-        $(CPPUHELPERLIB) \
-        $(SALLIB)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-
-SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME = $(SHL1TARGET)
-.ENDIF
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/canvasfactory.component
-
-$(MISC)/canvasfactory.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt canvasfactory.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt canvasfactory.component
diff --git a/canvas/source/null/exports.dxp b/canvas/source/null/exports.dxp
deleted file mode 100644
index f0e1c69934bc..000000000000
--- a/canvas/source/null/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
diff --git a/canvas/source/null/makefile.mk b/canvas/source/null/makefile.mk
deleted file mode 100644
index 07971ef8153e..000000000000
--- a/canvas/source/null/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# 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=canvas
-TARGET=nullcanvas
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-DLLPRE =
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/null_canvasbitmap.obj \
-            $(SLO)$/null_canvascustomsprite.obj \
-            $(SLO)$/null_canvasfont.obj \
-            $(SLO)$/null_canvashelper.obj \
-            $(SLO)$/null_devicehelper.obj \
-            $(SLO)$/null_spritecanvas.obj \
-            $(SLO)$/null_spritecanvashelper.obj \
-            $(SLO)$/null_spritehelper.obj \
-            $(SLO)$/null_textlayout.obj
-
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(VCLLIB)
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/canvas/source/simplecanvas/exports.dxp b/canvas/source/simplecanvas/exports.dxp
deleted file mode 100644
index 0cb5620a1603..000000000000
--- a/canvas/source/simplecanvas/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
\ No newline at end of file
diff --git a/canvas/source/simplecanvas/makefile.mk b/canvas/source/simplecanvas/makefile.mk
deleted file mode 100644
index 8c3a9deede72..000000000000
--- a/canvas/source/simplecanvas/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# 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=canvas
-TARGET=simplecanvas
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-DLLPRE =
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/simplecanvasimpl.obj
-
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB)
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/simplecanvas.component
-
-$(MISC)/simplecanvas.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt simplecanvas.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt simplecanvas.component
diff --git a/canvas/source/tools/makefile.mk b/canvas/source/tools/makefile.mk
deleted file mode 100644
index cf621d96309c..000000000000
--- a/canvas/source/tools/makefile.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-#*************************************************************************
-#
-# 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=canvas
-TARGET=canvastools
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-.IF "$(profiler)"!="" || "$(PROFILER)"!=""
-CDEFS+= -DPROFILER
-.ENDIF
-
-CDEFS+= -DCANVASTOOLS_DLLIMPLEMENTATION
-
-#CFLAGS +:= /Ox /Ot					# THIS IS IMPORTANT
-
-
-.IF "$(L10N_framework)"==""
-
-SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= 	i$(TARGET)
-SHL1STDLIBS=	$(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB)
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS += $(WINMMLIB) $(KERNEL32LIB)
-.ENDIF
-SHL1USE_EXPORTS=name
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME	=$(SHL1TARGET)
-
-SLOFILES =	\
-    $(SLO)$/cachedprimitivebase.obj \
-    $(SLO)$/canvascustomspritehelper.obj \
-    $(SLO)$/canvastools.obj \
-    $(SLO)$/elapsedtime.obj \
-    $(SLO)$/parametricpolypolygon.obj \
-    $(SLO)$/prioritybooster.obj \
-    $(SLO)$/propertysethelper.obj \
-    $(SLO)$/spriteredrawmanager.obj \
-    $(SLO)$/surface.obj \
-    $(SLO)$/surfaceproxy.obj \
-    $(SLO)$/surfaceproxymanager.obj \
-    $(SLO)$/pagemanager.obj \
-    $(SLO)$/page.obj \
-    $(SLO)$/verifyinput.obj
-
-.IF "$(ENABLE_AGG)"=="YES"
-    SLOFILES += $(SLO)$/bitmap.obj \
-                $(SLO)$/image.obj
-
-    .IF "$(AGG_VERSION)"!=""
-        CDEFS += -DAGG_VERSION=$(AGG_VERSION)
-    .ENDIF
-    SHL1STDLIBS += $(AGGLIB)
-.ENDIF
-
-SHL1OBJS=	$(SLOFILES)
-
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
diff --git a/canvas/source/vcl/exports.dxp b/canvas/source/vcl/exports.dxp
deleted file mode 100644
index 0cb5620a1603..000000000000
--- a/canvas/source/vcl/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
\ No newline at end of file
diff --git a/canvas/source/vcl/makefile.mk b/canvas/source/vcl/makefile.mk
deleted file mode 100644
index 7d5f9658c829..000000000000
--- a/canvas/source/vcl/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# 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=canvas
-TARGET=vclcanvas
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-DLLPRE =
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-# Disable optimization for SunCC SPARC
-.IF "$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC"
-NOOPTFILES = $(SLO)$/canvashelper_texturefill.obj 
-.ENDIF
-
-SLOFILES =	$(SLO)$/backbuffer.obj \
-            $(SLO)$/bitmapbackbuffer.obj \
-            $(SLO)$/cachedbitmap.obj \
-            $(SLO)$/canvas.obj \
-            $(SLO)$/canvasbitmap.obj \
-            $(SLO)$/canvasbitmaphelper.obj \
-            $(SLO)$/canvascustomsprite.obj \
-            $(SLO)$/canvasfont.obj \
-            $(SLO)$/canvashelper.obj \
-            $(SLO)$/canvashelper_texturefill.obj \
-            $(SLO)$/devicehelper.obj \
-            $(SLO)$/impltools.obj \
-            $(SLO)$/services.obj \
-            $(SLO)$/spritecanvas.obj \
-            $(SLO)$/spritecanvashelper.obj \
-            $(SLO)$/spritedevicehelper.obj \
-            $(SLO)$/spritehelper.obj \
-            $(SLO)$/textlayout.obj \
-            $(SLO)$/windowoutdevholder.obj
-
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(TOOLSLIB) $(TKLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(SVTOOLLIB) $(I18NISOLANGLIB)
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/vclcanvas.component
-
-$(MISC)/vclcanvas.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        vclcanvas.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt vclcanvas.component