diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-12 01:07:09 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:53:25 +0000 |
| commit | c29098917a1118d4b435df2b5f542adc8505e123 (patch) | |
| tree | f9407e3cf21b49abb40d536f73364abbddcb5ea3 /stoc/test | |
| parent | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (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 'stoc/test')
| -rw-r--r-- | stoc/test/makefile.mk | 6 | ||||
| -rw-r--r-- | stoc/test/security/makefile.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk index 7b127215cfd7..97c5950a3568 100644 --- a/stoc/test/makefile.mk +++ b/stoc/test/makefile.mk @@ -85,10 +85,10 @@ APP3STDLIBS= \ $(REGLIB) \ $(SALLIB) -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" APP3STDLIBS+= -l$(SHL1TARGET) .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" APP3STDLIBS+= i$(SHL1TARGET).lib .ENDIF @@ -187,7 +187,7 @@ TESTPROXYFAC:=com.sun.star.reflection.XProxyFactory TESTSECURITY:=com.sun.star.security.AllPermission;com.sun.star.security.XPolicy;com.sun.star.security.XAccessController;com.sun.star.io.FilePermission;com.sun.star.connection.SocketPermission;com.sun.star.uno.XCurrentContext $(BIN)$/test1.rdb: $(SHL1TARGETN) -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" cp $(SHL1TARGETN) $(BIN) .ENDIF cd $(BIN) && regcomp -register -r test1.rdb -c $(SHL1TARGET) diff --git a/stoc/test/security/makefile.mk b/stoc/test/security/makefile.mk index 64c12633d729..c71f91bac5e9 100644 --- a/stoc/test/security/makefile.mk +++ b/stoc/test/security/makefile.mk @@ -37,7 +37,7 @@ APP1STDLIBS= \ $(SALHELPERLIB) \ $(SALLIB) -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" APP1STDLIBS+= # $(LIBCIMT) $(LIBCMT) .ENDIF |