add cairocanvas and canvasfactory

canvas/Library_cairocanvas.mk

@@ -35,6 +35,11 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
 	-I$(SRCDIR)/canvas/inc/pch \
 ))
 
+$(eval $(call gb_Library_add_api,cairocanvas,\
+    offapi \
+    udkapi \
+))
+
 ifneq ($(strip $(VERBOSE)$(verbose)),)
 $(eval $(call gb_Library_add_defs,cairocanvas,\
 	-DVERBOSE \

canvas/Module_canvas.mk

@@ -28,13 +28,15 @@
 $(eval $(call gb_Module_Module,canvas))
 
 $(eval $(call gb_Module_add_targets,canvas,\
+	Library_cairocanvas \
+	Library_canvasfactory \
 	Library_canvastools \
 	Library_nullcanvas \
 	Library_simplecanvas \
 	Library_vclcanvas \
-	Library_canvasfactory \
 	Package_inc \
 ))
+
 ifeq ($(strip $(OS)),WNT)
 ifneq ($(strip $(ENABLE_DIRECTX)),)
 
@@ -52,10 +54,4 @@ $(eval $(call gb_Module_add_targets,canvas,\
 endif
 endif
 
-ifeq ($(strip $(ENABLE_CAIRO_CANVAS)),TRUE)
-$(eval $(call gb_Module_add_targets,canvas,\
-	Library_cairocanvas \
-))
-endif
-
 # vim: set noet sw=4 ts=4: