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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/odiapi/makefile.mk | 4 | ||||
| -rw-r--r-- | writerfilter/qa/cppunittests/qname/makefile.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk index fd64fcae04d8..534906075644 100644 --- a/writerfilter/qa/cppunittests/odiapi/makefile.mk +++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk @@ -36,9 +36,9 @@ SHL1OBJS=\ SHL1TARGET=$(TARGET) SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" SHL1STDLIBS+= $(LB)$/iodiapi.lib -.ELIF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX" +.ELIF "$(OS)"!="WNT" && "$(OS)"!="MACOSX" SHL1STDLIBS+=$(LB)$/libodiapi.so .ELIF "$(OS)"=="MACOSX" SHL1STDLIBS+=$(LB)$/libodiapi.dylib diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk index 4b35c121b09c..82fe397f773f 100644 --- a/writerfilter/qa/cppunittests/qname/makefile.mk +++ b/writerfilter/qa/cppunittests/qname/makefile.mk @@ -31,7 +31,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS) # BEGIN ---------------------------------------------------------------- # auto generated Target:testjob by codegen.pl -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" CFLAGS+=/Ob1 .ENDIF @@ -42,10 +42,10 @@ SHL1TARGET=$(TARGET) SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" SHL1STDLIBS+= $(LB)$/iodiapi.lib .ENDIF -.IF "$(GUI)" == "UNX" +.IF "$(OS)" != "WNT" SHL1STDLIBS+=$(LB)$/libodiapi.so .ENDIF |