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>

5 files changed, 23 insertions, 23 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,\
diff --git a/xmlsecurity/tools/standalone/csfit/makefile.mk b/xmlsecurity/tools/standalone/csfit/makefile.mk
index e2fb7073dbb1..841f3567d7cc 100644
--- a/xmlsecurity/tools/standalone/csfit/makefile.mk
+++ b/xmlsecurity/tools/standalone/csfit/makefile.mk
@@ -52,7 +52,7 @@ SHARE_LIBS =	\
         $(SALHELPERLIB)	\
         $(SALLIB)
 
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
 SHARE_LIBS+= "ixml2.lib" "nss3.lib" "nspr4.lib" "libxmlsec.lib" "libxmlsec-nss.lib" "xsec_xmlsec.lib"
 .ELSE
 SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec1" "-lxmlsec1-nss" "-lxsec_xmlsec"
diff --git a/xmlsecurity/tools/standalone/csfit/util/makefile.mk b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
index 1ada5afaac67..0e33cd99ca41 100644
--- a/xmlsecurity/tools/standalone/csfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
@@ -58,13 +58,13 @@ REGISTERLIBS+= \
     $(DLLPRE)xsec_fw$(DLLPOST) \
     $(DLLPRE)xsec_xmlsec$(DLLPOST)
 
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
 MY_DLLDIR=$(SOLARLIBDIR)
 REGISTERLIBS+= \
     $(DLLPRE)dtransX11$(DLLPOSTFIX)$(DLLPOST)
 
-.ELSE			# "$(GUI)" == "UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE			# "$(OS)" != "WNT"
+.IF "$(OS)"=="WNT"
 
 MY_DLLDIR=$(SOLARBINDIR)
 REGISTERLIBS+= \
@@ -72,14 +72,14 @@ REGISTERLIBS+= \
     $(DLLPRE)ftransl$(DLLPOST) \
     $(DLLPRE)dnd$(DLLPOST)
 
-.ELSE			# "$(GUI)"=="WNT"
+.ELSE			# "$(OS)"=="WNT"
 
     @echo "**********************************************************"
     @echo "*** unknown platform: don't know which librarys to use ***"
     @echo "**********************************************************"
     force_dmake_to_error
-.ENDIF			# "$(GUI)"=="WNT"
-.ENDIF			# "$(GUI)" == "UNX"
+.ENDIF			# "$(OS)"=="WNT"
+.ENDIF			# "$(OS)" != "WNT"
 
 .IF "$(SOLAR_JAVA)" != ""
 .IF "$(JAVANUMVER)" >= "000100040000"
@@ -102,7 +102,7 @@ REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
 MY_CLASSPATH_TMP=$(foreach,i,$(REGCOMP_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(SOLARLIBDIR)$(PATH_SEPERATOR)$(XCLASSPATH)
 REGCOMP_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))
 
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
 DOLLAR_SIGN=\$$
 MY_JAVA_COMPPATH=file://$(SOLARBINDIR)
 .IF "$(OS)"=="MACOSX"
@@ -114,7 +114,7 @@ REGCOMP_ENV=\
     setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
     setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
 .ENDIF
-.ELSE # "$(GUI)" != "WNT"
+.ELSE # "$(OS)" != "WNT"
 .IF "$(USE_SHELL)" != "4nt"
 DOLLAR_SIGN=\$$
 REGCOMP_ENV=\
@@ -128,7 +128,7 @@ REGCOMP_ENV=\
     set PATH=$(PATH);$(JREPATH)
 MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))
 .ENDIF  # "$(USE_SHELL)" != "4nt"
-.ENDIF  # "$(GUI)"!="WNT"
+.ENDIF  # "$(OS)"!="WNT"
 .ENDIF  # "$(JAVANUMVER)" >= "000100040000"
 .ENDIF  # "$(SOLAR_JAVA)" != ""
 
diff --git a/xmlsecurity/tools/standalone/mscsfit/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/makefile.mk
index 2c952d807e2e..b56671fd0a5a 100644
--- a/xmlsecurity/tools/standalone/mscsfit/makefile.mk
+++ b/xmlsecurity/tools/standalone/mscsfit/makefile.mk
@@ -43,7 +43,7 @@ SHARE_LIBS =	\
         $(CPPUHELPERLIB) \
         $(SALLIB)
 
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
 SHARE_LIBS+= "libxml2.lib" "crypt32.lib" "advapi32.lib" "libxmlsec.lib" "libxmlsec-mscrypto.lib" "xsec_xmlsec.lib" "xs_comm.lib" "xs_mscrypt.lib"
 .ELSE
 SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec1" "-lxmlsec1-nss" "-lxsec_xmlsec" "-lxs_comm" "-lxs_nss"
diff --git a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
index 2689d6079b4a..94264370200a 100644
--- a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
@@ -58,13 +58,13 @@ REGISTERLIBS+= \
     $(DLLPRE)xsec_fw$(DLLPOST) \
     $(DLLPRE)xsec_xmlsec$(DLLPOST)
 
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
 MY_DLLDIR=$(SOLARLIBDIR)
 REGISTERLIBS+= \
     $(DLLPRE)dtransX11$(DLLPOSTFIX)$(DLLPOST)
 
-.ELSE			# "$(GUI)" == "UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE			# "$(OS)" != "WNT"
+.IF "$(OS)"=="WNT"
 
 MY_DLLDIR=$(SOLARBINDIR)
 REGISTERLIBS+= \
@@ -72,14 +72,14 @@ REGISTERLIBS+= \
     $(DLLPRE)ftransl$(DLLPOST) \
     $(DLLPRE)dnd$(DLLPOST)
 
-.ELSE			# "$(GUI)"=="WNT"
+.ELSE			# "$(OS)"=="WNT"
 
     @echo "**********************************************************"
     @echo "*** unknown platform: don't know which librarys to use ***"
     @echo "**********************************************************"
     force_dmake_to_error
-.ENDIF			# "$(GUI)"=="WNT"
-.ENDIF			# "$(GUI)" == "UNX"
+.ENDIF			# "$(OS)"=="WNT"
+.ENDIF			# "$(OS)" != "WNT"
 
 .IF "$(SOLAR_JAVA)" != ""
 .IF "$(JAVANUMVER)" >= "000100040000"
@@ -102,7 +102,7 @@ REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
 MY_CLASSPATH_TMP=$(foreach,i,$(REGCOMP_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(SOLARLIBDIR)$(PATH_SEPERATOR)$(XCLASSPATH)
 REGCOMP_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))
 
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
 DOLLAR_SIGN=\$$
 MY_JAVA_COMPPATH=file://$(SOLARBINDIR)
 .IF "$(OS)"=="MACOSX"
@@ -114,7 +114,7 @@ REGCOMP_ENV=\
     setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
     setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
 .ENDIF
-.ELSE # "$(GUI)" != "WNT"
+.ELSE # "$(OS)" != "WNT"
 .IF "$(USE_SHELL)" != "4nt"
 DOLLAR_SIGN=\$$
 REGCOMP_ENV=\
@@ -128,7 +128,7 @@ REGCOMP_ENV=\
     set PATH=$(PATH);$(JREPATH)
 MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))
 .ENDIF  # "$(USE_SHELL)" != "4nt"
-.ENDIF  # "$(GUI)"!="WNT"
+.ENDIF  # "$(OS)"!="WNT"
 .ENDIF  # "$(JAVANUMVER)" >= "000100040000"
 .ENDIF  # "$(SOLAR_JAVA)" != ""