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 /pyuno | |
| 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 'pyuno')
| -rw-r--r-- | pyuno/CustomTarget_zipcore.mk | 2 | ||||
| -rw-r--r-- | pyuno/Library_pyuno_wrapper.mk | 2 | ||||
| -rw-r--r-- | pyuno/Module_pyuno.mk | 2 | ||||
| -rw-r--r-- | pyuno/Package_python_scripts.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk index 5f1694ec489b..3235e1e9c62f 100644 --- a/pyuno/CustomTarget_zipcore.mk +++ b/pyuno/CustomTarget_zipcore.mk @@ -29,7 +29,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,pyuno/zipcore)) # system python (only mingw) ifeq ($(SYSTEM_PYTHON),YES) # mingw: MINGW_SYSROOT is defined in configure -ifeq ($(GUI)$(COM),WNTGCC) +ifeq ($(OS)$(COM),WNTGCC) pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) endif else diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index b88bc2b41f19..30aac1d88ea9 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_externals,pyuno_wrapper,\ python_headers \ )) -ifneq ($(GUI)$(COM),WNTMSC) +ifneq ($(OS)$(COM),WNTMSC) ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) $(eval $(call gb_Library_add_libs,pyuno_wrapper,\ diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 723b08530c32..0cdb458c575a 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -59,7 +59,7 @@ endif ifneq ($(SYSTEM_PYTHON),YES) # zipcore: python.sh on Unix -ifeq ($(GUI),UNX) +ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,pyuno,\ CustomTarget_python_shell \ Package_python_shell \ diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk index 3672f6106f5e..f41f73f77384 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Package_Package,pyuno_python,$(SRCDIR)/pyuno/source)) -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) pyuno_PYTHON_SCRIPT_DIR=bin else pyuno_PYTHON_SCRIPT_DIR=lib |