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>

7 files changed, 9 insertions, 9 deletions

diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 866257e1fde2..bbfb56fe1eea 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Executable_use_libraries,nsplugin,\
 	sal \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_exception_objects,nsplugin,\
 	extensions/source/nsplugin/source/nsp_windows \
 ))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 7695e9deb70e..63ee754454ea 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
 	nputils \
 ))
 
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
 
 $(eval $(call gb_Library_add_libs,npsoplugin,\
 	-ldl \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index a5b1f70a98cf..92e707faf2d5 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_libs,pl,\
 ))
 endif # OS=SOLARIS
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,pl,\
 	advapi32 \
 	ole32 \
@@ -75,7 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,pl,\
 ))
 endif # GUI=WNT
 
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
 
 ifeq ($(OS),MACOSX)
 
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index ac173bf1d8d5..d64c16d60ff6 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -52,14 +52,14 @@ $(eval $(call gb_Library_add_exception_objects,scn,\
 	extensions/source/scanner/scanner \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_packages,scn,twain_inc))
 
 $(eval $(call gb_Library_add_exception_objects,scn,\
 	extensions/source/scanner/scanwin \
 ))
 else
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
 
 $(eval $(call gb_Library_add_exception_objects,scn,\
 	extensions/source/scanner/grid \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 4912721ea94a..4c831590daed 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -109,7 +109,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_pl \
 ))
 
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
 ifneq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,extensions,\
 	StaticLibrary_plugcon \
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index ba94b0bbe70d..bb073e7d2f7d 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifneq ($(GUI),UNX)
+ifeq ($(OS),WNT)
 $(error only for UNX)
 endif
 
diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk
index 344ecc3457ee..ce3515100fe3 100644
--- a/extensions/qa/complex/extensions/makefile.mk
+++ b/extensions/qa/complex/extensions/makefile.mk
@@ -37,7 +37,7 @@ EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
 
 
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
 command_seperator=&&
 .ELSE
 command_seperator=;