[Libreoffice-commits] core.git: vcl/Library_vcl.mk
Caolán McNamara
caolanm at redhat.com
Thu Dec 8 11:38:17 UTC 2016
vcl/Library_vcl.mk | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit fe96732fd13faad9a141f78dfa44efbf5de01ec6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 8 11:37:36 2016 +0000
non-closed ifeq
Change-Id: Ib6f29459644643f2471fcb912f45cd8632f61a31
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7282cf8..1aae3d7 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -625,6 +625,10 @@ $(eval $(call gb_Library_add_libs,vcl,\
-lX11 \
-lXext \
))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/opengl/x11/X11DeviceInfo \
+))
+endif
endif
ifeq ($(OS),ANDROID)
@@ -720,13 +724,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
$(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
endif
-ifneq ($(ENABLE_HEADLESS),TRUE)
-$(eval $(call gb_Library_add_exception_objects,vcl,\
- vcl/opengl/x11/X11DeviceInfo \
-))
-endif
-endif
-
# Runtime dependency for unit-tests
$(eval $(call gb_Library_use_restarget,vcl,vcl))
More information about the Libreoffice-commits
mailing list