CWS gnumake4: convert cppcanvas to new build system [hg:a93ffc180db8]

4 files changed, 42 insertions, 49 deletions

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/inc/makefile.mk b/cppcanvas/inc/makefile.mk
deleted file mode 100644
index ccf2d3a92425..000000000000
--- a/cppcanvas/inc/makefile.mk
+++ /dev/null
@@ -1,47 +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=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-