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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 2 | ||||
| -rw-r--r-- | sd/Library_sdui.mk | 2 | ||||
| -rw-r--r-- | sd/workben/testdll/makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index b0946eb0c1d4..19adf059c66d 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -542,7 +542,7 @@ endif endif -ifeq ($(strip $(GUI)),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Library_add_cxxobjects,sd,\ sd/source/ui/app/optsitem \ sd/source/ui/func/futext \ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 2304d493feb9..e80316f2c82e 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -107,6 +107,6 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\ )) # $(WORKDIR)/inc/sd/sddll0.hxx : - # echo "#define" DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@ + # echo "#define" DLL_NAME \"$(if $(filter-out WNT,$(OS)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@ # vim: set noet sw=4 ts=4: diff --git a/sd/workben/testdll/makefile b/sd/workben/testdll/makefile index a508b4193c7d..59498665336f 100644 --- a/sd/workben/testdll/makefile +++ b/sd/workben/testdll/makefile @@ -62,7 +62,7 @@ SHL1OBJS= $(SLO)\test.obj # --- Targets ------------------------------------------------------ !INCLUDE <target.mak> -!IF "$(GUI)" == "WNT" +!IF "$(OS)" == "WNT" $(MISC)\$(SHL1TARGET).def: makefile @echo ------------------------------ |