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 /sal/Library_sal.mk | |
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 'sal/Library_sal.mk')
-rw-r--r-- | sal/Library_sal.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 878453b52b2e..80dc9edfe02b 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -75,7 +75,7 @@ $(eval $(call gb_Library_use_system_win32_libs,sal,\ )) $(eval $(call gb_Library_add_libs,sal,\ - $(if $(filter $(GUI),UNX), \ + $(if $(filter-out $(OS),WNT), \ $(if $(filter $(OS),ANDROID),, \ -lpthread \ ) \ @@ -164,7 +164,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ )) endif -ifeq ($(GUI),UNX) +ifneq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/conditn \ sal/osl/unx/diagnose \ @@ -224,7 +224,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\ )) endif -else # $(GUI) != UNX +else # $(OS) == WNT # FIXME ? # .IF "$(CCNUMVER)" >= "001400000000" @@ -262,6 +262,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\ sal/osl/w32/util \ )) -endif # ifeq ($(GUI),UNX) +endif # ifneq ($(OS),WNT) # vim: set noet sw=4 ts=4: |