summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-02-25 17:49:36 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-16 12:53:54 +0200
commit77de797f8c36c7d651a36b4d7b572e95adf36532 (patch)
treea1587166d559ff27169724836a2caaf639df2018
parent4a1b61df46d78d1842976c5345d7e1145dbe0145 (diff)
CWS gnumake4: convert cppcanvas to new build system [hg:a93ffc180db8]
-rw-r--r--cppcanvas/Library_cppcanvas.mk87
-rw-r--r--cppcanvas/Makefile (renamed from cppcanvas/source/tools/makefile.mk)30
-rw-r--r--cppcanvas/Module_cppcanvas.mk (renamed from cppcanvas/source/mtfrenderer/makefile.mk)39
-rw-r--r--cppcanvas/Package_inc.mk45
-rw-r--r--cppcanvas/inc/cppcanvas/basegfxfactory.hxx3
-rw-r--r--cppcanvas/inc/cppcanvas/cppcanvasdllapi.h38
-rw-r--r--cppcanvas/inc/cppcanvas/vclfactory.hxx3
-rw-r--r--cppcanvas/prj/build.lst8
-rw-r--r--cppcanvas/prj/d.lst19
-rw-r--r--cppcanvas/prj/makefile.mk (renamed from cppcanvas/inc/makefile.mk)27
-rw-r--r--cppcanvas/source/wrapper/makefile.mk60
-rw-r--r--cppcanvas/util/cppcanvas.flt4
-rw-r--r--cppcanvas/util/makefile.mk70
13 files changed, 203 insertions, 230 deletions
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
new file mode 100644
index 000000000000..00b6411cab73
--- /dev/null
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -0,0 +1,87 @@
+#*************************************************************************
+#
+# 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,cppcanvas))
+
+$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/precompiled_cppcanvas))
+
+$(eval $(call gb_Library_set_include,cppcanvas,\
+ -I$(SRCDIR)/cppcanvas/inc \
+ -I$(SRCDIR)/cppcanvas/inc/pch \
+ -I$(SRCDIR)/cppcanvas/source/inc \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,cppcanvas,\
+ $$(DEFS) \
+ -DCPPCANVAS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cppcanvas,\
+ tl \
+ cppu \
+ sal \
+ vcl \
+ stl \
+ comphelper \
+ canvastools \
+ cppuhelper \
+ basegfx \
+ i18nisolang1 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppcanvas,\
+ cppcanvas/source/wrapper/vclfactory \
+ cppcanvas/source/wrapper/implcolor \
+ cppcanvas/source/wrapper/basegfxfactory \
+ cppcanvas/source/wrapper/implcustomsprite \
+ cppcanvas/source/wrapper/implspritecanvas \
+ cppcanvas/source/wrapper/implsprite \
+ cppcanvas/source/wrapper/implpolypolygon \
+ cppcanvas/source/wrapper/implcanvas \
+ cppcanvas/source/wrapper/implbitmap \
+ cppcanvas/source/wrapper/implfont \
+ cppcanvas/source/wrapper/impltext \
+ cppcanvas/source/wrapper/implbitmapcanvas \
+ cppcanvas/source/tools/tools \
+ cppcanvas/source/tools/canvasgraphichelper \
+ cppcanvas/source/mtfrenderer/transparencygroupaction \
+ cppcanvas/source/mtfrenderer/cachedprimitivebase \
+ cppcanvas/source/mtfrenderer/lineaction \
+ cppcanvas/source/mtfrenderer/pointaction \
+ cppcanvas/source/mtfrenderer/polypolyaction \
+ cppcanvas/source/mtfrenderer/textaction \
+ cppcanvas/source/mtfrenderer/implrenderer \
+ cppcanvas/source/mtfrenderer/mtftools \
+ cppcanvas/source/mtfrenderer/bitmapaction \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/source/tools/makefile.mk b/cppcanvas/Makefile
index ee543616f6e0..90947b2e5f48 100644
--- a/cppcanvas/source/tools/makefile.mk
+++ b/cppcanvas/Makefile
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,26 +25,14 @@
#
#*************************************************************************
-PRJ=..$/..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
-PRJNAME=cppcanvas
-TARGET=cppcanvastools
-ENABLE_EXCEPTIONS=TRUE
+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)))
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-SLOFILES = $(SLO)$/canvasgraphichelper.obj \
- $(SLO)$/tools.obj
-
-# ==========================================================================
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/source/mtfrenderer/makefile.mk b/cppcanvas/Module_cppcanvas.mk
index 92ae7e1200bc..5332d932af9e 100644
--- a/cppcanvas/source/mtfrenderer/makefile.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -1,8 +1,8 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,34 +25,11 @@
#
#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=cppcanvas
-TARGET=metafilerenderer
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-SLOFILES = $(SLO)$/cachedprimitivebase.obj \
- $(SLO)$/bitmapaction.obj \
- $(SLO)$/implrenderer.obj \
- $(SLO)$/lineaction.obj \
- $(SLO)$/pointaction.obj \
- $(SLO)$/polypolyaction.obj \
- $(SLO)$/rendergraphicaction.obj \
- $(SLO)$/textaction.obj \
- $(SLO)$/transparencygroupaction.obj \
- $(SLO)$/mtftools.obj
+$(eval $(call gb_Module_Module,cppcanvas))
-# ==========================================================================
+$(eval $(call gb_Module_add_targets,cppcanvas,\
+ Library_cppcanvas \
+ Package_inc \
+))
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Package_inc.mk b/cppcanvas/Package_inc.mk
new file mode 100644
index 000000000000..cda4a3e41225
--- /dev/null
+++ b/cppcanvas/Package_inc.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# 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_Package_Package,cppcanvas_inc,$(SRCDIR)/cppcanvas/inc))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvas.hxx,cppcanvas/canvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/sprite.hxx,cppcanvas/sprite.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/vclfactory.hxx,cppcanvas/vclfactory.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/font.hxx,cppcanvas/font.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/customsprite.hxx,cppcanvas/customsprite.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvasgraphic.hxx,cppcanvas/canvasgraphic.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/polypolygon.hxx,cppcanvas/polypolygon.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/color.hxx,cppcanvas/color.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/spritecanvas.hxx,cppcanvas/spritecanvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/text.hxx,cppcanvas/text.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/renderer.hxx,cppcanvas/renderer.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/basegfxfactory.hxx,cppcanvas/basegfxfactory.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmap.hxx,cppcanvas/bitmap.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmapcanvas.hxx,cppcanvas/bitmapcanvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/cppcanvasdllapi.h,cppcanvas/cppcanvasdllapi.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index 268292eb4a55..e59b3e71985b 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -38,6 +38,7 @@
#include <cppcanvas/sprite.hxx>
#include <basegfx/vector/b2isize.hxx>
+#include <cppcanvas/cppcanvasdllapi.h>
namespace basegfx
{
@@ -62,7 +63,7 @@ namespace cppcanvas
only be drawn on exactly that canvas. You have to regenerate
them for different canvases.
*/
- class BaseGfxFactory
+ class CPPCANVAS_DLLPUBLIC BaseGfxFactory
{
public:
static BaseGfxFactory& getInstance();
diff --git a/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h b/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
new file mode 100644
index 000000000000..a2640bc5bbff
--- /dev/null
+++ b/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
@@ -0,0 +1,38 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef INCLUDED_CPPCANVASDLLAPI_H
+#define INCLUDED_CPPCANVASDLLAPI_H
+
+#if defined CPPCANVAS_DLLIMPLEMENTATION
+
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define CPPCANVAS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx b/cppcanvas/inc/cppcanvas/vclfactory.hxx
index b95102f31472..44e07b4bb921 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/vclfactory.hxx
@@ -37,6 +37,7 @@
#include <cppcanvas/text.hxx>
#include <cppcanvas/sprite.hxx>
+#include <cppcanvas/cppcanvasdllapi.h>
class Window;
class Bitmap;
@@ -70,7 +71,7 @@ namespace cppcanvas
only be drawn on exactly that canvas. You have to regenerate
them for different canvases.
*/
- class VCLFactory
+ class CPPCANVAS_DLLPUBLIC VCLFactory
{
public:
static VCLFactory& getInstance();
diff --git a/cppcanvas/prj/build.lst b/cppcanvas/prj/build.lst
index 3fc4eb7abdac..f3be4db2c69a 100644
--- a/cppcanvas/prj/build.lst
+++ b/cppcanvas/prj/build.lst
@@ -1,7 +1,3 @@
cx cppcanvas : comphelper cppuhelper offuh tools vcl basegfx canvas NULL
-cx cppcanvas usr1 - all cx_mkout NULL
-cx cppcanvas\inc nmake - all cx_inc NULL
-cx cppcanvas\source\tools nmake - all cx_tools cx_inc NULL
-cx cppcanvas\source\wrapper nmake - all cx_wrapper cx_inc NULL
-cx cppcanvas\source\mtfrenderer nmake - all cx_mtfrenderer cx_inc NULL
-cx cppcanvas\util nmake - all cx_util cx_tools cx_wrapper cx_mtfrenderer NULL
+cx cppcanvas\prj nmake - all cx_prj NULL
+
diff --git a/cppcanvas/prj/d.lst b/cppcanvas/prj/d.lst
index f0f3237b80d0..e69de29bb2d1 100644
--- a/cppcanvas/prj/d.lst
+++ b/cppcanvas/prj/d.lst
@@ -1,19 +0,0 @@
-..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin%_EXT%\cppcanv*.dll
-..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-
-mkdir: %_DEST%\inc%_EXT%\cppcanvas
-..\inc\cppcanvas\bitmap.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmap.hxx
-..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmapcanvas.hxx
-..\inc\cppcanvas\canvas.hxx %_DEST%\inc%_EXT%\cppcanvas\canvas.hxx
-..\inc\cppcanvas\canvasgraphic.hxx %_DEST%\inc%_EXT%\cppcanvas\canvasgraphic.hxx
-..\inc\cppcanvas\color.hxx %_DEST%\inc%_EXT%\cppcanvas\color.hxx
-..\inc\cppcanvas\customsprite.hxx %_DEST%\inc%_EXT%\cppcanvas\customsprite.hxx
-..\inc\cppcanvas\font.hxx %_DEST%\inc%_EXT%\cppcanvas\font.hxx
-..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc%_EXT%\cppcanvas\polypolygon.hxx
-..\inc\cppcanvas\renderer.hxx %_DEST%\inc%_EXT%\cppcanvas\renderer.hxx
-..\inc\cppcanvas\sprite.hxx %_DEST%\inc%_EXT%\cppcanvas\sprite.hxx
-..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\spritecanvas.hxx
-..\inc\cppcanvas\text.hxx %_DEST%\inc%_EXT%\cppcanvas\text.hxx
-..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\vclfactory.hxx
-..\inc\cppcanvas\basegfxfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\basegfxfactory.hxx
diff --git a/cppcanvas/inc/makefile.mk b/cppcanvas/prj/makefile.mk
index ccf2d3a92425..88cd9dfe08b8 100644
--- a/cppcanvas/inc/makefile.mk
+++ b/cppcanvas/prj/makefile.mk
@@ -24,24 +24,17 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..
-
-PRJNAME=cppcanvas
-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/cppcanvas/source/wrapper/makefile.mk b/cppcanvas/source/wrapper/makefile.mk
deleted file mode 100644
index 255cc023d75c..000000000000
--- a/cppcanvas/source/wrapper/makefile.mk
+++ /dev/null
@@ -1,60 +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=cppcanvas
-TARGET=canvaswrapper
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-SLOFILES = $(SLO)$/implbitmap.obj \
- $(SLO)$/implcanvas.obj \
- $(SLO)$/implcolor.obj \
- $(SLO)$/implfont.obj \
- $(SLO)$/vclfactory.obj \
- $(SLO)$/basegfxfactory.obj \
- $(SLO)$/impltext.obj \
- $(SLO)$/implpolypolygon.obj \
- $(SLO)$/implbitmapcanvas.obj \
- $(SLO)$/implspritecanvas.obj \
- $(SLO)$/implsprite.obj \
- $(SLO)$/implcustomsprite.obj
-
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/cppcanvas/util/cppcanvas.flt b/cppcanvas/util/cppcanvas.flt
deleted file mode 100644
index 90ec48c26d4e..000000000000
--- a/cppcanvas/util/cppcanvas.flt
+++ /dev/null
@@ -1,4 +0,0 @@
-__CT
-Impl
-IMP
-internal
diff --git a/cppcanvas/util/makefile.mk b/cppcanvas/util/makefile.mk
deleted file mode 100644
index f0d6fc7426a4..000000000000
--- a/cppcanvas/util/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=cppcanvas
-TARGET=cppcanvas
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Common ----------------------------------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=\
- $(SLB)$/canvaswrapper.lib \
- $(SLB)$/metafilerenderer.lib \
- $(SLB)$/cppcanvastools.lib
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(I18NISOLANGLIB)
-
-.IF "$(debug)$(dbgutil)"!=""
-SHL1STDLIBS += $(CPPUHELPERLIB)
-.ENDIF # "$(debug)$(dbgutil)"!=""
-
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME =$(SHL1TARGET)
-DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \
- $(LIB1TARGET)
-
-DEF1DES =CPPCanvas
-DEFLIB1NAME =$(TARGET)
-
-# ==========================================================================
-
-.INCLUDE : target.mk
-
-$(MISC)$/$(SHL1TARGET).flt : makefile.mk
- @$(TYPE) $(TARGET).flt > $@