[Libreoffice-commits] core.git: 2 commits - desktop/Module_desktop.mk svx/Executable_gengal.mk

[Tor Lillqvist]

 desktop/Module_desktop.mk |    5 +++++
 svx/Executable_gengal.mk  |    2 ++
 2 files changed, 7 insertions(+)

New commits:
commit 8f1e4666ababa5bb2411e2828f9ff47e5698adbc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Dec 7 22:47:57 2016 +0200

    Match conditional for glxtest static library in vcl
    
    Change-Id: If5b4308a29c78ded311bf300416b2cb4f553a7d5

diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index e0a45e7..49b3b34 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -74,10 +74,12 @@ $(eval $(call gb_Executable_add_libs,gengal,\
     -lX11 \
 ))
 
+ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Executable_use_static_libraries,gengal,\
 	glxtest \
 ))
 endif
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
commit 6b60ea7f9b8bee5559cf33a9e466d30cafaf0cea
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Dec 7 22:37:12 2016 +0200

    Match conditional in Repository.mk
    
    Change-Id: Ie9deeb673cd5083a2f57a502bfbf49319aa00165

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 5a6604c..17ec5bf 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -52,6 +52,10 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Pagein_impress \
     Pagein_writer \
     CustomTarget_soffice \
+))
+
+ifeq ($(USING_X11), TRUE)
+$(eval $(call gb_Module_add_targets,desktop,\
     Package_sbase_sh \
     Package_scalc_sh \
     Package_sdraw_sh \
@@ -63,6 +67,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
 endif
 endif
 endif
+endif
 
 ifeq ($(OS),WNT)