CWS gnumake4: convert canvas to new build system

Module_ooo.mk

@@ -28,6 +28,7 @@
 $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
+	canvas \
     comphelper \
         editeng \
     framework \

Repository.mk

@@ -44,9 +44,11 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     AppleRemote \
+	agg \
     avmedia \
     basegfx \
     basebmp \
+	canvastools \
     cui \
     desktop_detector \
     drawinglayer \
@@ -128,12 +130,20 @@ $(eval $(call gb_Helper_register_libraries,STLLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+	cairocanvas \
+	canvasfactory \
+	directx5canvas \
+	directx9canvas \
     fsstorage \
+	gdipluscanvas \
     hatchwindowfactory \
+	nullcanvas \
     passwordcontainer \
     productregistration \
+	simplecanvas \
     vbaswobj \
     msforms \
+	vclcanvas \
 ))
 
 

RepositoryFixes.mk

@@ -94,6 +94,7 @@ gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib
 gb_Library_ILIBFILENAMES:=\
     unicows \
     uuid \
+	winmm \
 
 gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
@@ -132,6 +133,9 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Lib
 endif
 gb_Library_NOILIBFILENAMES:=\
     advapi32 \
+	d3d9 \
+	d3dx \
+	ddraw \
     gdi32 \
     gdiplus \
     graphite_dll \
@@ -152,6 +156,7 @@ gb_Library_NOILIBFILENAMES:=\
     user32 \
     uuid \
     uwinapi \
+	winmm \
     winspool \
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
@@ -201,4 +206,9 @@ ifeq ($(SYSTEM_ICU),YES)
 gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
 endif
 
+ifeq ($(SYSTEM_CAIRO),YES)
+gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS))
+endif
+
 # vim: set noet sw=4 ts=4:

solenv/gbuild/platform/linux.mk

@@ -276,6 +276,10 @@ gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
 endif
 
 gb_Library_PLAINLIBS_NONE += \
+	cairo \
+	fontconfig \
+	Xrender \
+	pixman-1 \
     dl \
     freetype \
     jpeg \

solenv/gbuild/platform/windows.mk

@@ -449,6 +449,9 @@ gb_Library_PLAINEXT := .lib
 
 gb_Library_PLAINLIBS_NONE += \
     advapi32 \
+	d3d9 \
+	d3dx \
+	ddraw \
     gdi32 \
     gdiplus \
     gnu_getopt \
@@ -465,6 +468,7 @@ gb_Library_PLAINLIBS_NONE += \
     user32 \
     uuid \
     uwinapi \
+	winmm \
     winspool \
     z \
 

solenv/gbuild/platform/winmingw.mk

@@ -481,6 +481,7 @@ gb_Library_PLAINLIBS_NONE += \
     user32 \
     uuid \
     uwinapi \
+	winmm \
     z \
 
 gb_Library_LAYER := \