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 /odk | |
| 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 'odk')
| -rw-r--r-- | odk/pack/copying/makefile.mk | 12 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index ec5f1723bc3d..e3421d3c9a64 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -52,12 +52,12 @@ EXELIST += \ $(DESTDIRBIN)/ucpp$(EXEPOSTFIX) .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" EXELIST += \ $(DESTDIRBIN)/climaker$(EXEPOSTFIX) .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" CLILIST = \ $(DESTDIRCLI)/cli_basetypes.dll \ $(DESTDIRCLI)/cli_uretypes.dll \ @@ -67,7 +67,7 @@ CLILIST = \ .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" LIBLIST = \ $(DESTDIRLIB)/istore.lib \ $(DESTDIRLIB)/ireg.lib \ @@ -99,11 +99,11 @@ SETTINGSLIST= \ $(DESTDIRSETTINGS)/dk.mk -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.def .ENDIF -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.map .ENDIF @@ -140,7 +140,7 @@ DOCUFILES= \ $(DESTDIRDOCUIMAGES)/sdk_line-1.gif \ $(DESTDIRDOCUIMAGES)/sdk_line-2.gif -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" INSTALLSCRIPT= \ $(DESTDIR)/config.guess \ $(DESTDIR)/config.sub \ diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 8d753ebb84eb..31e526ffab98 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -70,7 +70,7 @@ MY_COPY_RECURSIVE=$(GNUCOPY) -urf MY_DELETE_RECURSIVE=rm -rf MY_TEXTCOPY=@cp -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" #-------------------- # WNT ONLY #-------------------- @@ -154,7 +154,7 @@ INCLUDETOPDIRLIST= \ $(INCOUT)/cppuhelper \ $(INCOUT)/registry -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" INCLUDETOPDIRLIST += $(INCOUT)/systools .ENDIF |