[PATCH] remove last uses of config 'GUI' variable
Matúš Kukan (via_Code_Review)
gerrit at gerrit.libreoffice.org
Fri Jun 7 06:18:28 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4188
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/4188/1
remove last uses of config 'GUI' variable
Change-Id: I97188235f0b72b5b54423e05deeaf17c5c681048
---
M config_host.mk.in
M configure.ac
M extensions/Library_npsoplugin.mk
M extensions/Library_pl.mk
M helpcompiler/source/HelpCompiler.cxx
M readlicense_oo/CustomTarget_readme.mk
M readlicense_oo/docs/readme.xsl
M solenv/bin/modules/installer/control.pm
8 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/config_host.mk.in b/config_host.mk.in
index 9e35fcf..00d9708 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -206,7 +206,6 @@
export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@
export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
-export GUI=@GUI@
export GUIBASE=@GUIBASE@
export HARDLINKDELIVER=@HARDLINKDELIVER@
export HAVE_CXX0X=@HAVE_CXX0X@
diff --git a/configure.ac b/configure.ac
index 236e683..ab36298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3436,7 +3436,7 @@
AC_SUBST(x_LDFLAGS)
#
-# determine CPU, CPUNAME, GUI, GUIBASE, ...
+# determine CPU, CPUNAME, GUIBASE, ...
#
LIB64="lib"
SOLARINC=
@@ -3447,7 +3447,6 @@
COM=GCC
CPU=P
CPUNAME=POWERPC
- GUI=UNX
GUIBASE=unx
OS=AIX
RTL_OS=AIX
@@ -3460,7 +3459,6 @@
cygwin*)
COM=MSC
- GUI=WNT
GUIBASE=not-used
OS=WNT
RTL_OS=Windows
@@ -3494,7 +3492,6 @@
darwin*)
COM=GCC
- GUI=UNX
GUIBASE=not-used
OS=MACOSX
RTL_OS=MacOSX
@@ -3544,7 +3541,6 @@
dragonfly*)
COM=GCC
- GUI=UNX
GUIBASE=unx
OS=DRAGONFLY
RTL_OS=DragonFly
@@ -3573,7 +3569,6 @@
freebsd*)
COM=GCC
- GUI=UNX
GUIBASE=unx
RTL_OS=FreeBSD
OS=FREEBSD
@@ -3603,7 +3598,6 @@
kfreebsd*)
COM=GCC
- GUI=UNX
GUIBASE=unx
OS=LINUX
RTL_OS=kFreeBSD
@@ -3635,7 +3629,6 @@
linux-gnu*)
COM=GCC
- GUI=UNX
GUIBASE=unx
OS=LINUX
RTL_OS=Linux
@@ -3779,7 +3772,6 @@
linux-android*)
COM=GCC
- GUI=UNX
GUIBASE=not-used
OS=ANDROID
RTL_OS=Android
@@ -3817,7 +3809,6 @@
mingw*)
COM=GCC
- GUI=WNT
GUIBASE=not-used
OS=WNT
RTL_OS=Windows
@@ -3852,7 +3843,6 @@
*netbsd*)
COM=GCC
- GUI=UNX
GUIBASE=unx
OS=NETBSD
RTL_OS=NetBSD
@@ -3893,7 +3883,6 @@
openbsd*)
COM=GCC
- GUI=UNX
GUIBASE=unx
OS=OPENBSD
RTL_OS=OpenBSD
@@ -3926,7 +3915,6 @@
solaris*)
COM=GCC
- GUI=UNX
GUIBASE=unx
OS=SOLARIS
RTL_OS=Solaris
@@ -3992,7 +3980,6 @@
AC_SUBST(RTL_OS)
AC_SUBST(RTL_ARCH)
AC_SUBST(EPM_FLAGS)
-AC_SUBST(GUI)
AC_SUBST(GUIBASE)
AC_SUBST(INPATH)
AC_SUBST([INSTDIR])
@@ -4108,7 +4095,7 @@
cp configure CONF-FOR-BUILD
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host
(
- unset COM GUI GUIBASE OS CPU CPUNAME
+ unset COM GUIBASE OS CPU CPUNAME
unset CC CXX SYSBASE CFLAGS
unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
unset CPPUNIT_CFLAGS CPPUNIT_LIBS
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 90d4880..74bdb8a 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -45,9 +45,7 @@
))
endif
-endif # GUI=UNX
-
-ifeq ($(OS),WNT)
+else ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_static_libraries,npsoplugin,\
ooopathutils \
@@ -95,7 +93,7 @@
$(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin))
-endif # GUI=WNT
+endif
$(eval $(call gb_Library_add_exception_objects,npsoplugin,\
extensions/source/nsplugin/source/npshell \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 3970fdf..102217a 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -55,11 +55,8 @@
extensions/source/plugin/win/winmgr \
extensions/source/plugin/win/sysplug \
))
-endif # GUI=WNT
-ifneq ($(OS),WNT)
-
-ifeq ($(OS),MACOSX)
+else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_objcxxobjects,pl,\
extensions/source/plugin/aqua/macmgr \
@@ -72,7 +69,7 @@
CoreFoundation \
))
-else # OS!=MACOSX
+else
ifeq ($(ENABLE_GTK),TRUE)
$(eval $(call gb_Library_add_defs,pl,\
@@ -96,9 +93,7 @@
-lX11 \
))
-endif # OS=MACOSX
-
-endif # GUI=UNX
+endif
$(eval $(call gb_Library_use_libraries,pl,\
tk \
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 1abcfba..4c8090d 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -46,12 +46,10 @@
resEmbStylesheet(in_resEmbStylesheet), bExtensionMode( in_bExtensionMode )
{
xmlKeepBlanksDefaultValue = 0;
- char* guitmp = getenv("GUI");
- if (guitmp)
+ char* os = getenv("OS");
+ if (os)
{
- gui = (strcmp(guitmp, "UNX") ? gui : "UNIX");
- gui = (strcmp(guitmp, "MAC") ? gui : "MAC");
- gui = (strcmp(guitmp, "WNT") ? gui : "WIN");
+ gui = (strcmp(os, "WNT") ? "UNIX" : "WIN");
}
}
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 047f36c..13b731e 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -58,7 +58,6 @@
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet --novalid -o $@.out \
--stringparam com1 $(COM) \
--stringparam cp1 $(CPUNAME) \
- --stringparam gui1 $(GUI) \
--stringparam lang1 $(word 2,$(subst _, ,$(basename $(notdir $@)))) \
--stringparam os1 $(OS) \
--stringparam type text \
diff --git a/readlicense_oo/docs/readme.xsl b/readlicense_oo/docs/readme.xsl
index e63e319..5c32943 100755
--- a/readlicense_oo/docs/readme.xsl
+++ b/readlicense_oo/docs/readme.xsl
@@ -6,7 +6,6 @@
<!-- inputvariable declaration -->
<xsl:param name="os1"/>
- <xsl:param name="gui1"/>
<xsl:param name="cp1"/>
<xsl:param name="com1"/>
<xsl:param name="lang1"/>
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 573d1bb..c1894bd 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -266,7 +266,6 @@
my @environmentvariables = qw(
SOLARVERSION
- GUI
WORK_STAMP
OUTPATH
LOCAL_OUT
--
To view, visit https://gerrit.libreoffice.org/4188
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97188235f0b72b5b54423e05deeaf17c5c681048
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan at gmail.com>
More information about the LibreOffice
mailing list