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 /scp2 | |
| 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 'scp2')
| -rw-r--r-- | scp2/InstallModule_javafilter.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_python.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk index 117f598e393c..c5d8ee035ae2 100644 --- a/scp2/InstallModule_javafilter.mk +++ b/scp2/InstallModule_javafilter.mk @@ -33,7 +33,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/javafilter,\ scp2/source/javafilter/module_javafilter \ - $(if $(filter WNT,$(GUI)),\ + $(if $(filter WNT,$(OS)),\ scp2/source/javafilter/registryitem_javafilter \ ) \ )) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index a9c272e539a3..f3e4015b6fe9 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -206,7 +206,7 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ scp2/source/ooo/scpaction_ooo \ scp2/source/ooo/shortcut_ooo \ scp2/source/ooo/ure_into_ooo \ - $(if $(filter WNTGCC,$(GUI)$(COM)),\ + $(if $(filter WNTGCC,$(OS)$(COM)),\ scp2/source/ooo/mingw_dlls \ ) \ )) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index eedc2cb4de50..7153deee8d65 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -37,7 +37,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\ )) # mingw: mix mode copy file from system python to installation set -ifeq ($(GUI)$(COM),WNTGCC) +ifeq ($(OS)$(COM),WNTGCC) $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DPYVERSION=$(PYTHON_VERSION) \ -DMINGW_SYSTEM_PYTHON \ diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index dd9a4d023879..a49c31f51a3b 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -41,7 +41,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ scp2/ure \ scp2/writer \ scp2/xsltfilter \ - $(if $(filter WNT,$(GUI)),\ + $(if $(filter WNT,$(OS)),\ scp2/activex \ scp2/quickstart \ scp2/windows \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index c4f8145d7e60..6a309b787e0f 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallScript_sdkoo \ InstallScript_setup_osl \ InstallScript_test \ - $(if $(filter WNT,$(GUI)),\ + $(if $(filter WNT,$(OS)),\ InstallModule_activex \ InstallModule_quickstart \ InstallModule_windows \ |