[Libreoffice-commits] .: Branch 'feature/gnumake4' - canvas/Library_cairocanvas.mk canvas/Module_canvas.mk

[Bjoern Michaelsen]

 canvas/Library_cairocanvas.mk |    5 +++++
 canvas/Module_canvas.mk       |   10 +++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit d73b274782fc7595748b04101bc65e70b387a6f0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jul 23 02:38:41 2011 +0200

    add cairocanvas and canvasfactory

diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 6747bbd..6d36898 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/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 \
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 41d5c72..4a2c3df 100644
--- a/canvas/Module_canvas.mk
+++ b/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: