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 /setup_native/source | |
| 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 'setup_native/source')
12 files changed, 12 insertions, 12 deletions
diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk index e8c7d0485202..874c9651afc6 100644 --- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk +++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk @@ -31,7 +31,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk index 5475ca25437b..aef948cad52a 100644 --- a/setup_native/source/win32/customactions/javafilter/makefile.mk +++ b/setup_native/source/win32/customactions/javafilter/makefile.mk @@ -31,7 +31,7 @@ DYNAMIC_CRT= # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk index b1d1362b4d2f..1f54f3545088 100644 --- a/setup_native/source/win32/customactions/languagepacks/makefile.mk +++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk @@ -32,7 +32,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk index 019dcae31c65..81ff1c4878f7 100644 --- a/setup_native/source/win32/customactions/patch/makefile.mk +++ b/setup_native/source/win32/customactions/patch/makefile.mk @@ -31,7 +31,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk index de3489c85840..d0a6a3c460db 100644 --- a/setup_native/source/win32/customactions/quickstarter/makefile.mk +++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk @@ -36,7 +36,7 @@ UWINAPILIB= # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" STDSHL += \ $(ADVAPI32LIB)\ diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk index 3c83b3f8f542..d9c111df4fb8 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk +++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk @@ -33,7 +33,7 @@ CFLAGS+=-DUNICODE -D_UNICODE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk index c76ceebd7c0f..c96e2980d7cf 100644 --- a/setup_native/source/win32/customactions/regactivex/makefile.mk +++ b/setup_native/source/win32/customactions/regactivex/makefile.mk @@ -31,7 +31,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk index 1a8731516733..cbc2652efbb6 100644 --- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk +++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk @@ -27,7 +27,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" STDSHL= diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk index afe0c756964b..7470886ca82d 100644 --- a/setup_native/source/win32/customactions/sellang/makefile.mk +++ b/setup_native/source/win32/customactions/sellang/makefile.mk @@ -29,7 +29,7 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" CFLAGS+=-D_STLP_USE_STATIC_LIB diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index e85acc476f4e..5840a52cacf2 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -31,7 +31,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk index 956f2571c216..115b70e1fa32 100644 --- a/setup_native/source/win32/customactions/thesaurus/makefile.mk +++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk @@ -29,7 +29,7 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" CFLAGS+=-D_STLP_USE_STATIC_LIB diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk index c991be26fe8a..daae3181103e 100644 --- a/setup_native/source/win32/customactions/tools/makefile.mk +++ b/setup_native/source/win32/customactions/tools/makefile.mk @@ -32,7 +32,7 @@ USE_DEFFILE=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" +.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!="" UWINAPILIB= |