summaryrefslogtreecommitdiff
path: root/sal/workben
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 /sal/workben
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 'sal/workben')
-rw-r--r--sal/workben/makefile.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index eb3873aa3db5..b7141a73d9db 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -163,13 +163,13 @@ APP10DEPN=$(LB)$/isal.lib
SHL10OBJS=$(SLO)$/t_osl_getVolInfo.obj
SHL10TARGET=togvi
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
APP10STDLIBS=$(KERNEL32LIB)
SHL10STDLIBS=$(LB)$/isal.lib
SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL10STDLIBS=$(LB)$/libsal.so
SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF
@@ -186,20 +186,20 @@ OBJFILES+=\
APP10TARGET=ojpx
APP10OBJS=$(OBJ)$/t_ojp_exe.obj
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP10STDLIBS=$(LB)$/libsal.so
.ENDIF
SHL10OBJS=$(SLO)$/t_osl_joinProcess.obj
SHL10TARGET=tojp
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
APP10STDLIBS=$(KERNEL32LIB)
SHL10STDLIBS=$(LB)$/isal.lib
SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL10STDLIBS=$(LB)$/libsal.so
SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF