summaryrefslogtreecommitdiff
path: root/xmlsecurity/Library_xsec_xmlsec.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-12-12 01:07:09 +0200
committerPeter Foley <pefoley2@verizon.net>2012-12-25 17:53:25 +0000
commitc29098917a1118d4b435df2b5f542adc8505e123 (patch)
treef9407e3cf21b49abb40d536f73364abbddcb5ea3 /xmlsecurity/Library_xsec_xmlsec.mk
parente5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (diff)
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'xmlsecurity/Library_xsec_xmlsec.mk')
-rw-r--r--xmlsecurity/Library_xsec_xmlsec.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 1396f026d973..4a9ca4d0d313 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -95,7 +95,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xsec_nss \
))
-ifeq ($(GUI)$(CROSS_COMPILING),WNT)
+ifeq ($(OS)$(CROSS_COMPILING),WNT)
$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_MSCRYPTO \
@@ -127,7 +127,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_NSS \
))
-ifeq ($(GUI)$(CROSS_COMPILING),WNTYES)
+ifeq ($(OS)$(CROSS_COMPILING),WNTYES)
$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
xmlsec1-nss \
))
@@ -152,7 +152,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \
))
-endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT)
+endif # ifeq ($(OS)$(CROSS_COMPILING),WNT)
ifeq ($(OS),SOLARIS)
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\