[Libreoffice-commits] core.git: canvas/Module_canvas.mk

[Libreoffice Gerrit user]

 canvas/Module_canvas.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c9d8ee0b4261e5a264e63ecb5d3feb4cfa3066c0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 21 00:16:19 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Dec 21 00:16:24 2018 +0200

    Skip Executable_canvasdemo unless DESKTOP
    
    For example, we don't build the vclmain library for non-DESKTOP.
    
    Change-Id: I01a1bcd6387e86c60e5543fcb8009fd1df914a20

diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 28f421f174b1..f62d7ef46299 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -24,7 +24,8 @@ $(eval $(call gb_Module_add_targets,canvas,\
 	Library_canvastools \
 	Library_simplecanvas \
 	Library_vclcanvas \
-	$(if $(DISABLE_GUI),,Executable_canvasdemo) \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)), \
+		$(if $(DISABLE_GUI),,Executable_canvasdemo)) \
 ))
 
 ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)