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

3 files changed, 42 insertions, 43 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/prj/makefile.mk b/canvas/prj/makefile.mk
new file mode 100644
index 000000000000..88cd9dfe08b8
--- /dev/null
+++ b/canvas/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