From c29098917a1118d4b435df2b5f542adc8505e123 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 12 Dec 2012 01:07:09 +0200
Subject: 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>
---
 cppuhelper/test/bootstrap/makefile.mk       | 2 +-
 cppuhelper/test/loader/makefile.mk          | 2 +-
 cppuhelper/test/makefile.mk                 | 4 ++--
 cppuhelper/test/testcmp/makefile.mk         | 2 +-
 cppuhelper/test/testdefaultbootstrapping.pl | 8 ++++----
 cppuhelper/test/testlib/makefile.mk         | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'cppuhelper')

diff --git a/cppuhelper/test/bootstrap/makefile.mk b/cppuhelper/test/bootstrap/makefile.mk
index 6f185bf32dc0..a2d1715b397b 100644
--- a/cppuhelper/test/bootstrap/makefile.mk
+++ b/cppuhelper/test/bootstrap/makefile.mk
@@ -28,7 +28,7 @@ USE_DEFFILE        := TRUE
 .INCLUDE :  settings.mk
 
 
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
 PURPENVHELPERLIB := -luno_purpenvhelper$(COMID)
 
 .ELSE
diff --git a/cppuhelper/test/loader/makefile.mk b/cppuhelper/test/loader/makefile.mk
index 32e541b2ed0b..73bf2ab64b3c 100644
--- a/cppuhelper/test/loader/makefile.mk
+++ b/cppuhelper/test/loader/makefile.mk
@@ -30,7 +30,7 @@ ENVINCPRE  := -I$(OUT)$/inc$/$(TARGET)
 
 APP1TARGET  := $(TARGET)
 APP1OBJS    := $(OBJ)$/loader.test.obj
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
 APP1STDLIBS := iTestComponent.uno.lib
 .ELSE
 APP1STDLIBS := -lTestComponent.uno
diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk
index 6d80a520fa82..7ff031004eb7 100644
--- a/cppuhelper/test/makefile.mk
+++ b/cppuhelper/test/makefile.mk
@@ -85,7 +85,7 @@ ALL: $(BIN)$/cpputest.rdb				\
      $(BIN)$/$(APP2TARGET).Bin  			\
      $(BIN)$/$(APP2TARGET).Exe
 
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
 ALL:  $(BIN)$/$(APP2TARGET).exe
 
 $(BIN)$/$(APP2TARGET).exe : $(APP2TARGETN)
@@ -147,7 +147,7 @@ $(BIN)$/testdefaultbootstrapping.pl: testdefaultbootstrapping.pl
     cp testdefaultbootstrapping.pl $@
 
 $(BIN)$/testrc: makefile.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
     echo [Tests] > $@
     echo TestKey1=com.sun.star.uno.NamingService.rdb >> $@
 .ELSE
diff --git a/cppuhelper/test/testcmp/makefile.mk b/cppuhelper/test/testcmp/makefile.mk
index ef4c3f974cb3..a59657e64fde 100644
--- a/cppuhelper/test/testcmp/makefile.mk
+++ b/cppuhelper/test/testcmp/makefile.mk
@@ -29,7 +29,7 @@ SHL1TARGET     := $(TARGET)
 SHL1OBJS       := $(SLO)$/TestComponent.obj
 SHL1STDLIBS    := $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) 
 SHL1IMPLIB     := i$(SHL1TARGET)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
 SHL1DEF        := TestComponent.uno.def
 .ELSE
 DEF1NAME       := $(SHL1TARGET)
diff --git a/cppuhelper/test/testdefaultbootstrapping.pl b/cppuhelper/test/testdefaultbootstrapping.pl
index f884044762e9..278e759fb44c 100644
--- a/cppuhelper/test/testdefaultbootstrapping.pl
+++ b/cppuhelper/test/testdefaultbootstrapping.pl
@@ -26,7 +26,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 my $progname = "testdefaultbootstrapping";
 my $defExeExt;
 
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
     %services = (
                  'com.sun.star.uno.NamingService'               => 'namingservice.uno.dll',
                  'com.sun.star.reflection.CoreReflection'       => 'reflection.uno.dll',
@@ -50,7 +50,7 @@ sub extendProgName($) {
     my $_extension = shift;
     my $_result;
 
-    if ($ENV{GUI} eq "WNT") {
+    if ($ENV{OS} eq "WNT") {
         $_result = $progname . $_extension;
     }
     else {
@@ -183,7 +183,7 @@ sub testBeneathLib_rdb() {
 
     my $_rdb_name;
 
-    if ($ENV{GUI} eq "WNT") {
+    if ($ENV{OS} eq "WNT") {
         $_rdb_name = "UNO" . "_services.rdb";
     }
     else {
@@ -206,7 +206,7 @@ sub testBeneathLib_rc() {
 
     my $_rc_name;
 
-    if ($ENV{GUI} eq "WNT") {
+    if ($ENV{OS} eq "WNT") {
         $_rc_name = "UNO.ini";
     }
     else {
diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk
index 2683093f0626..cbf30f08d323 100644
--- a/cppuhelper/test/testlib/makefile.mk
+++ b/cppuhelper/test/testlib/makefile.mk
@@ -38,7 +38,7 @@ PERLINCS:=$(PERLINST)$/CORE
 
 CFLAGS += -I$(PERLINCS)
 
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
 PERLLIB=perl58.lib
 
 LIB!:=$(LIB);$(PERLLIBS)
@@ -67,7 +67,7 @@ DEF1NAME=$(SHL1TARGET)
 SHL1VERSIONMAP=defbootstrap.map
 
 
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
 UNODLL=$(DLLDEST)$/UNO.dll
 .ELSE
 UNODLL=$(DLLDEST)$/UNO.so	
-- 
cgit