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 /liblangtag | |
| 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 'liblangtag')
| -rw-r--r-- | liblangtag/ExternalPackage_langtag.mk | 2 | ||||
| -rw-r--r-- | liblangtag/ExternalProject_langtag.mk | 2 | ||||
| -rw-r--r-- | liblangtag/UnpackedTarball_langtag.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/liblangtag/ExternalPackage_langtag.mk b/liblangtag/ExternalPackage_langtag.mk index deb26157fd17..3770a3e7675d 100644 --- a/liblangtag/ExternalPackage_langtag.mk +++ b/liblangtag/ExternalPackage_langtag.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,langtag,langtag)) $(eval $(call gb_ExternalPackage_use_external_project,langtag,langtag)) -ifeq ($(GUI)$(COM),WNTMSC) +ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_ExternalPackage_add_file,langtag,lib/langtag.lib,liblangtag/.libs/langtag.lib)) else $(eval $(call gb_ExternalPackage_add_file,langtag,lib/liblangtag.a,liblangtag/.libs/liblangtag.a)) diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk index d23f5e3f6faf..ca2a6502e7f3 100644 --- a/liblangtag/ExternalProject_langtag.mk +++ b/liblangtag/ExternalProject_langtag.mk @@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl,-z,origin -Wl,-rpath,$$ORIGIN:$$ORIGIN/../ure-link/lib") \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl,-z,origin -Wl,-R,$$ORIGIN:$$ORIGIN/../ure-link/lib") \ - $(if $(filter-out WNTGCC,$(GUI)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \ + $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \ && $(MAKE) \ && touch $@ # vim: set noet sw=4 ts=4: diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk index 663d7245f8d3..f610ea3a187d 100644 --- a/liblangtag/UnpackedTarball_langtag.mk +++ b/liblangtag/UnpackedTarball_langtag.mk @@ -42,7 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ )) endif -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ liblangtag/liblangtag-0.4.0-mingw.patch \ |