summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-12-12 01:07:09 +0200
committerPeter Foley <pefoley2@verizon.net>2012-12-25 17:53:25 +0000
commitc29098917a1118d4b435df2b5f542adc8505e123 (patch)
treef9407e3cf21b49abb40d536f73364abbddcb5ea3
parente5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (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>
-rw-r--r--RepositoryExternal.mk8
-rw-r--r--autodoc/source/exes/adc_uni/makefile.mk2
-rw-r--r--avmedia/Library_avmediagst.mk2
-rw-r--r--avmedia/Library_avmediagst_0_10.mk2
-rw-r--r--basic/CppunitTest_basic_coverage.mk2
-rw-r--r--basic/CppunitTest_basic_enable.mk2
-rw-r--r--basic/CppunitTest_basic_nested_struct.mk2
-rw-r--r--basic/CppunitTest_basic_scanner.mk2
-rw-r--r--basic/Library_sb.mk10
-rw-r--r--bean/Library_officebean.mk4
-rw-r--r--bean/test/applet/oooapplet/makefile.mk2
-rwxr-xr-xbootstrap4
-rw-r--r--bridges/Library_java_uno.mk2
-rw-r--r--bridges/test/java_uno/acquire/makefile.mk2
-rw-r--r--bridges/test/java_uno/any/makefile.mk2
-rw-r--r--bridges/test/java_uno/equals/makefile.mk2
-rw-r--r--bridges/test/java_uno/nativethreadpool/makefile.mk4
-rw-r--r--cairo/cairo/makefile.mk2
-rw-r--r--cairo/pixman/makefile.mk2
-rw-r--r--canvas/workben/makefile.mk2
-rw-r--r--connectivity/Library_postgresql-sdbc-impl.mk2
-rw-r--r--connectivity/Module_connectivity.mk6
-rw-r--r--cppuhelper/test/bootstrap/makefile.mk2
-rw-r--r--cppuhelper/test/loader/makefile.mk2
-rw-r--r--cppuhelper/test/makefile.mk4
-rw-r--r--cppuhelper/test/testcmp/makefile.mk2
-rw-r--r--cppuhelper/test/testdefaultbootstrapping.pl8
-rw-r--r--cppuhelper/test/testlib/makefile.mk4
-rw-r--r--cui/Library_cui.mk4
-rw-r--r--curl/ExternalPackage_curl.mk2
-rw-r--r--curl/ExternalProject_curl.mk2
-rw-r--r--dbaccess/Library_dbu.mk6
-rw-r--r--dbaccess/Module_dbaccess.mk2
-rw-r--r--desktop/Executable_oosplash.mk2
-rw-r--r--desktop/Library_sofficeapp.mk2
-rw-r--r--dtrans/Library_mcnttype.mk2
-rw-r--r--extensions/Executable_nsplugin.mk2
-rw-r--r--extensions/Library_npsoplugin.mk2
-rw-r--r--extensions/Library_pl.mk4
-rw-r--r--extensions/Library_scn.mk4
-rw-r--r--extensions/Module_extensions.mk2
-rw-r--r--extensions/StaticLibrary_plugcon.mk2
-rw-r--r--extensions/qa/complex/extensions/makefile.mk2
-rw-r--r--external/Module_external.mk2
-rw-r--r--helpcompiler/source/HelpCompiler.cxx1
-rw-r--r--hunspell/ExternalProject_hunspell.mk2
-rw-r--r--icu/makefile.mk8
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk2
-rw-r--r--instsetoo_native/util/makefile.mk22
-rw-r--r--jvmfwk/Library_sunjavaplugin.mk2
-rw-r--r--jvmfwk/Package_rcfiles.mk6
-rw-r--r--liblangtag/ExternalPackage_langtag.mk2
-rw-r--r--liblangtag/ExternalProject_langtag.mk2
-rw-r--r--liblangtag/UnpackedTarball_langtag.mk2
-rw-r--r--libxslt/makefile.mk2
-rw-r--r--lpsolve/ExternalPackage_lpsolve.mk11
-rw-r--r--lpsolve/ExternalProject_lpsolve.mk8
-rw-r--r--lpsolve/UnpackedTarball_lpsolve.mk2
-rw-r--r--lpsolve/lp_solve_5.5.patch2
-rw-r--r--mysqlc/source/makefile.mk4
-rw-r--r--mysqlcppconn/mysql-connector-c++-1.1.0.patch4
-rw-r--r--mysqlcppconn/mysql_config.pmk4
-rw-r--r--nss/makefile.mk8
-rw-r--r--odk/pack/copying/makefile.mk12
-rw-r--r--odk/util/makefile.pmk4
-rw-r--r--pyuno/CustomTarget_zipcore.mk2
-rw-r--r--pyuno/Library_pyuno_wrapper.mk2
-rw-r--r--pyuno/Module_pyuno.mk2
-rw-r--r--pyuno/Package_python_scripts.mk2
-rw-r--r--readlicense_oo/CustomTarget_readme.mk4
-rw-r--r--readlicense_oo/Package_readme.mk2
-rw-r--r--redland/raptor/makefile.mk2
-rw-r--r--redland/rasqal/makefile.mk2
-rw-r--r--redland/redland/makefile.mk2
-rw-r--r--registry/workben/makefile.mk4
-rw-r--r--rsc/Executable_rsc.mk2
-rw-r--r--sal/Library_sal.mk8
-rw-r--r--sal/qa/buildall.pl11
-rw-r--r--sal/qa/osl/socket/osl_AcceptorSocket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_ConnectorSocket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_DatagramSocket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_Socket.cxx4
-rw-r--r--sal/qa/osl/socket/osl_Socket2.cxx4
-rw-r--r--sal/qa/osl/socket/osl_SocketAddr.cxx4
-rw-r--r--sal/qa/osl/socket/osl_StreamSocket.cxx4
-rw-r--r--sal/test/bootstrap.pl16
-rw-r--r--sal/test/makefile.mk6
-rw-r--r--sal/workben/makefile.mk10
-rw-r--r--sane/Module_sane.mk2
-rw-r--r--sc/workben/makefile.mk2
-rw-r--r--scp2/InstallModule_javafilter.mk2
-rw-r--r--scp2/InstallModule_ooo.mk2
-rw-r--r--scp2/InstallModule_python.mk2
-rw-r--r--scp2/InstallScript_setup_osl.mk2
-rw-r--r--scp2/Module_scp2.mk2
-rw-r--r--sd/Library_sd.mk2
-rw-r--r--sd/Library_sdui.mk2
-rw-r--r--sd/workben/testdll/makefile2
-rw-r--r--setup_native/source/win32/customactions/indexingfilter/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/javafilter/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/languagepacks/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/patch/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/quickstarter/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/regactivex/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/sellang/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/thesaurus/makefile.mk2
-rw-r--r--setup_native/source/win32/customactions/tools/makefile.mk2
-rw-r--r--shell/Module_shell.mk2
-rw-r--r--solenv/Module_solenv.mk2
-rwxr-xr-xsolenv/bin/build.pl24
-rwxr-xr-xsolenv/bin/deliver.pl8
-rw-r--r--solenv/bin/modules/installer/control.pm2
-rw-r--r--solenv/bin/modules/installer/environment.pm5
-rwxr-xr-xsolenv/bin/ooinstall2
-rw-r--r--solenv/inc/_tg_app.mk120
-rw-r--r--solenv/inc/_tg_def.mk100
-rw-r--r--solenv/inc/_tg_lib.mk220
-rw-r--r--solenv/inc/_tg_rslb.mk60
-rw-r--r--solenv/inc/_tg_shl.mk360
-rw-r--r--solenv/inc/_tg_zip.mk20
-rw-r--r--solenv/inc/extension_post.mk6
-rw-r--r--solenv/inc/extension_pre.mk2
-rw-r--r--solenv/inc/lang.mk10
-rw-r--r--solenv/inc/libs.mk38
-rw-r--r--solenv/inc/pstrules.mk14
-rw-r--r--solenv/inc/rules.mk44
-rw-r--r--solenv/inc/settings.mk24
-rw-r--r--solenv/inc/target.mk62
-rw-r--r--solenv/inc/tg_app.mk12
-rw-r--r--solenv/inc/tg_config.mk2
-rw-r--r--solenv/inc/tg_def.mk10
-rw-r--r--solenv/inc/tg_ext.mk60
-rw-r--r--solenv/inc/tg_java.mk6
-rw-r--r--solenv/inc/tg_lib.mk22
-rw-r--r--solenv/inc/tg_moz.mk2
-rw-r--r--solenv/inc/tg_obj.mk16
-rw-r--r--solenv/inc/tg_rslb.mk6
-rw-r--r--solenv/inc/tg_shl.mk36
-rw-r--r--solenv/inc/tg_slo.mk16
-rw-r--r--solenv/inc/tg_zip.mk2
-rw-r--r--solenv/inc/unitools.mk6
-rw-r--r--solenv/inc/unx.mk2
-rw-r--r--solenv/inc/wnt.mk2
-rw-r--r--soltools/Module_soltools.mk4
-rw-r--r--stoc/test/makefile.mk6
-rw-r--r--stoc/test/security/makefile.mk2
-rw-r--r--store/workben/makefile.mk8
-rw-r--r--svl/CppunitTest_svl_lngmisc.mk2
-rw-r--r--svtools/Module_svtools.mk2
-rw-r--r--svx/Library_svxcore.mk2
-rw-r--r--sysui/desktop/share/makefile.mk4
-rw-r--r--sysui/util/checksize.pl2
-rw-r--r--testtools/qa/cli/makefile.mk2
-rw-r--r--testtools/source/bridgetest/pyuno/makefile.mk12
-rw-r--r--tools/Library_tl.mk2
-rw-r--r--ucb/workben/ucb/makefile.mk4
-rw-r--r--writerfilter/qa/cppunittests/odiapi/makefile.mk4
-rw-r--r--writerfilter/qa/cppunittests/qname/makefile.mk6
-rw-r--r--xmerge/Package_xmergesync.mk2
-rw-r--r--xmerge/source/activesync/makefile.mk4
-rw-r--r--xmerge/source/regutil/makefile.mk2
-rw-r--r--xmlhelp/Library_ucpchelp1.mk2
-rw-r--r--xmlhelp/source/cxxhelp/test/makefile.mk2
-rw-r--r--xmlsecurity/Library_xsec_xmlsec.mk6
-rw-r--r--xmlsecurity/tools/standalone/csfit/makefile.mk2
-rw-r--r--xmlsecurity/tools/standalone/csfit/util/makefile.mk18
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/makefile.mk2
-rw-r--r--xmlsecurity/tools/standalone/mscsfit/util/makefile.mk18
-rw-r--r--xpdf/makefile.mk4
172 files changed, 916 insertions, 924 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 015eb882adc8..7798c79b28d3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -126,7 +126,7 @@ endef
endif
-ifeq (SANEUNX,$(filter SANE,$(BUILD_TYPE))$(GUI))
+ifeq (SANE,$(filter SANE,$(BUILD_TYPE))$(filter WNT,$(OS)))
define gb_LinkTarget__use_sane_headers
$(call gb_Library_use_packages,$(1),\
@@ -1724,7 +1724,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
$(if $(filter MSC,$(COM)),lib)pq \
)
-ifeq ($(GUI)$(COM),WNTMSC)
+ifeq ($(OS)$(COM),WNTMSC)
$(call gb_LinkTarget_use_external,$(1),openssl)
$(call gb_LinkTarget_use_system_win32_libs,$(1),\
@@ -1775,7 +1775,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
mozreg_s \
)
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(call gb_LinkTarget_add_defs,$(1),\
-DMOZILLA_CLIENT \
@@ -1818,7 +1818,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endif # !GCC
-else ifeq ($(GUI),UNX)
+else
$(call gb_LinkTarget_add_defs,$(1),\
-DMOZILLA_CLIENT \
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index d24b1ce47499..2cb3980355f0 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -65,7 +65,7 @@ APP1OBJS= $(OBJ)$/main.obj
APP1RPATH=SDKBIN
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
APP1STDLIBS= $(COSVLIB) $(UDMLIB)
.ELSE
.IF "$(OS)"=="MACOSX"
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 8bb85617aa05..1e0b5fc5f839 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS)))
$(eval $(call gb_Library_use_sdk_api,avmediagst))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_defs,avmediagst,\
-DWINNT
))
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index 18387a9e05ef..91ce2fa0e9ba 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,avmediagst_0_10,\
$(eval $(call gb_Library_use_sdk_api,avmediagst_0_10))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_defs,avmediagst_0_10,\
-DWINNT
))
diff --git a/basic/CppunitTest_basic_coverage.mk b/basic/CppunitTest_basic_coverage.mk
index e1189e5eb790..1d337b5f90a1 100644
--- a/basic/CppunitTest_basic_coverage.mk
+++ b/basic/CppunitTest_basic_coverage.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_coverage, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_coverage, \
oleaut32 \
))
diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk
index 5f6587dec684..7a1c3da5a8cf 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_enable, \
oleaut32 \
))
diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk
index 268f29a43b1c..f7db5a1d1d5e 100644
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_nested_struct, \
oleaut32 \
))
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index b5eccfa2d7b8..bd566af81e23 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \
oleaut32 \
))
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 16bb39efe0b4..8597b21de439 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -138,18 +138,18 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
canvastools \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,sb,\
oleaut32 \
))
endif
-ifeq ($(GUI)$(CPUNAME),WNTINTEL)
+ifeq ($(OS)$(CPUNAME),WNTINTEL)
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x86 \
))
else
-ifeq ($(GUI)$(CPUNAME),WNTX86_64)
+ifeq ($(OS)$(CPUNAME),WNTX86_64)
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/dllmgr-x64 \
))
@@ -159,12 +159,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
))
endif
endif
-ifeq ($(GUI)$(COM)$(CPUNAME),WNTMSCINTEL)
+ifeq ($(OS)$(COM)$(CPUNAME),WNTMSCINTEL)
$(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-x86 \
))
endif
-ifeq ($(GUI)$(COM)$(CPUNAME),WNTGCCINTEL)
+ifeq ($(OS)$(COM)$(CPUNAME),WNTGCCINTEL)
$(eval $(call gb_Library_add_asmobjects,sb,\
basic/source/runtime/wnt-mingw \
))
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 2229e625157c..160d9c61c36c 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -30,7 +30,7 @@
$(eval $(call gb_Library_Library,officebean))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_use_packages,officebean,\
sal_generated \
sal_inc \
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_cobjects,officebean,\
))
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_cobjects,officebean,\
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow \
bean/native/win32/com_sun_star_beans_LocalOfficeWindow \
diff --git a/bean/test/applet/oooapplet/makefile.mk b/bean/test/applet/oooapplet/makefile.mk
index edb68ffe1504..89c915a8df6b 100644
--- a/bean/test/applet/oooapplet/makefile.mk
+++ b/bean/test/applet/oooapplet/makefile.mk
@@ -52,7 +52,7 @@ COPY_FILES: example.html
# --- Targets ------------------------------------------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
RUN:
firefox "$(CLASSDIR)$/example.html?$(office)"
.ELSE
diff --git a/bootstrap b/bootstrap
index b7a73622e1d1..38ebb4e3c25c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -20,7 +20,7 @@ fi
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
# Use spawn instead of fork when building dmake on cygwin.
-if test "$GUI_FOR_BUILD" = "WNT"; then
+if test "$OS_FOR_BUILD" = "WNT"; then
EXEEXT=".exe"
DMAKE_CONF="--enable-spawn"
else
@@ -37,7 +37,7 @@ if test "$BUILD_DMAKE" != "NO"; then
cd "$SRC_ROOT/dmake" || exit
# If cross-compiling then don't use the cross compilers to build dmake.
- if test "$GUI_FOR_BUILD" = "WNT"; then
+ if test "$OS_FOR_BUILD" = "WNT"; then
# Let the Cygwin gcc be found
unset CC CXX AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
elif test "$CROSS_COMPILING" = "YES"; then
diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk
index d9b8112b0282..178a008192eb 100644
--- a/bridges/Library_java_uno.mk
+++ b/bridges/Library_java_uno.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Library_Library,java_uno))
-ifeq ($(GUI)$(COM),WNTGCC)
+ifeq ($(OS)$(COM),WNTGCC)
ifeq ($(EXCEPTIONS),sjlj)
$(eval $(call gb_Library_add_defs,java_uno,\
-DBROKEN_ALLOCA \
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index 89f120e6b0d7..e7da44f59fb7 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -48,7 +48,7 @@ ALLTAR: \
$(BIN)$/testacquire-native-client \
$(BIN)$/testacquire-native-server
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
.ELSE # GUI, WNT
GIVE_EXEC_RIGHTS = chmod +x
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index f29550a94e9c..549ea76fa2f9 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -26,7 +26,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
.ELSE
GIVE_EXEC_RIGHTS = chmod +x
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index fc6ad343f68f..a49dea6b5849 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -51,7 +51,7 @@ JARFILES = juh.jar jurt.jar ridl.jar
ALLTAR: $(BIN)$/testequals
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
GIVE_EXEC_RIGHTS = @echo
.ELSE # GUI, WNT
GIVE_EXEC_RIGHTS = chmod +x
diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk
index 97eee2b2965e..0d46ddb4d42d 100644
--- a/bridges/test/java_uno/nativethreadpool/makefile.mk
+++ b/bridges/test/java_uno/nativethreadpool/makefile.mk
@@ -88,7 +88,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
$(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
-c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
-c stocservices.uno$(DLLPOST)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
ERROR -- missing platform
.ELSE # GUI, WNT
+ export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \
@@ -98,7 +98,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \
.ENDIF # GUI, WNT
test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
ERROR -- missing platform
.ELSE # GUI, WNT
$(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 5e40c8cfd777..99ddb9e2b073 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -98,7 +98,7 @@ CONFIGURE_FLAGS=--disable-valgrind --disable-xlib --disable-ft --disable-pthread
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)$/src
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
.EXPORT : PWD
.ENDIF
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 10ba0f56789c..cab9d7d442ac 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -68,7 +68,7 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 -
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
.EXPORT : PWD
.ENDIF
diff --git a/canvas/workben/makefile.mk b/canvas/workben/makefile.mk
index fb217cf70b5a..e3e017dcf42f 100644
--- a/canvas/workben/makefile.mk
+++ b/canvas/workben/makefile.mk
@@ -46,7 +46,7 @@ APP1STDLIBS=$(TOOLSLIB) \
$(VCLLIB) \
$(BASEGFXLIB)
-.IF "$(GUI)"!="UNX"
+.IF "$(OS)"=="WNT"
APP1DEF= $(MISC)$/$(TARGET).def
.ENDIF
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 8fbb372c2a7e..a69e3d86256a 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
))
ifneq ($(SYSTEM_POSTGRESQL),YES)
-ifneq ($(GUI)$(COM),WNTMSC)
+ifneq ($(OS)$(COM),WNTMSC)
-include $(OUTDIR)/inc/postgresql/libpq-flags.mk
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 26dd64767ab9..0b5b22c54a1d 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -64,7 +64,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
))
endif
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(ENABLE_KAB),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
@@ -92,7 +92,7 @@ endif
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_ado \
Library_ado \
@@ -145,7 +145,7 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_check_targets,connectivity,\
CppunitTest_connectivity_ado \
))
diff --git a/cppuhelper/test/bootstrap/makefile.mk b/cppuhelper/test/bootstrap/makefile.mk
index 6f185bf32dc0..a2d1715b397b 100644
--- a/cppuhelper/test/bootstrap/makefile.mk
+++ b/cppuhelper/test/bootstrap/makefile.mk
@@ -28,7 +28,7 @@ USE_DEFFILE := TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
PURPENVHELPERLIB := -luno_purpenvhelper$(COMID)
.ELSE
diff --git a/cppuhelper/test/loader/makefile.mk b/cppuhelper/test/loader/makefile.mk
index 32e541b2ed0b..73bf2ab64b3c 100644
--- a/cppuhelper/test/loader/makefile.mk
+++ b/cppuhelper/test/loader/makefile.mk
@@ -30,7 +30,7 @@ ENVINCPRE := -I$(OUT)$/inc$/$(TARGET)
APP1TARGET := $(TARGET)
APP1OBJS := $(OBJ)$/loader.test.obj
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
APP1STDLIBS := iTestComponent.uno.lib
.ELSE
APP1STDLIBS := -lTestComponent.uno
diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk
index 6d80a520fa82..7ff031004eb7 100644
--- a/cppuhelper/test/makefile.mk
+++ b/cppuhelper/test/makefile.mk
@@ -85,7 +85,7 @@ ALL: $(BIN)$/cpputest.rdb \
$(BIN)$/$(APP2TARGET).Bin \
$(BIN)$/$(APP2TARGET).Exe
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
ALL: $(BIN)$/$(APP2TARGET).exe
$(BIN)$/$(APP2TARGET).exe : $(APP2TARGETN)
@@ -147,7 +147,7 @@ $(BIN)$/testdefaultbootstrapping.pl: testdefaultbootstrapping.pl
cp testdefaultbootstrapping.pl $@
$(BIN)$/testrc: makefile.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
echo [Tests] > $@
echo TestKey1=com.sun.star.uno.NamingService.rdb >> $@
.ELSE
diff --git a/cppuhelper/test/testcmp/makefile.mk b/cppuhelper/test/testcmp/makefile.mk
index ef4c3f974cb3..a59657e64fde 100644
--- a/cppuhelper/test/testcmp/makefile.mk
+++ b/cppuhelper/test/testcmp/makefile.mk
@@ -29,7 +29,7 @@ SHL1TARGET := $(TARGET)
SHL1OBJS := $(SLO)$/TestComponent.obj
SHL1STDLIBS := $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
SHL1IMPLIB := i$(SHL1TARGET)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
SHL1DEF := TestComponent.uno.def
.ELSE
DEF1NAME := $(SHL1TARGET)
diff --git a/cppuhelper/test/testdefaultbootstrapping.pl b/cppuhelper/test/testdefaultbootstrapping.pl
index f884044762e9..278e759fb44c 100644
--- a/cppuhelper/test/testdefaultbootstrapping.pl
+++ b/cppuhelper/test/testdefaultbootstrapping.pl
@@ -26,7 +26,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
my $progname = "testdefaultbootstrapping";
my $defExeExt;
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
%services = (
'com.sun.star.uno.NamingService' => 'namingservice.uno.dll',
'com.sun.star.reflection.CoreReflection' => 'reflection.uno.dll',
@@ -50,7 +50,7 @@ sub extendProgName($) {
my $_extension = shift;
my $_result;
- if ($ENV{GUI} eq "WNT") {
+ if ($ENV{OS} eq "WNT") {
$_result = $progname . $_extension;
}
else {
@@ -183,7 +183,7 @@ sub testBeneathLib_rdb() {
my $_rdb_name;
- if ($ENV{GUI} eq "WNT") {
+ if ($ENV{OS} eq "WNT") {
$_rdb_name = "UNO" . "_services.rdb";
}
else {
@@ -206,7 +206,7 @@ sub testBeneathLib_rc() {
my $_rc_name;
- if ($ENV{GUI} eq "WNT") {
+ if ($ENV{OS} eq "WNT") {
$_rc_name = "UNO.ini";
}
else {
diff --git a/cppuhelper/test/testlib/makefile.mk b/cppuhelper/test/testlib/makefile.mk
index 2683093f0626..cbf30f08d323 100644
--- a/cppuhelper/test/testlib/makefile.mk
+++ b/cppuhelper/test/testlib/makefile.mk
@@ -38,7 +38,7 @@ PERLINCS:=$(PERLINST)$/CORE
CFLAGS += -I$(PERLINCS)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
PERLLIB=perl58.lib
LIB!:=$(LIB);$(PERLLIBS)
@@ -67,7 +67,7 @@ DEF1NAME=$(SHL1TARGET)
SHL1VERSIONMAP=defbootstrap.map
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
UNODLL=$(DLLDEST)$/UNO.dll
.ELSE
UNODLL=$(DLLDEST)$/UNO.so
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 404e72f6e0c4..2d21cfc6f634 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -76,7 +76,7 @@ $(eval $(call gb_Library_use_externals,cui,\
icuuc \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,cui,\
advapi32 \
shlwapi \
@@ -207,7 +207,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/uno/services \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/winpluginlib \
))
diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk
index b91a8eee63a7..495b4f93ca47 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/curl/ExternalPackage_curl.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl))
$(eval $(call gb_ExternalPackage_use_external_project,curl,curl))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/pkgconfig/libcurl.pc,libcurl.pc))
diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index e1388cdd687d..c1c9219bfe83 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
build \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 9bfe58bb6758..ba95c73734fc 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,dbu,\
-DDBACCESS_DLLIMPLEMENTATION \
))
-ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h
+ifeq ($(OS)$(COM),WNTGCC) # for adoint.h
$(eval $(call gb_Library_add_cxxflags,dbu,\
-fpermissive \
))
@@ -74,7 +74,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,dbu,\
ole32 \
oleaut32 \
@@ -268,7 +268,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/uno/UserSettingsDlg \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/dlg/adodatalinks \
))
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index f087ba8e5c19..3195bbf1ff85 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
AllLangResTarget_dbmm \
AllLangResTarget_dbu \
AllLangResTarget_sdbt \
- $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
+ $(if $(filter WNT,$(OS)),Executable_odbcconfig) \
Library_dba \
Library_dbaxml \
Library_dbmm \
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 3fa96d4f57ce..b67e08dc67e5 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_add_libs,oosplash,\
endif
ifneq ($(GUIBASE),headless)
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Executable_add_libs,oosplash,\
-lX11 \
))
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 9f4b6da30bb1..e37db8f6456e 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_sdk_api,sofficeapp))
$(eval $(call gb_Library_add_defs,sofficeapp,\
-DDESKTOP_DLLIMPLEMENTATION \
$(if $(filter TRUE,$(ENABLE_GNOMEVFS)),-DGNOME_VFS_ENABLED) \
- $(if $(filter WNT,$(GUI)),-DENABLE_QUICKSTART_APPLET) \
+ $(if $(filter WNT,$(OS)),-DENABLE_QUICKSTART_APPLET) \
$(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \
$(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
))
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 167f2a13fe38..b826a42f8db0 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_exception_objects,mcnttype,\
dtrans/source/cnttype/mctfentry \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_libraries,mcnttype,\
uwinapi \
))
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 866257e1fde2..bbfb56fe1eea 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Executable_use_libraries,nsplugin,\
sal \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
extensions/source/nsplugin/source/nsp_windows \
))
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 7695e9deb70e..63ee754454ea 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_static_libraries,npsoplugin,\
nputils \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_libs,npsoplugin,\
-ldl \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index a5b1f70a98cf..92e707faf2d5 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_libs,pl,\
))
endif # OS=SOLARIS
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,pl,\
advapi32 \
ole32 \
@@ -75,7 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,pl,\
))
endif # GUI=WNT
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(OS),MACOSX)
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index ac173bf1d8d5..d64c16d60ff6 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -52,14 +52,14 @@ $(eval $(call gb_Library_add_exception_objects,scn,\
extensions/source/scanner/scanner \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_packages,scn,twain_inc))
$(eval $(call gb_Library_add_exception_objects,scn,\
extensions/source/scanner/scanwin \
))
else
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,scn,\
extensions/source/scanner/grid \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 4912721ea94a..4c831590daed 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -109,7 +109,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
Library_pl \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifneq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,extensions,\
StaticLibrary_plugcon \
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index ba94b0bbe70d..bb073e7d2f7d 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-ifneq ($(GUI),UNX)
+ifeq ($(OS),WNT)
$(error only for UNX)
endif
diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk
index 344ecc3457ee..ce3515100fe3 100644
--- a/extensions/qa/complex/extensions/makefile.mk
+++ b/extensions/qa/complex/extensions/makefile.mk
@@ -37,7 +37,7 @@ EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
.ELSE
command_seperator=;
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 151ecddb1f1f..4fd7fb3dda72 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,external))
$(eval $(call gb_Module_add_targets,external,\
))
-ifeq ($(GUI)$(COM),WNTGCC)
+ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_Module_add_targets,external,\
CustomTarget_jawt \
CustomTarget_mingw_dlls \
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 17bb2b0c9a98..74b29f59ba52 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -48,6 +48,7 @@ HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path &in_input
char* guitmp = getenv("GUI");
if (guitmp)
{
+ // WTF?
gui = (strcmp(guitmp, "UNX") ? gui : "UNIX");
gui = (strcmp(guitmp, "MAC") ? gui : "MAC");
gui = (strcmp(guitmp, "WNT") ? gui : "WIN");
diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk
index aab825cfd8aa..c5d89df27301 100644
--- a/hunspell/ExternalProject_hunspell.mk
+++ b/hunspell/ExternalProject_hunspell.mk
@@ -21,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,hunspell,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\
$(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \
$(if $(filter C53,$(COM)),CFLAGS="-xc99=none") \
- $(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 $@
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 5494fa554f45..f20d9b5f223f 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -85,7 +85,7 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0
# Describe it in the comment above instead.
CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) && mv icudt49l.dat data/in &&
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(SYSBASE)"!=""
icu_CFLAGS+=-I$(SYSBASE)$/usr$/include
@@ -236,7 +236,7 @@ OUT2BIN_NONE= \
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CONFIGURE_DIR=source
.IF "$(COM)"=="GCC"
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
@@ -305,7 +305,7 @@ OUT2BIN= \
$(BUILD_DIR)$/bin$/gencmn.exe
.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
#make sure that when we deliver the headers of a new icu that the timestamps
#are newer than the last icu to ensure dependencies are correctly rebuilt
@@ -327,7 +327,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
.ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
ALLTAR : \
$(LB)$/icudata.lib \
$(LB)$/icuin$(ICU_BUILD_LIBPOST).lib \
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
index 30293dd1a339..de56007682fa 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk
@@ -43,7 +43,7 @@ MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf)
.INCLUDE : target.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : $(MLFFILES)
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index e4dd09f1bdeb..574ce4c3251d 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -34,11 +34,11 @@ TARGET=util
# PERL:=@echo
# watch for the path delimiter
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.EXPORT: PYTHONPATH
ENABLE_DOWNLOADSETS*=TRUE
@@ -91,19 +91,19 @@ xxxx:
.IF "$(LIBO_DEV_INSTALL)" == "TRUE"
ALLTAR: openoffice_$(defaultlangiso).archive
.ELSE
-.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.IF "$(OS)"!="WNT" && "$(EPM)"=="NO"
ALLTAR : $(LOCALPYFILES)
@echo "No EPM: do no packaging at this stage"
-.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.ELSE # "$(OS)"!="WNT" && "$(EPM)"=="NO"
.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficeall $(OOOHELPPACK)
.ELSE
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
.ENDIF
.ELSE
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficeall $(OOOHELPPACK) sdkooall
.ELSE
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
@@ -111,20 +111,20 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL)
.ENDIF
.ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficedevall $(OOODEVHELPPACK)
.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
.ENDIF
.ELSE
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
ALLTAR : openofficedevall $(OOODEVHELPPACK) sdkoodevall
.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US
.ENDIF
.ENDIF
.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.ENDIF # "$(OS)"!="WNT" && "$(EPM)"=="NO"
.ENDIF # "$(LIBO_DEV_INSTALL)" == "TRUE"
.IF "$(MAKETARGETS:e)"!=""
@@ -316,7 +316,7 @@ openoffice:
$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
$(BIN)$/%.py : $(OUTDIR)$/lib$/pyuno$/%.py
$(COPY) $< $@
.ELSE
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index d32dc70aa22c..2d7326c4d1db 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\
))
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\
advapi32 \
))
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index 0d4c8ace65cf..fb5a392fd866 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/jvmfwk/Package_rcfiles.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk))
# The below files (intended to be also used during the build) need to go into
# the same directory as dynamic libraries (either bin or lib):
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
jvmfwk_Package_RCFILESDIR := bin
else
jvmfwk_Package_RCFILESDIR := lib
@@ -39,7 +39,7 @@ endif
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/jvmfwk3),source/jvmfwk3rc))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifeq ($(OS),FREEBSD)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
else ifeq ($(OS),MACOSX)
@@ -51,7 +51,7 @@ $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/ja
else
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
endif
-else ifeq ($(GUI),WNT)
+else ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
else
$(call gb_Output_error,Unsupported platform)
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 \
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 1ff05d6fbbcb..1574709500b8 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -90,7 +90,7 @@ CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no $(BUILD_AND
BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
.EXPORT : PWD
.ENDIF
.ELSE
diff --git a/lpsolve/ExternalPackage_lpsolve.mk b/lpsolve/ExternalPackage_lpsolve.mk
index ed777ab0d748..498f9ca3747b 100644
--- a/lpsolve/ExternalPackage_lpsolve.mk
+++ b/lpsolve/ExternalPackage_lpsolve.mk
@@ -10,16 +10,16 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
-ifneq ($(GUI_FOR_BUILD),WNT)
+ifneq ($(OS_FOR_BUILD),WNT)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a))
-endif # $(GUI_FOR_BUILD)
+endif # $(OS_FOR_BUILD)
else # $(COM)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
endif # $(COM)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,bin,lpsolve55/lpsolve55.dll))
-else # $(GUI)
+else # $(OS)
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dylib))
@@ -31,5 +31,6 @@ $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.so
endif # $(DISABLE_DYNLOADING)
endif # $(OS)
-endif # $(GUI)
+endif # $(OS)
+
# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
index 0b6e34ece615..1644b0f26930 100644
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ b/lpsolve/ExternalProject_lpsolve.mk
@@ -15,11 +15,11 @@ $(eval $(call gb_ExternalProject_register_targets,lpsolve,\
build \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(call gb_ExternalProject_get_state_target,lpsolve,build):
cd $(EXTERNAL_WORKDIR)/lpsolve55 \
- && $(if $(filter WNT,$(GUI_FOR_BUILD)), \
+ && $(if $(filter WNT,$(OS_FOR_BUILD)), \
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \
$(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
cmd /c cgcc.bat, sh ccc) \
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build):
&& LIB="$(ILIB)" cmd /c cvc6.bat \
&& touch $@
endif # $(COM)
-else # $(GUI)!=WNT
+else # $(OS)!=WNT
$(call gb_ExternalProject_get_state_target,lpsolve,build):
cd $(EXTERNAL_WORKDIR)/lpsolve55 \
&& sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
@@ -38,5 +38,5 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build):
$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \
ccc))) \
&& touch $@
-endif # $(GUI)
+endif # $(OS)
# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk
index 2e895a03cb57..09cb1a2673ea 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
-ifeq ($(GUI_FOR_BUILD),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
lpsolve/lp_solve_5.5-windows.patch \
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index cea61168913d..7f976f0d85c8 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -19,7 +19,7 @@
+pic=
+ldflags=
+inline=
-+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
++if [ "$OS" = "WNT" -a "$COM" = "GCC" ]; then
+ so=dll
+ a=dll.a
+ inline=-DINLINE=static
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
index fee187288b06..63c86df97829 100644
--- a/mysqlc/source/makefile.mk
+++ b/mysqlc/source/makefile.mk
@@ -67,7 +67,7 @@ EXTENSION_ZIPNAME:=$(EXTENSIONNAME)
.ENDIF
# use the static version
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
MYSQL_LIBDIR=$(LIBMYSQL_PATH)$/lib
MYSQL_INCDIR=$(LIBMYSQL_PATH)$/include
.ELSE
@@ -91,7 +91,7 @@ CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
.ENDIF
# --------------- MySQL settings ------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
MYSQL_INC=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn -I$(MYSQL_INCDIR)
MYSQL_LIB=$(MYSQL_LIBDIR)$/libmysql.lib
MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/libmysql.dll
diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
index 9d9a8ad7c60e..eb39eb4437cc 100644
--- a/mysqlcppconn/mysql-connector-c++-1.1.0.patch
+++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch
@@ -114,7 +114,7 @@
NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
--- misc/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:34.087202551 +0200
+++ misc/build/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:25.902286382 +0200
-@@ -1 +1,64 @@
+@@ -1,1 +1,64 @@
-dummy
+PRJ=..$/..$/..$/..$/..
+
@@ -131,7 +131,7 @@
+
+# --- Files --------------------------------------------------------
+
-+.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86"
++.IF "$(OS)-$(RTL_ARCH)" == "LINUX-x86"
+ SHL1NOCHECK=TRUE
+.ENDIF
+SHL1TARGET=$(TARGET)
diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
index eb316e0911c3..43a7ab80aad0 100644
--- a/mysqlcppconn/mysql_config.pmk
+++ b/mysqlcppconn/mysql_config.pmk
@@ -35,11 +35,11 @@
.ENDIF
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.IF "$(SYSTEM_MYSQL)" != "YES"
MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
diff --git a/nss/makefile.mk b/nss/makefile.mk
index b1c38314f9e0..91c63d281e63 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -95,7 +95,7 @@ CONFIGURE_ACTION+= ; \
sed -e 's\#@prefix@\#$(OUTDIR)\#' -e 's\#@includedir@\#$(OUTDIR)/inc/mozilla/nss\#' -e 's\#@MOD_MAJOR_VERSION@\#$(VER_MAJOR)\#' -e 's\#@MOD_MINOR_VERSION@\#$(VER_MINOR)\#' -e 's\#@MOD_PATCH_VERSION@\#$(VER_PATCH)\#' mozilla/security/nss/nss-config.in > mozilla/security/nss/nss-config ; \
chmod a+x mozilla/security/nss/nss-config
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)$(COM)"=="LINUXGCC"
.IF "$(BUILD64)"=="1"
# force 64-bit buildmode
@@ -168,10 +168,10 @@ BUILD_ACTION+=NS_USE_GCC=1
BUILD_ACTION += NSS_USE_SYSTEM_SQLITE=1
.END
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
@@ -255,7 +255,7 @@ OUT2BIN=mozilla/dist/out/lib/*$(DLLPOST) \
config/nspr-config \
mozilla/security/nss/nss-config
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
OUTDIR2INC=mozilla/dist/public/nss mozilla/dist/out/include
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index ec5f1723bc3d..e3421d3c9a64 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -52,12 +52,12 @@ EXELIST += \
$(DESTDIRBIN)/ucpp$(EXEPOSTFIX)
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
EXELIST += \
$(DESTDIRBIN)/climaker$(EXEPOSTFIX)
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CLILIST = \
$(DESTDIRCLI)/cli_basetypes.dll \
$(DESTDIRCLI)/cli_uretypes.dll \
@@ -67,7 +67,7 @@ CLILIST = \
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
LIBLIST = \
$(DESTDIRLIB)/istore.lib \
$(DESTDIRLIB)/ireg.lib \
@@ -99,11 +99,11 @@ SETTINGSLIST= \
$(DESTDIRSETTINGS)/dk.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.def
.ENDIF
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.map
.ENDIF
@@ -140,7 +140,7 @@ DOCUFILES= \
$(DESTDIRDOCUIMAGES)/sdk_line-1.gif \
$(DESTDIRDOCUIMAGES)/sdk_line-2.gif
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
INSTALLSCRIPT= \
$(DESTDIR)/config.guess \
$(DESTDIR)/config.sub \
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 8d753ebb84eb..31e526ffab98 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -70,7 +70,7 @@ MY_COPY_RECURSIVE=$(GNUCOPY) -urf
MY_DELETE_RECURSIVE=rm -rf
MY_TEXTCOPY=@cp
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
#--------------------
# WNT ONLY
#--------------------
@@ -154,7 +154,7 @@ INCLUDETOPDIRLIST= \
$(INCOUT)/cppuhelper \
$(INCOUT)/registry
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
INCLUDETOPDIRLIST += $(INCOUT)/systools
.ENDIF
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
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 2f2ddda88789..343823d5b2f1 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -15,7 +15,7 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme)
# what we need here is: gb_WITH_LANG_OR_DEFAULT ;-)
readlicense_oo_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/README_$(lang))
readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/README_%
else
@@ -68,7 +68,7 @@ $(readlicense_oo_README_PATTERN) : \
--stringparam type text \
$< \
$(readlicense_oo_README_XRM) && \
- $(if $(filter WNT,$(GUI)) \
+ $(if $(filter WNT,$(OS)) \
,$(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp && \
mv $@.tmp $@ && \
rm $@.out \
diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk
index e1fabb2a5b1e..d0e86dd78bae 100644
--- a/readlicense_oo/Package_readme.mk
+++ b/readlicense_oo/Package_readme.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarge
$(eval $(call gb_Package_add_files,readlicense_oo_readme_inc,bin/osl,\
$(foreach lang,en-US $(filter-out en-US,$(gb_WITH_LANG)),\
- $(if $(filter UNX,$(GUI)),README_$(lang),readme_$(lang).txt) \
+ $(if $(filter-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \
) \
))
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 8244d0d2b282..3617feaa9989 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -62,7 +62,7 @@ OOO_PATCH_FILES= \
raptor-aix.patch \
$(TARFILE_NAME).entities.patch
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
.ENDIF
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index d10239b3b68c..6fa126061f8b 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
rasqal-aix.patch
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
.ENDIF
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 6459f6ba083d..74420397cd73 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
redland-aix.patch
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
.ENDIF
diff --git a/registry/workben/makefile.mk b/registry/workben/makefile.mk
index 32b8b0e92dd5..7d904645fef3 100644
--- a/registry/workben/makefile.mk
+++ b/registry/workben/makefile.mk
@@ -32,7 +32,7 @@ ENABLE_EXCEPTIONS := TRUE
CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
RGTLIB = rgt.lib
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
RGTLIB = -lrgt$(DLLPOSTFIX)
.ENDIF
@@ -52,7 +52,7 @@ APP1STDLIBS=\
APP2TARGET= test
APP2OBJS= $(OBJ)$/test.obj
APP2RPATH=NONE
-.IF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX"
+.IF "$(OS)"!="WNT" && "$(OS)"!="MACOSX"
.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
APP2LINKFLAGS=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\'
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 2138f87a963c..f191867d325c 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -90,7 +90,7 @@ $(eval $(call gb_Executable_add_cobjects,rsc,\
rsc/source/rscpp/cpp6 \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Executable_add_defs,rsc,\
-Dunix \
))
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:
diff --git a/sal/qa/buildall.pl b/sal/qa/buildall.pl
index 4b70a4884559..67265710b11a 100644
--- a/sal/qa/buildall.pl
+++ b/sal/qa/buildall.pl
@@ -126,22 +126,17 @@ sub checkForKillobj()
# ------------------------------------------------------------------------------
sub initEnvironment()
{
- my $gui = $ENV{GUI};
+ my $os = $ENV{OS};
# no error output in forms of message boxes
$ENV{'DISABLE_SAL_DBGBOX'}="t";
SWITCH: {
- if ( $gui eq "WNT" ) {
+ if ( $os eq "WNT" ) {
$FS = "\\";
$g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
last SWITCH;
}
- if ( $gui eq "WIN" ) {
- $FS = "\\";
- $g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "c:${FS}tmp${FS}";
- last SWITCH;
- }
- if ( $gui eq "UNX" ) {
+ else {
$FS = "/";
$g_sTempDir = $ENV{TMP} ? "$ENV{TMP}${FS}" : "${FS}tmp${FS}";
last SWITCH;
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index 7af519fc49d7..30390fd72ac8 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index b2bbd095ed1f..271bcc83a61e 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 3e502cf11d67..9bfe6234b596 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index e44ecb86c519..5da5af638914 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 07f0a4bbd48d..86fdf91ec7ea 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index d82942417dc8..1e8529a40cd7 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index c02148f6783a..22971a2a751a 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -21,13 +21,13 @@
1. the BSD socket function will meet "unresolved external symbol error" on Windows platform
if you are not including ws2_32.lib in makefile.mk, the including format will be like this:
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
SHL1STDLIBS += $(SOLARLIBDIR)$/cppunit.lib
SHL1STDLIBS += ws2_32.lib
.ENDIF
likewise on Solaris platform.
- .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
SHL1STDLIBS += -lsocket -ldl -lnsl
.ENDIF
diff --git a/sal/test/bootstrap.pl b/sal/test/bootstrap.pl
index c5bf519fefee..7ef389d99747 100644
--- a/sal/test/bootstrap.pl
+++ b/sal/test/bootstrap.pl
@@ -64,7 +64,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "auxaux", "-env:iniName=ini.ini", '-env:MYBOOTSTRAPTESTVALUE=$CUSTOMINIVALUE';
}
else {
@@ -75,7 +75,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$comment = $comment . '$SYSUSERHOME not testable under windows' . "\n";
}
else {
@@ -86,7 +86,7 @@ else {
}
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$comment = $comment . '$SYSUSERCONFIG' . " not testable under windows\n";
}
else {
@@ -97,7 +97,7 @@ else {
}
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$comment = $comment . '$SYSBINDIR' . " not testable under windows\n";
}
else {
@@ -108,7 +108,7 @@ else {
}
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "inherited_value", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_VALUE', "-env:iniName=ini.ini";
}
else {
@@ -119,7 +119,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "not_overwritten", '-env:MYBOOTSTRAPTESTVALUE=$INHERITED_OVERWRITTEN_VALUE', "-env:iniName=ini.ini";
}
else {
@@ -137,7 +137,7 @@ if (!$rc) {
$state = 0;
}
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap", "defaultValue", "-env:iniName=default.ini", "-env:INIFILENAME=", "-env:USEDEFAULT=1";
}
else {
@@ -213,7 +213,7 @@ if (!$rc) {
}
# test no infinit recursion
-if ($ENV{GUI} eq "WNT") {
+if ($ENV{OS} eq "WNT") {
$rc = system "./testbootstrap",
'"***RECURSION DETECTED***"',
'-env:MYBOOTSTRAPTESTVALUE=$MYBOOTSTRAPTESTVALUE';
diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk
index 94709bad3e6b..25aa5dd5fa17 100644
--- a/sal/test/makefile.mk
+++ b/sal/test/makefile.mk
@@ -33,7 +33,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
# ------------------------------------------------------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
BOOTSTRAPSCRIPT=bootstrap.bat
BOOTSTRAPINI=testbootstrap.ini
MY_SCRIPTCAT=cat
@@ -73,7 +73,7 @@ ALL : ALLTAR \
$(BIN)$/bootstrap.pl
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
ALL: $(BIN)$/$(APP2TARGET).exe \
$(BIN)$/inirc \
$(BIN)$/defaultrc
@@ -124,7 +124,7 @@ ALL: ALLDEP
$(BIN)$/$(BOOTSTRAPSCRIPT) : $(BOOTSTRAPSCRIPT)
$(MY_SCRIPTCAT) $(BOOTSTRAPSCRIPT) > $@
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
chmod ug+x $@
.ENDIF
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index eb3873aa3db5..b7141a73d9db 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -163,13 +163,13 @@ APP10DEPN=$(LB)$/isal.lib
SHL10OBJS=$(SLO)$/t_osl_getVolInfo.obj
SHL10TARGET=togvi
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
APP10STDLIBS=$(KERNEL32LIB)
SHL10STDLIBS=$(LB)$/isal.lib
SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL10STDLIBS=$(LB)$/libsal.so
SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF
@@ -186,20 +186,20 @@ OBJFILES+=\
APP10TARGET=ojpx
APP10OBJS=$(OBJ)$/t_ojp_exe.obj
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP10STDLIBS=$(LB)$/libsal.so
.ENDIF
SHL10OBJS=$(SLO)$/t_osl_joinProcess.obj
SHL10TARGET=tojp
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
APP10STDLIBS=$(KERNEL32LIB)
SHL10STDLIBS=$(LB)$/isal.lib
SHL10STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL10STDLIBS=$(LB)$/libsal.so
SHL10STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF
diff --git a/sane/Module_sane.mk b/sane/Module_sane.mk
index f812df7ec3db..f878c2a68e8e 100644
--- a/sane/Module_sane.mk
+++ b/sane/Module_sane.mk
@@ -29,7 +29,7 @@
$(eval $(call gb_Module_Module,sane))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifneq (,$(filter SANE,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,sane,\
Package_inc \
diff --git a/sc/workben/makefile.mk b/sc/workben/makefile.mk
index 40260ffd0932..6ac900932477 100644
--- a/sc/workben/makefile.mk
+++ b/sc/workben/makefile.mk
@@ -69,7 +69,7 @@ SHL1OBJS= $(SLO)$/addin.obj $(SLO)$/result.obj $(SLO)$/workben$/testadd.obj
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
$(MISC)$/$(SHL1TARGET).def: makefile.mk
@echo ------------------------------
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 \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index b0946eb0c1d4..19adf059c66d 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -542,7 +542,7 @@ endif
endif
-ifeq ($(strip $(GUI)),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_cxxobjects,sd,\
sd/source/ui/app/optsitem \
sd/source/ui/func/futext \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 2304d493feb9..e80316f2c82e 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -107,6 +107,6 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
))
# $(WORKDIR)/inc/sd/sddll0.hxx :
- # echo "#define" DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@
+ # echo "#define" DLL_NAME \"$(if $(filter-out WNT,$(OS)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@
# vim: set noet sw=4 ts=4:
diff --git a/sd/workben/testdll/makefile b/sd/workben/testdll/makefile
index a508b4193c7d..59498665336f 100644
--- a/sd/workben/testdll/makefile
+++ b/sd/workben/testdll/makefile
@@ -62,7 +62,7 @@ SHL1OBJS= $(SLO)\test.obj
# --- Targets ------------------------------------------------------
!INCLUDE <target.mak>
-!IF "$(GUI)" == "WNT"
+!IF "$(OS)" == "WNT"
$(MISC)\$(SHL1TARGET).def: makefile
@echo ------------------------------
diff --git a/setup_native/source/win32/customactions/indexingfilter/makefile.mk b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
index e8c7d0485202..874c9651afc6 100644
--- a/setup_native/source/win32/customactions/indexingfilter/makefile.mk
+++ b/setup_native/source/win32/customactions/indexingfilter/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/javafilter/makefile.mk b/setup_native/source/win32/customactions/javafilter/makefile.mk
index 5475ca25437b..aef948cad52a 100644
--- a/setup_native/source/win32/customactions/javafilter/makefile.mk
+++ b/setup_native/source/win32/customactions/javafilter/makefile.mk
@@ -31,7 +31,7 @@ DYNAMIC_CRT=
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index b1d1362b4d2f..1f54f3545088 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -32,7 +32,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 019dcae31c65..81ff1c4878f7 100644
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk
index de3489c85840..d0a6a3c460db 100644
--- a/setup_native/source/win32/customactions/quickstarter/makefile.mk
+++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk
@@ -36,7 +36,7 @@ UWINAPILIB=
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
STDSHL += \
$(ADVAPI32LIB)\
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
index 3c83b3f8f542..d9c111df4fb8 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
@@ -33,7 +33,7 @@ CFLAGS+=-DUNICODE -D_UNICODE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk
index c76ceebd7c0f..c96e2980d7cf 100644
--- a/setup_native/source/win32/customactions/regactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regactivex/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
index 1a8731516733..cbc2652efbb6 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
@@ -27,7 +27,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
STDSHL=
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk
index afe0c756964b..7470886ca82d 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -29,7 +29,7 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
CFLAGS+=-D_STLP_USE_STATIC_LIB
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index e85acc476f4e..5840a52cacf2 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -31,7 +31,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/setup_native/source/win32/customactions/thesaurus/makefile.mk b/setup_native/source/win32/customactions/thesaurus/makefile.mk
index 956f2571c216..115b70e1fa32 100644
--- a/setup_native/source/win32/customactions/thesaurus/makefile.mk
+++ b/setup_native/source/win32/customactions/thesaurus/makefile.mk
@@ -29,7 +29,7 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
CFLAGS+=-D_STLP_USE_STATIC_LIB
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index c991be26fe8a..daae3181103e 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -32,7 +32,7 @@ USE_DEFFILE=TRUE
# --- Files --------------------------------------------------------
-.IF "$(GUI)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
+.IF "$(OS)"=="WNT" && "$(WINDOWS_SDK_HOME)"!=""
UWINAPILIB=
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 3726c4fa1c1a..0b4629935547 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -118,7 +118,7 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_lngconvex \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,shell,\
Executable_gnome_open_url \
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 54db397a088f..6c827937ce64 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,solenv,\
))
endif
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
ifneq ($(OS),IOS)
ifneq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,solenv,\
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 0ca5f4ea0b20..4f8199c532f2 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -235,7 +235,7 @@
if (open (CMD_FILE, ">>$cmd_file")) {
select CMD_FILE;
$echo = 'echo ';
- if ($ENV{GUI_FOR_BUILD} ne 'UNX') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
$new_line = "echo.\n";
print "\@$echo off\npushd\n";
} else {
@@ -275,7 +275,7 @@
print $new_line;
do_exit(1) if ($checkparents);
};
- if (($ENV{GUI_FOR_BUILD} ne 'UNX') && $cmd_file) {
+ if (($ENV{OS_FOR_BUILD} eq 'WNT') && $cmd_file) {
print "popd\n";
};
$ENV{mk_tmp} = '';
@@ -772,7 +772,7 @@ sub dmake_dir {
#if dmake fails, have a go at regenerating the dependencies
#and try again. dmakes normal failure is 255, while death on signal is 254
my $real_exit_code = $error_code >> 8;
- if (($ENV{GUI_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
+ if (($ENV{OS_FOR_BUILD} eq 'WNT') && ($real_exit_code == 255) && ($ENV{nodep} eq '') && ($ENV{depend} eq '')) {
print "Retrying $job_name\n";
$error_code = run_job($dmake, $job_name);
}
@@ -877,12 +877,12 @@ sub get_prj_platform {
sub get_deps_from_object {
my ($module, $build_list_object, $dependencies_hash) = @_;
- foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{GUI})) {
+ foreach my $dir ($build_list_object->getJobDirectories("make", $ENV{OS})) {
$path_hash{$dir} = $module_paths{$module};
$path_hash{$dir} .= $dir if ($dir ne '/');
my %deps_hash = ();
- foreach my $dep ($build_list_object->getJobDependencies($dir, "make", $ENV{GUI})) {
+ foreach my $dep ($build_list_object->getJobDependencies($dir, "make", $ENV{OS})) {
$deps_hash{$dep}++;
};
$$dependencies_hash{$dir} = \%deps_hash;
@@ -1085,7 +1085,7 @@ sub get_commands {
check_dmake();
if ($cmd_file) {
- if ($ENV{GUI_FOR_BUILD} eq 'UNX') {
+ if ($ENV{OS_FOR_BUILD} ne 'WNT') {
$check_error_string = "if \"\$?\" != \"0\" exit\n";
} else {
$check_error_string = "if \"\%?\" != \"0\" quit\n";
@@ -1104,7 +1104,7 @@ sub get_commands {
# Procedure retrieves list of projects to be built from build.lst
#
sub get_workspace_path {
- if (!defined $ENV{GUI}) {
+ if (!defined $ENV{OS}) {
$ENV{mk_tmp} = '';
die "No environment set\n";
};
@@ -1142,8 +1142,8 @@ sub pick_prj_to_build {
sub check_platform {
my $platform = shift;
return 1 if ($platform eq 'all');
- return 1 if (($ENV{GUI} eq 'UNX') && ($platform eq 'u'));
- return 1 if (($ENV{GUI} eq 'WNT') &&
+ return 1 if (($ENV{OS} ne 'WNT') && ($platform eq 'u'));
+ return 1 if (($ENV{OS} eq 'WNT') &&
(($platform eq 'w') || ($platform eq 'n')));
return 0;
};
@@ -1604,7 +1604,7 @@ sub store_error {
my $child_nick = $processes_hash{$pid};
- if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
if (!defined $had_error{$child_nick}) {
$had_error{$child_nick}++;
return 1;
@@ -1927,7 +1927,7 @@ sub do_custom_job {
$error_code = run_job($job, $module_paths{$module}, $module_job);
if ($error_code) {
# give windows one more chance
- if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
$error_code = run_job($job, $module_paths{$module}, $module_job);
};
};
@@ -2877,7 +2877,7 @@ sub start_server_on_port {
my $port = shift;
my $socket_obj = shift;
$client_timeout = 1 if (!$parent_process);
- if ($ENV{GUI_FOR_BUILD} eq 'WNT') {
+ if ($ENV{OS_FOR_BUILD} eq 'WNT') {
$$socket_obj = new IO::Socket::INET (#LocalAddr => hostname(),
LocalPort => $port,
Proto => 'tcp',
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 2d9f5658accc..096e5bd3faeb 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -114,7 +114,6 @@ if ($^O ne 'cygwin') { # iz59477 - cygwin needes a dot "." at the e
}
}
-($gui = lc($ENV{GUI})) || die "Can't determine 'GUI'. Please set environment.\n";
$tempcounter = 0;
# zip is default for RE master builds
@@ -384,7 +383,7 @@ sub parse_options
$arg =~ /^-delete$/ and $opt_delete = 1 and next;
$arg =~ /^-dontdeletecommon$/ and $dontdeletecommon = 1 and next;
$arg =~ /^-help$/ and $opt_help = 1 and $arg = '';
- $arg =~ /^-link$/ and $ENV{GUI} ne 'WNT' and $opt_link = 1 and next;
+ $arg =~ /^-link$/ and $ENV{OS} ne 'WNT' and $opt_link = 1 and next;
$arg =~ /^-deloutput$/ and $opt_deloutput = 1 and next;
$arg =~ /^-debug$/ and $is_debug = 1 and next;
$arg =~ /^-checkdlst$/ and $opt_checkdlst = 1 and next;
@@ -458,11 +457,10 @@ sub init_globals
[ '%_DEST%', $dest ],
[ '%COMMON_OUTDIR%', $common_outdir ],
[ '%COMMON_DEST%', $common_dest ],
- [ '%GUI%', $gui ]
);
# find out if the *HOST* system supports symlinks. They all do except Windows
- $has_symlinks = $ENV{GUI} ne 'WNT';
+ $has_symlinks = $ENV{OS} ne 'WNT';
}
sub get_base
@@ -1321,7 +1319,7 @@ sub usage
print STDERR " -dontdeletecommon do not delete common files (for -delete option)\n";
print STDERR " -force copy even if not newer\n";
print STDERR " -help print this message\n";
- if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
+ if ( !defined($ENV{OS}) || $ENV{OS} ne 'WNT' ) {
print STDERR " -link hard link files into the solver to save disk space\n";
}
print STDERR " -quiet be quiet, only report errors\n";
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 99705f876edc..3f88c472ec22 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -265,7 +265,7 @@ sub check_makecab_version
######################################################################
# Reading the environment variables for the paths in ziplist.
-# solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
+# solarpath, solarenvpath, solarcommonpath, os, pmiscpath
######################################################################
sub check_system_environment
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index a0cf5f3e4e2b..646bf1649e00 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -40,7 +40,7 @@ sub create_pathvariables
my %variables = ();
# The following variables are needed in the path file list
- # solarpath, solarenvpath, solarcommonpath, os, osdef, pmiscpath
+ # solarpath, solarenvpath, solarcommonpath, os, pmiscpath
my $solarpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
$variables{'solarpath'} = $solarpath;
@@ -48,9 +48,6 @@ sub create_pathvariables
my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
$variables{'solarcommonpath'} = $solarcommonpath;
- my $osdef = lc($environment->{'GUI'});
- $variables{'osdef'} = $osdef;
-
$variables{'os'} = $installer::globals::compiler;
my $solarenvpath = "";
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 3b086c633348..9e806cad413f 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -27,7 +27,7 @@ my $tmp_dir;
# FIXME: really we should hunt and parse / source the config_host.mk magic I guess.
die "You need your environment setup right, eg. run make cmd cmd='ooinstall /path/to/install'" if (!defined $ENV{SRC_ROOT});
-if ($ENV{GUI} eq 'WNT') {
+if ($ENV{OS} eq 'WNT') {
$is_windows = 1;
}
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index b5a7956cf205..ec70788d7eb4 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -36,14 +36,14 @@ APP1STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP1RESO=
.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
APP1RESO=$(MISC)/$(APP1TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP1DEPN+:=$(APP1DEPNU)
USE_APP1DEF=
.ENDIF
@@ -55,7 +55,7 @@ APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
.ENDIF # "$(APP1PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP1LIBS)"!=""
$(MISC)/$(APP1TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -74,7 +74,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(APP1RES) \
$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
@@ -114,7 +114,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP1LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP1LINKRES:b).rc
@@ -202,7 +202,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP1TARGETN)"!=""
@@ -246,14 +246,14 @@ APP2STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP2RESO=
.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
APP2RESO=$(MISC)/$(APP2TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP2DEPN+:=$(APP2DEPNU)
USE_APP2DEF=
.ENDIF
@@ -265,7 +265,7 @@ APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
.ENDIF # "$(APP2PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP2LIBS)"!=""
$(MISC)/$(APP2TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -284,7 +284,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(APP2RES) \
$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
@@ -324,7 +324,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP2LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP2LINKRES:b).rc
@@ -412,7 +412,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP2TARGETN)"!=""
@@ -456,14 +456,14 @@ APP3STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP3RESO=
.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
APP3RESO=$(MISC)/$(APP3TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP3DEPN+:=$(APP3DEPNU)
USE_APP3DEF=
.ENDIF
@@ -475,7 +475,7 @@ APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
.ENDIF # "$(APP3PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP3LIBS)"!=""
$(MISC)/$(APP3TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -494,7 +494,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(APP3RES) \
$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
@@ -534,7 +534,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP3LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP3LINKRES:b).rc
@@ -622,7 +622,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP3TARGETN)"!=""
@@ -666,14 +666,14 @@ APP4STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP4RESO=
.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
APP4RESO=$(MISC)/$(APP4TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP4DEPN+:=$(APP4DEPNU)
USE_APP4DEF=
.ENDIF
@@ -685,7 +685,7 @@ APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
.ENDIF # "$(APP4PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP4LIBS)"!=""
$(MISC)/$(APP4TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -704,7 +704,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(APP4RES) \
$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
@@ -744,7 +744,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP4LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP4LINKRES:b).rc
@@ -832,7 +832,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP4TARGETN)"!=""
@@ -876,14 +876,14 @@ APP5STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP5RESO=
.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
APP5RESO=$(MISC)/$(APP5TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP5DEPN+:=$(APP5DEPNU)
USE_APP5DEF=
.ENDIF
@@ -895,7 +895,7 @@ APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
.ENDIF # "$(APP5PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP5LIBS)"!=""
$(MISC)/$(APP5TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -914,7 +914,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(APP5RES) \
$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
@@ -954,7 +954,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP5LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP5LINKRES:b).rc
@@ -1042,7 +1042,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP5TARGETN)"!=""
@@ -1086,14 +1086,14 @@ APP6STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP6RESO=
.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
APP6RESO=$(MISC)/$(APP6TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP6DEPN+:=$(APP6DEPNU)
USE_APP6DEF=
.ENDIF
@@ -1105,7 +1105,7 @@ APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
.ENDIF # "$(APP6PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP6LIBS)"!=""
$(MISC)/$(APP6TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1124,7 +1124,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(APP6RES) \
$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
@@ -1164,7 +1164,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP6LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP6LINKRES:b).rc
@@ -1252,7 +1252,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP6TARGETN)"!=""
@@ -1296,14 +1296,14 @@ APP7STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP7RESO=
.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
APP7RESO=$(MISC)/$(APP7TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP7DEPN+:=$(APP7DEPNU)
USE_APP7DEF=
.ENDIF
@@ -1315,7 +1315,7 @@ APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
.ENDIF # "$(APP7PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP7LIBS)"!=""
$(MISC)/$(APP7TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1334,7 +1334,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(APP7RES) \
$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
@@ -1374,7 +1374,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP7LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP7LINKRES:b).rc
@@ -1462,7 +1462,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP7TARGETN)"!=""
@@ -1506,14 +1506,14 @@ APP8STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP8RESO=
.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
APP8RESO=$(MISC)/$(APP8TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP8DEPN+:=$(APP8DEPNU)
USE_APP8DEF=
.ENDIF
@@ -1525,7 +1525,7 @@ APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
.ENDIF # "$(APP8PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP8LIBS)"!=""
$(MISC)/$(APP8TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1544,7 +1544,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(APP8RES) \
$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
@@ -1584,7 +1584,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP8LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP8LINKRES:b).rc
@@ -1672,7 +1672,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP8TARGETN)"!=""
@@ -1716,14 +1716,14 @@ APP9STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP9RESO=
.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
APP9RESO=$(MISC)/$(APP9TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP9DEPN+:=$(APP9DEPNU)
USE_APP9DEF=
.ENDIF
@@ -1735,7 +1735,7 @@ APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
.ENDIF # "$(APP9PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP9LIBS)"!=""
$(MISC)/$(APP9TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1754,7 +1754,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(APP9RES) \
$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
@@ -1794,7 +1794,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP9LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP9LINKRES:b).rc
@@ -1882,7 +1882,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP9TARGETN)"!=""
@@ -1926,14 +1926,14 @@ APP10STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP10RESO=
.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
APP10RESO=$(MISC)/$(APP10TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP10DEPN+:=$(APP10DEPNU)
USE_APP10DEF=
.ENDIF
@@ -1945,7 +1945,7 @@ APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\"
.ENDIF # "$(APP10PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP10LIBS)"!=""
$(MISC)/$(APP10TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1964,7 +1964,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(APP10RES) \
$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
@@ -2004,7 +2004,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP10LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP10LINKRES:b).rc
@@ -2092,7 +2092,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP10TARGETN)"!=""
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index b0b35d8d5c99..38e9ddaa4c01 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -13,7 +13,7 @@ DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib)
.IF "$(SHL1VERSIONMAP)"!=""
.IF "$(DEF1EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF1EXPORTFILE) : $(SHL1OBJS) $(SHL1LIBS)
@@ -34,12 +34,12 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF1EXPORTFILE)"==""
.ENDIF # "$(SHL1VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF1FILTER=$(SOLARENV)/inc/dummy.flt
@@ -155,9 +155,9 @@ $(DEF1TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF1TARGETN): \
$(DEF1DEPN) \
$(DEF1EXPORTFILE)
@@ -182,7 +182,7 @@ DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib)
.IF "$(SHL2VERSIONMAP)"!=""
.IF "$(DEF2EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF2EXPORTFILE) : $(SHL2OBJS) $(SHL2LIBS)
@@ -203,12 +203,12 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF2EXPORTFILE)"==""
.ENDIF # "$(SHL2VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF2FILTER=$(SOLARENV)/inc/dummy.flt
@@ -324,9 +324,9 @@ $(DEF2TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF2TARGETN): \
$(DEF2DEPN) \
$(DEF2EXPORTFILE)
@@ -351,7 +351,7 @@ DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib)
.IF "$(SHL3VERSIONMAP)"!=""
.IF "$(DEF3EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF3EXPORTFILE) : $(SHL3OBJS) $(SHL3LIBS)
@@ -372,12 +372,12 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF3EXPORTFILE)"==""
.ENDIF # "$(SHL3VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF3FILTER=$(SOLARENV)/inc/dummy.flt
@@ -493,9 +493,9 @@ $(DEF3TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF3TARGETN): \
$(DEF3DEPN) \
$(DEF3EXPORTFILE)
@@ -520,7 +520,7 @@ DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib)
.IF "$(SHL4VERSIONMAP)"!=""
.IF "$(DEF4EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF4EXPORTFILE) : $(SHL4OBJS) $(SHL4LIBS)
@@ -541,12 +541,12 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF4EXPORTFILE)"==""
.ENDIF # "$(SHL4VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF4FILTER=$(SOLARENV)/inc/dummy.flt
@@ -662,9 +662,9 @@ $(DEF4TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF4TARGETN): \
$(DEF4DEPN) \
$(DEF4EXPORTFILE)
@@ -689,7 +689,7 @@ DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib)
.IF "$(SHL5VERSIONMAP)"!=""
.IF "$(DEF5EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF5EXPORTFILE) : $(SHL5OBJS) $(SHL5LIBS)
@@ -710,12 +710,12 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF5EXPORTFILE)"==""
.ENDIF # "$(SHL5VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF5FILTER=$(SOLARENV)/inc/dummy.flt
@@ -831,9 +831,9 @@ $(DEF5TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF5TARGETN): \
$(DEF5DEPN) \
$(DEF5EXPORTFILE)
@@ -858,7 +858,7 @@ DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib)
.IF "$(SHL6VERSIONMAP)"!=""
.IF "$(DEF6EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF6EXPORTFILE) : $(SHL6OBJS) $(SHL6LIBS)
@@ -879,12 +879,12 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF6EXPORTFILE)"==""
.ENDIF # "$(SHL6VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF6FILTER=$(SOLARENV)/inc/dummy.flt
@@ -1000,9 +1000,9 @@ $(DEF6TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF6TARGETN): \
$(DEF6DEPN) \
$(DEF6EXPORTFILE)
@@ -1027,7 +1027,7 @@ DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib)
.IF "$(SHL7VERSIONMAP)"!=""
.IF "$(DEF7EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF7EXPORTFILE) : $(SHL7OBJS) $(SHL7LIBS)
@@ -1048,12 +1048,12 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF7EXPORTFILE)"==""
.ENDIF # "$(SHL7VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF7FILTER=$(SOLARENV)/inc/dummy.flt
@@ -1169,9 +1169,9 @@ $(DEF7TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF7TARGETN): \
$(DEF7DEPN) \
$(DEF7EXPORTFILE)
@@ -1196,7 +1196,7 @@ DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib)
.IF "$(SHL8VERSIONMAP)"!=""
.IF "$(DEF8EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF8EXPORTFILE) : $(SHL8OBJS) $(SHL8LIBS)
@@ -1217,12 +1217,12 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF8EXPORTFILE)"==""
.ENDIF # "$(SHL8VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF8FILTER=$(SOLARENV)/inc/dummy.flt
@@ -1338,9 +1338,9 @@ $(DEF8TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF8TARGETN): \
$(DEF8DEPN) \
$(DEF8EXPORTFILE)
@@ -1365,7 +1365,7 @@ DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib)
.IF "$(SHL9VERSIONMAP)"!=""
.IF "$(DEF9EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF9EXPORTFILE) : $(SHL9OBJS) $(SHL9LIBS)
@@ -1386,12 +1386,12 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF9EXPORTFILE)"==""
.ENDIF # "$(SHL9VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF9FILTER=$(SOLARENV)/inc/dummy.flt
@@ -1507,9 +1507,9 @@ $(DEF9TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF9TARGETN): \
$(DEF9DEPN) \
$(DEF9EXPORTFILE)
@@ -1534,7 +1534,7 @@ DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib)
.IF "$(SHL10VERSIONMAP)"!=""
.IF "$(DEF10EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF10EXPORTFILE) : $(SHL10OBJS) $(SHL10LIBS)
@@ -1555,12 +1555,12 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF10EXPORTFILE)"==""
.ENDIF # "$(SHL10VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF10FILTER=$(SOLARENV)/inc/dummy.flt
@@ -1676,9 +1676,9 @@ $(DEF10TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF10TARGETN): \
$(DEF10DEPN) \
$(DEF10EXPORTFILE)
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk
index 5b6c463559f4..948d9525eb29 100644
--- a/solenv/inc/_tg_lib.mk
+++ b/solenv/inc/_tg_lib.mk
@@ -6,7 +6,7 @@
$(LIB1ARCHIV) : $(LIB1TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -19,8 +19,8 @@ $(LIB1ARCHIV) : $(LIB1TARGET)
@cat $(MISC)/$(LIB1ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB1ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
@@ -30,8 +30,8 @@ $(LIB1ARCHIV) : $(LIB1TARGET)
@+source $(MISC)/$(LIB1ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB1ARCHIV)" != ""
@@ -46,7 +46,7 @@ $(LIB1TARGET) : $(LIB1FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB1FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -56,8 +56,8 @@ $(LIB1TARGET) : $(LIB1FILES) \
@nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB1FILES) | xargs -n1 >> $@
@@ -72,14 +72,14 @@ $(LIB1TARGET) : $(LIB1FILES) \
.ENDIF # "$(LIB1FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB1FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB1OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB1TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -91,7 +91,7 @@ $(LIB1TARGET) : $(LIB1FILES) \
$(LIB2ARCHIV) : $(LIB2TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -104,8 +104,8 @@ $(LIB2ARCHIV) : $(LIB2TARGET)
@cat $(MISC)/$(LIB2ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB2ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
@@ -115,8 +115,8 @@ $(LIB2ARCHIV) : $(LIB2TARGET)
@+source $(MISC)/$(LIB2ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB2ARCHIV)" != ""
@@ -131,7 +131,7 @@ $(LIB2TARGET) : $(LIB2FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB2FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -141,8 +141,8 @@ $(LIB2TARGET) : $(LIB2FILES) \
@nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB2FILES) | xargs -n1 >> $@
@@ -157,14 +157,14 @@ $(LIB2TARGET) : $(LIB2FILES) \
.ENDIF # "$(LIB2FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB2FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB2OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB2TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -176,7 +176,7 @@ $(LIB2TARGET) : $(LIB2FILES) \
$(LIB3ARCHIV) : $(LIB3TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -189,8 +189,8 @@ $(LIB3ARCHIV) : $(LIB3TARGET)
@cat $(MISC)/$(LIB3ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB3ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
@@ -200,8 +200,8 @@ $(LIB3ARCHIV) : $(LIB3TARGET)
@+source $(MISC)/$(LIB3ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB3ARCHIV)" != ""
@@ -216,7 +216,7 @@ $(LIB3TARGET) : $(LIB3FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB3FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -226,8 +226,8 @@ $(LIB3TARGET) : $(LIB3FILES) \
@nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB3FILES) | xargs -n1 >> $@
@@ -242,14 +242,14 @@ $(LIB3TARGET) : $(LIB3FILES) \
.ENDIF # "$(LIB3FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB3FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB3OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB3TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -261,7 +261,7 @@ $(LIB3TARGET) : $(LIB3FILES) \
$(LIB4ARCHIV) : $(LIB4TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -274,8 +274,8 @@ $(LIB4ARCHIV) : $(LIB4TARGET)
@cat $(MISC)/$(LIB4ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB4ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
@@ -285,8 +285,8 @@ $(LIB4ARCHIV) : $(LIB4TARGET)
@+source $(MISC)/$(LIB4ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB4ARCHIV)" != ""
@@ -301,7 +301,7 @@ $(LIB4TARGET) : $(LIB4FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB4FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -311,8 +311,8 @@ $(LIB4TARGET) : $(LIB4FILES) \
@nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB4FILES) | xargs -n1 >> $@
@@ -327,14 +327,14 @@ $(LIB4TARGET) : $(LIB4FILES) \
.ENDIF # "$(LIB4FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB4FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB4OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB4TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -346,7 +346,7 @@ $(LIB4TARGET) : $(LIB4FILES) \
$(LIB5ARCHIV) : $(LIB5TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -359,8 +359,8 @@ $(LIB5ARCHIV) : $(LIB5TARGET)
@cat $(MISC)/$(LIB5ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB5ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
@@ -370,8 +370,8 @@ $(LIB5ARCHIV) : $(LIB5TARGET)
@+source $(MISC)/$(LIB5ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB5ARCHIV)" != ""
@@ -386,7 +386,7 @@ $(LIB5TARGET) : $(LIB5FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB5FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -396,8 +396,8 @@ $(LIB5TARGET) : $(LIB5FILES) \
@nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB5FILES) | xargs -n1 >> $@
@@ -412,14 +412,14 @@ $(LIB5TARGET) : $(LIB5FILES) \
.ENDIF # "$(LIB5FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB5FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB5OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB5TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -431,7 +431,7 @@ $(LIB5TARGET) : $(LIB5FILES) \
$(LIB6ARCHIV) : $(LIB6TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -444,8 +444,8 @@ $(LIB6ARCHIV) : $(LIB6TARGET)
@cat $(MISC)/$(LIB6ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB6ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
@@ -455,8 +455,8 @@ $(LIB6ARCHIV) : $(LIB6TARGET)
@+source $(MISC)/$(LIB6ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB6ARCHIV)" != ""
@@ -471,7 +471,7 @@ $(LIB6TARGET) : $(LIB6FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB6FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -481,8 +481,8 @@ $(LIB6TARGET) : $(LIB6FILES) \
@nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB6FILES) | xargs -n1 >> $@
@@ -497,14 +497,14 @@ $(LIB6TARGET) : $(LIB6FILES) \
.ENDIF # "$(LIB6FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB6FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB6OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB6TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -516,7 +516,7 @@ $(LIB6TARGET) : $(LIB6FILES) \
$(LIB7ARCHIV) : $(LIB7TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -529,8 +529,8 @@ $(LIB7ARCHIV) : $(LIB7TARGET)
@cat $(MISC)/$(LIB7ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB7ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
@@ -540,8 +540,8 @@ $(LIB7ARCHIV) : $(LIB7TARGET)
@+source $(MISC)/$(LIB7ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB7ARCHIV)" != ""
@@ -556,7 +556,7 @@ $(LIB7TARGET) : $(LIB7FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB7FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -566,8 +566,8 @@ $(LIB7TARGET) : $(LIB7FILES) \
@nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB7FILES) | xargs -n1 >> $@
@@ -582,14 +582,14 @@ $(LIB7TARGET) : $(LIB7FILES) \
.ENDIF # "$(LIB7FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB7FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB7OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB7TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -601,7 +601,7 @@ $(LIB7TARGET) : $(LIB7FILES) \
$(LIB8ARCHIV) : $(LIB8TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -614,8 +614,8 @@ $(LIB8ARCHIV) : $(LIB8TARGET)
@cat $(MISC)/$(LIB8ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB8ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
@@ -625,8 +625,8 @@ $(LIB8ARCHIV) : $(LIB8TARGET)
@+source $(MISC)/$(LIB8ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB8ARCHIV)" != ""
@@ -641,7 +641,7 @@ $(LIB8TARGET) : $(LIB8FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB8FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -651,8 +651,8 @@ $(LIB8TARGET) : $(LIB8FILES) \
@nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB8FILES) | xargs -n1 >> $@
@@ -667,14 +667,14 @@ $(LIB8TARGET) : $(LIB8FILES) \
.ENDIF # "$(LIB8FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB8FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB8OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB8TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -686,7 +686,7 @@ $(LIB8TARGET) : $(LIB8FILES) \
$(LIB9ARCHIV) : $(LIB9TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -699,8 +699,8 @@ $(LIB9ARCHIV) : $(LIB9TARGET)
@cat $(MISC)/$(LIB9ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB9ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
@@ -710,8 +710,8 @@ $(LIB9ARCHIV) : $(LIB9TARGET)
@+source $(MISC)/$(LIB9ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB9ARCHIV)" != ""
@@ -726,7 +726,7 @@ $(LIB9TARGET) : $(LIB9FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB9FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -736,8 +736,8 @@ $(LIB9TARGET) : $(LIB9FILES) \
@nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB9FILES) | xargs -n1 >> $@
@@ -752,14 +752,14 @@ $(LIB9TARGET) : $(LIB9FILES) \
.ENDIF # "$(LIB9FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB9FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB9OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB9TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
@@ -771,7 +771,7 @@ $(LIB9TARGET) : $(LIB9FILES) \
$(LIB10ARCHIV) : $(LIB10TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -784,8 +784,8 @@ $(LIB10ARCHIV) : $(LIB10TARGET)
@cat $(MISC)/$(LIB10ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB10ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
@+echo ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
@@ -795,8 +795,8 @@ $(LIB10ARCHIV) : $(LIB10TARGET)
@+source $(MISC)/$(LIB10ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB10ARCHIV)" != ""
@@ -811,7 +811,7 @@ $(LIB10TARGET) : $(LIB10FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB10FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -821,8 +821,8 @@ $(LIB10TARGET) : $(LIB10FILES) \
@nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB10FILES) | xargs -n1 >> $@
@@ -837,14 +837,14 @@ $(LIB10TARGET) : $(LIB10FILES) \
.ENDIF # "$(LIB10FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB10FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB10OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB10TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 78e2422c8725..e2262a5b1637 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -26,11 +26,11 @@ $(RESLIB1TARGETN): \
$(RESLIB1SRSFILES) \
$(RESLIB1BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI1)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI1)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB1TARGETN)"!=""
@@ -62,11 +62,11 @@ $(RESLIB2TARGETN): \
$(RESLIB2SRSFILES) \
$(RESLIB2BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI2)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI2)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB2TARGETN)"!=""
@@ -98,11 +98,11 @@ $(RESLIB3TARGETN): \
$(RESLIB3SRSFILES) \
$(RESLIB3BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI3)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI3)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB3TARGETN)"!=""
@@ -134,11 +134,11 @@ $(RESLIB4TARGETN): \
$(RESLIB4SRSFILES) \
$(RESLIB4BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI4)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI4)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB4TARGETN)"!=""
@@ -170,11 +170,11 @@ $(RESLIB5TARGETN): \
$(RESLIB5SRSFILES) \
$(RESLIB5BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI5)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI5)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB5TARGETN)"!=""
@@ -206,11 +206,11 @@ $(RESLIB6TARGETN): \
$(RESLIB6SRSFILES) \
$(RESLIB6BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI6)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI6)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB6TARGETN)"!=""
@@ -242,11 +242,11 @@ $(RESLIB7TARGETN): \
$(RESLIB7SRSFILES) \
$(RESLIB7BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI7)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI7)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB7TARGETN)"!=""
@@ -278,11 +278,11 @@ $(RESLIB8TARGETN): \
$(RESLIB8SRSFILES) \
$(RESLIB8BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI8)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI8)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB8TARGETN)"!=""
@@ -314,11 +314,11 @@ $(RESLIB9TARGETN): \
$(RESLIB9SRSFILES) \
$(RESLIB9BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI9)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI9)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB9TARGETN)"!=""
@@ -350,11 +350,11 @@ $(RESLIB10TARGETN): \
$(RESLIB10SRSFILES) \
$(RESLIB10BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI10)
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI10)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB10TARGETN)"!=""
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 4aed3be2e3cd..6c51ec4f87a2 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -42,11 +42,11 @@ EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL1VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL1VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
@@ -55,8 +55,8 @@ $(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL1IMPLIB)" == ""
SHL1IMPLIB=i$(TARGET)_t1
.ENDIF # "$(SHL1IMPLIB)" == ""
@@ -74,9 +74,9 @@ ALLTAR : $(SHL1IMPLIBN)
USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL1DEF=$(SHL1DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL1DEF=
SHL1DEPN+:=$(SHL1DEPNU)
@@ -185,13 +185,13 @@ $(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL1VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL1VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -211,7 +211,7 @@ SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o
#.IF "$(SHL1TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL1LIBS)"!=""
$(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -241,7 +241,7 @@ $(SHL1TARGETN) : \
$(SHL1RES)\
$(SHL1DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL1DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc
.IF "$(SHL1ICON)" != ""
@@ -423,8 +423,8 @@ $(SHL1TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
@@ -479,7 +479,7 @@ $(SHL1TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL1TARGETN)"!=""
@@ -527,11 +527,11 @@ EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL2VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL2VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
@@ -540,8 +540,8 @@ $(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL2IMPLIB)" == ""
SHL2IMPLIB=i$(TARGET)_t2
.ENDIF # "$(SHL2IMPLIB)" == ""
@@ -559,9 +559,9 @@ ALLTAR : $(SHL2IMPLIBN)
USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL2DEF=$(SHL2DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL2DEF=
SHL2DEPN+:=$(SHL2DEPNU)
@@ -670,13 +670,13 @@ $(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL2VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL2VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -696,7 +696,7 @@ SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o
#.IF "$(SHL2TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL2LIBS)"!=""
$(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -726,7 +726,7 @@ $(SHL2TARGETN) : \
$(SHL2RES)\
$(SHL2DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL2DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc
.IF "$(SHL2ICON)" != ""
@@ -908,8 +908,8 @@ $(SHL2TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
@@ -964,7 +964,7 @@ $(SHL2TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL2TARGETN)"!=""
@@ -1012,11 +1012,11 @@ EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL3VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL3VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
@@ -1025,8 +1025,8 @@ $(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL3IMPLIB)" == ""
SHL3IMPLIB=i$(TARGET)_t3
.ENDIF # "$(SHL3IMPLIB)" == ""
@@ -1044,9 +1044,9 @@ ALLTAR : $(SHL3IMPLIBN)
USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL3DEF=$(SHL3DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL3DEF=
SHL3DEPN+:=$(SHL3DEPNU)
@@ -1155,13 +1155,13 @@ $(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL3VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL3VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1181,7 +1181,7 @@ SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o
#.IF "$(SHL3TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL3LIBS)"!=""
$(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1211,7 +1211,7 @@ $(SHL3TARGETN) : \
$(SHL3RES)\
$(SHL3DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL3DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc
.IF "$(SHL3ICON)" != ""
@@ -1393,8 +1393,8 @@ $(SHL3TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
@@ -1449,7 +1449,7 @@ $(SHL3TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL3TARGETN)"!=""
@@ -1497,11 +1497,11 @@ EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL4VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL4VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
@@ -1510,8 +1510,8 @@ $(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL4IMPLIB)" == ""
SHL4IMPLIB=i$(TARGET)_t4
.ENDIF # "$(SHL4IMPLIB)" == ""
@@ -1529,9 +1529,9 @@ ALLTAR : $(SHL4IMPLIBN)
USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL4DEF=$(SHL4DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL4DEF=
SHL4DEPN+:=$(SHL4DEPNU)
@@ -1640,13 +1640,13 @@ $(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL4VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL4VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1666,7 +1666,7 @@ SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o
#.IF "$(SHL4TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL4LIBS)"!=""
$(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -1696,7 +1696,7 @@ $(SHL4TARGETN) : \
$(SHL4RES)\
$(SHL4DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL4DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc
.IF "$(SHL4ICON)" != ""
@@ -1878,8 +1878,8 @@ $(SHL4TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
@@ -1934,7 +1934,7 @@ $(SHL4TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL4TARGETN)"!=""
@@ -1982,11 +1982,11 @@ EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL5VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL5VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
@@ -1995,8 +1995,8 @@ $(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL5IMPLIB)" == ""
SHL5IMPLIB=i$(TARGET)_t5
.ENDIF # "$(SHL5IMPLIB)" == ""
@@ -2014,9 +2014,9 @@ ALLTAR : $(SHL5IMPLIBN)
USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL5DEF=$(SHL5DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL5DEF=
SHL5DEPN+:=$(SHL5DEPNU)
@@ -2125,13 +2125,13 @@ $(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL5VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL5VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2151,7 +2151,7 @@ SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o
#.IF "$(SHL5TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL5LIBS)"!=""
$(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -2181,7 +2181,7 @@ $(SHL5TARGETN) : \
$(SHL5RES)\
$(SHL5DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL5DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc
.IF "$(SHL5ICON)" != ""
@@ -2363,8 +2363,8 @@ $(SHL5TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
@@ -2419,7 +2419,7 @@ $(SHL5TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL5TARGETN)"!=""
@@ -2467,11 +2467,11 @@ EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL6VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL6VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
@@ -2480,8 +2480,8 @@ $(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL6IMPLIB)" == ""
SHL6IMPLIB=i$(TARGET)_t6
.ENDIF # "$(SHL6IMPLIB)" == ""
@@ -2499,9 +2499,9 @@ ALLTAR : $(SHL6IMPLIBN)
USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL6DEF=$(SHL6DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL6DEF=
SHL6DEPN+:=$(SHL6DEPNU)
@@ -2610,13 +2610,13 @@ $(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL6VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL6VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2636,7 +2636,7 @@ SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o
#.IF "$(SHL6TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL6LIBS)"!=""
$(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -2666,7 +2666,7 @@ $(SHL6TARGETN) : \
$(SHL6RES)\
$(SHL6DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL6DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc
.IF "$(SHL6ICON)" != ""
@@ -2848,8 +2848,8 @@ $(SHL6TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
@@ -2904,7 +2904,7 @@ $(SHL6TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL6TARGETN)"!=""
@@ -2952,11 +2952,11 @@ EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL7VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL7VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
@@ -2965,8 +2965,8 @@ $(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL7IMPLIB)" == ""
SHL7IMPLIB=i$(TARGET)_t7
.ENDIF # "$(SHL7IMPLIB)" == ""
@@ -2984,9 +2984,9 @@ ALLTAR : $(SHL7IMPLIBN)
USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL7DEF=$(SHL7DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL7DEF=
SHL7DEPN+:=$(SHL7DEPNU)
@@ -3095,13 +3095,13 @@ $(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL7VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL7VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3121,7 +3121,7 @@ SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o
#.IF "$(SHL7TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL7LIBS)"!=""
$(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -3151,7 +3151,7 @@ $(SHL7TARGETN) : \
$(SHL7RES)\
$(SHL7DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL7DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc
.IF "$(SHL7ICON)" != ""
@@ -3333,8 +3333,8 @@ $(SHL7TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
@@ -3389,7 +3389,7 @@ $(SHL7TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL7TARGETN)"!=""
@@ -3437,11 +3437,11 @@ EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL8VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL8VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
@@ -3450,8 +3450,8 @@ $(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL8IMPLIB)" == ""
SHL8IMPLIB=i$(TARGET)_t8
.ENDIF # "$(SHL8IMPLIB)" == ""
@@ -3469,9 +3469,9 @@ ALLTAR : $(SHL8IMPLIBN)
USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL8DEF=$(SHL8DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL8DEF=
SHL8DEPN+:=$(SHL8DEPNU)
@@ -3580,13 +3580,13 @@ $(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL8VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL8VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3606,7 +3606,7 @@ SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o
#.IF "$(SHL8TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL8LIBS)"!=""
$(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -3636,7 +3636,7 @@ $(SHL8TARGETN) : \
$(SHL8RES)\
$(SHL8DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL8DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc
.IF "$(SHL8ICON)" != ""
@@ -3818,8 +3818,8 @@ $(SHL8TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
@@ -3874,7 +3874,7 @@ $(SHL8TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL8TARGETN)"!=""
@@ -3922,11 +3922,11 @@ EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL9VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL9VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
@@ -3935,8 +3935,8 @@ $(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIO
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL9IMPLIB)" == ""
SHL9IMPLIB=i$(TARGET)_t9
.ENDIF # "$(SHL9IMPLIB)" == ""
@@ -3954,9 +3954,9 @@ ALLTAR : $(SHL9IMPLIBN)
USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL9DEF=$(SHL9DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL9DEF=
SHL9DEPN+:=$(SHL9DEPNU)
@@ -4065,13 +4065,13 @@ $(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL9VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL9VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -4091,7 +4091,7 @@ SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o
#.IF "$(SHL9TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL9LIBS)"!=""
$(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -4121,7 +4121,7 @@ $(SHL9TARGETN) : \
$(SHL9RES)\
$(SHL9DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL9DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc
.IF "$(SHL9ICON)" != ""
@@ -4303,8 +4303,8 @@ $(SHL9TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
@@ -4359,7 +4359,7 @@ $(SHL9TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL9TARGETN)"!=""
@@ -4407,11 +4407,11 @@ EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL10VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL10VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
@@ -4420,8 +4420,8 @@ $(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERS
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL10IMPLIB)" == ""
SHL10IMPLIB=i$(TARGET)_t10
.ENDIF # "$(SHL10IMPLIB)" == ""
@@ -4439,9 +4439,9 @@ ALLTAR : $(SHL10IMPLIBN)
USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL10DEF=$(SHL10DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL10DEF=
SHL10DEPN+:=$(SHL10DEPNU)
@@ -4550,13 +4550,13 @@ $(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL10VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL10VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -4576,7 +4576,7 @@ SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o
#.IF "$(SHL10TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL10LIBS)"!=""
$(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -4606,7 +4606,7 @@ $(SHL10TARGETN) : \
$(SHL10RES)\
$(SHL10DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL10DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc
.IF "$(SHL10ICON)" != ""
@@ -4788,8 +4788,8 @@ $(SHL10TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
@@ -4844,7 +4844,7 @@ $(SHL10TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL10TARGETN)"!=""
@@ -4858,8 +4858,8 @@ USELIB1DEPN+=$(SHL1LIBS)
USE_SHL1TARGET=$(SHL1TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL1IMPLIBN): \
$(SHL1DEF) \
$(USE_SHL1TARGET) \
@@ -4870,7 +4870,7 @@ $(SHL1IMPLIBN): \
$(SHL1LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL1IMPLIBN) \
@@ -4898,8 +4898,8 @@ USELIB2DEPN+=$(SHL2LIBS)
USE_SHL2TARGET=$(SHL2TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL2IMPLIBN): \
$(SHL2DEF) \
$(USE_SHL2TARGET) \
@@ -4910,7 +4910,7 @@ $(SHL2IMPLIBN): \
$(SHL2LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL2IMPLIBN) \
@@ -4938,8 +4938,8 @@ USELIB3DEPN+=$(SHL3LIBS)
USE_SHL3TARGET=$(SHL3TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL3IMPLIBN): \
$(SHL3DEF) \
$(USE_SHL3TARGET) \
@@ -4950,7 +4950,7 @@ $(SHL3IMPLIBN): \
$(SHL3LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL3IMPLIBN) \
@@ -4978,8 +4978,8 @@ USELIB4DEPN+=$(SHL4LIBS)
USE_SHL4TARGET=$(SHL4TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL4IMPLIBN): \
$(SHL4DEF) \
$(USE_SHL4TARGET) \
@@ -4990,7 +4990,7 @@ $(SHL4IMPLIBN): \
$(SHL4LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL4IMPLIBN) \
@@ -5018,8 +5018,8 @@ USELIB5DEPN+=$(SHL5LIBS)
USE_SHL5TARGET=$(SHL5TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL5IMPLIBN): \
$(SHL5DEF) \
$(USE_SHL5TARGET) \
@@ -5030,7 +5030,7 @@ $(SHL5IMPLIBN): \
$(SHL5LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL5IMPLIBN) \
@@ -5058,8 +5058,8 @@ USELIB6DEPN+=$(SHL6LIBS)
USE_SHL6TARGET=$(SHL6TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL6IMPLIBN): \
$(SHL6DEF) \
$(USE_SHL6TARGET) \
@@ -5070,7 +5070,7 @@ $(SHL6IMPLIBN): \
$(SHL6LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL6IMPLIBN) \
@@ -5098,8 +5098,8 @@ USELIB7DEPN+=$(SHL7LIBS)
USE_SHL7TARGET=$(SHL7TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL7IMPLIBN): \
$(SHL7DEF) \
$(USE_SHL7TARGET) \
@@ -5110,7 +5110,7 @@ $(SHL7IMPLIBN): \
$(SHL7LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL7IMPLIBN) \
@@ -5138,8 +5138,8 @@ USELIB8DEPN+=$(SHL8LIBS)
USE_SHL8TARGET=$(SHL8TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL8IMPLIBN): \
$(SHL8DEF) \
$(USE_SHL8TARGET) \
@@ -5150,7 +5150,7 @@ $(SHL8IMPLIBN): \
$(SHL8LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL8IMPLIBN) \
@@ -5178,8 +5178,8 @@ USELIB9DEPN+=$(SHL9LIBS)
USE_SHL9TARGET=$(SHL9TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL9IMPLIBN): \
$(SHL9DEF) \
$(USE_SHL9TARGET) \
@@ -5190,7 +5190,7 @@ $(SHL9IMPLIBN): \
$(SHL9LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL9IMPLIBN) \
@@ -5218,8 +5218,8 @@ USELIB10DEPN+=$(SHL10LIBS)
USE_SHL10TARGET=$(SHL10TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL10IMPLIBN): \
$(SHL10DEF) \
$(USE_SHL10TARGET) \
@@ -5230,7 +5230,7 @@ $(SHL10IMPLIBN): \
$(SHL10LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL10IMPLIBN) \
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index 0f0443439240..6efd42196ca6 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -1,6 +1,6 @@
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -76,7 +76,7 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -152,7 +152,7 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -228,7 +228,7 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -304,7 +304,7 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -380,7 +380,7 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -456,7 +456,7 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -532,7 +532,7 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -608,7 +608,7 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
@@ -684,7 +684,7 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 8a1a328828e3..8e114604bda5 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -91,11 +91,11 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
# default OOo license text!!!
# may not fit...
.IF "$(CUSTOM_LICENSE)"==""
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/license.txt
-.ELSE # "$(GUI)" == "WNT"
+.ELSE # "$(OS)" == "WNT"
PACKLICDEPS=$(SOLARVER)/$(INPATH)/bin/osl/LICENSE
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ELSE # "$(CUSTOM_LICENSE)" == ""
PACKLICDEPS=$(CUSTOM_LICENSE)
.ENDIF # "$(CUSTOM_LICENSE)" == ""
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index d24d9cda809a..b1503e3b8b93 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -38,7 +38,7 @@ DESCRIPTION_SRC*:=description.xml
COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml
MANIFEST_SRC*:=manifest.xml
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
PACKLICS*:=$(EXTENSIONDIR)/registration/license.txt
COMPONENT_LIC_TEMPL*:=registration/license.txt
.ELSE
diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk
index 47671bf57b8e..9012fca6bd5d 100644
--- a/solenv/inc/lang.mk
+++ b/solenv/inc/lang.mk
@@ -17,11 +17,11 @@
#
-#.IF "$(GUI)"=="UNX" || "$(OS)"=="WNT"
-#LANG_GUI=WIN
-#.ELSE
-LANG_GUI=$(GUI)
-#.ENDIF
+.IF "$(OS)"=="WNT"
+LANG_GUI=WNT
+.ELSE
+LANG_GUI=UNX
+.ENDIF
###################################################
#
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 17bead889413..a9ae63fa7358 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -25,11 +25,11 @@
#
#*************************************************************************
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+.IF ("$(OS)"!="WNT" || "$(COM)"=="GCC")
# workaround for MinGW to get the same DLL names as with MSC
# e.g., uno_salhelper3gcc3.dll (vs. uno_salhelpergcc3.dll)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
COMID_WITH_VERSION = $(UDK_MAJOR)$(COMID)
.ELSE
COMID_WITH_VERSION = $(COMID)
@@ -40,7 +40,7 @@ COMID_WITH_VERSION = $(COMID)
#
AWTLIB*=-ljawt
AVMEDIALIB=-lavmedia$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
+.IF "$(OS)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
@@ -75,11 +75,11 @@ OPENSSLLIB=$(OPENSSL_LIBS)
OPENSSLLIBST=$(STATIC) $(OPENSSL_LIBS) $(DYNAMIC)
.ELSE # "$(SYSTEM_OPENSSL)" == "YES
OPENSSLLIB=-lssl -lcrypto
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
OPENSSLLIBST=-lssl_static -lcrypto_static
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)$(COM)"=="WNTGCC"
OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
.ENDIF # "$(SYSTEM_OPENSSL)" == "YES"
REGLIB=-lreg
XMLOFFLIB=-lxo$(DLLPOSTFIX)
@@ -89,11 +89,11 @@ SALLIB=-luno_sal
ODBCLIB=-lodbc$(DLLPOSTFIX)
ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
DBFILELIB=-lfile$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
RMCXTLIB=-lrmcxt$(UDK_MAJOR)
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)$(COM)"=="WNTGCC"
RMCXTLIB=-lrmcxt
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
BTSTRPLIB=-lbtstrp
BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX)
TRANSEXLIB=-ltransex
@@ -101,17 +101,17 @@ OTXLIB=-lotx_ind
OSXLIB=-losx
UNOTOOLSLIB=-lutl$(DLLPOSTFIX)
SOTLIB=-lsot$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
MOZBASELIBST=$(STATIC) -lnspr4_s -lxpcombase_s
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)$(COM)"=="WNTGCC"
MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC)
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
MOZBASELIB=-lnspr4 -lxpcom
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
LDAPSDKLIB=-lwldap32
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)$(COM)"=="WNTGCC"
LDAPSDKLIB=-lldap
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
ICOLIB=-lico$(DLLPOSTFIX)
VCLLIB=-lvcl$(DLLPOSTFIX)
@@ -145,10 +145,10 @@ NSS3LIB=-lnss3
NSPR4LIB=-lnspr4
PLC4LIB=-lplc4
NSSCRYPTOLIBS=$(XMLSECLIB-NSS) $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
XMLSECLIB-MS=-lxmlsec1-mscrypto
MSCRYPTOLIBS=$(XMLSECLIB) $(XMLSECLIB-MS) $(LIBXML2LIB) $(CRYPT32LIB) $(ADVAPI32LIB)
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
BROOKERLIB=-lbrooker$(DLLPOSTFIX)
SIMPLECMLIB=-lsimplecm$(DLLPOSTFIX)
COMMUNILIB=-lcommuni$(DLLPOSTFIX)
@@ -317,7 +317,7 @@ CURLLIB+=$(ZLIB3RDLIB)
.ENDIF
-.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+.ELSE # ("$(OS)"!="WNT" || "$(COM)"=="GCC")
AWTLIB*=jawt.lib
AVMEDIALIB=iavmedia.lib
@@ -464,4 +464,4 @@ TESTLIB=itest.lib
UNOTESTLIB=iunotest.lib
XMLREADERLIB=ixmlreader.lib
-.ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+.ENDIF # ("$(OS)"!="WNT" || "$(COM)"=="GCC")
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 4b285b171a34..a930d31ba035 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -34,7 +34,7 @@
$(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx
@echo "Making: " $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -48,7 +48,7 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx
$(OBJ)/$(SECOND_BUILD)_%.obj : %.c
@echo "Making: " $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
.ELSE
@@ -76,7 +76,7 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.c
$(SLO)/$(SECOND_BUILD)_%.obj : %.cxx
@echo "Making: " $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -94,7 +94,7 @@ $(SLO)/$(SECOND_BUILD)_%.obj : %.cxx
$(SLO)/$(SECOND_BUILD)_%.obj : %.c
@echo "Making: " $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -125,7 +125,7 @@ ALLPARFILES=$(uniq $(ULFPARFILES) $(MOREPARFILES))
SCP_PRODUCT_TYPE*=FAT
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
LANGFILEEXT=mlf
.ELSE
LANGFILEEXT=jlf
@@ -134,7 +134,7 @@ LANGFILEEXT=jlf
$(PAR)/%.par :
@echo "Making: " $@
@@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(CROSS_COMPILING)" == "NO"
$(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
.ELSE
@@ -142,7 +142,7 @@ $(PAR)/%.par :
.ENDIF
.ENDIF
# YD: INCLUDE macro too long, include only few items (scp2 compile)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
.ENDIF
$(COMMAND_ECHO)$(SCPCOMP) -l {$(MISC)/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 69a40b33896f..6dfa30471e10 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -29,7 +29,7 @@ MKFILENAME:=RULES.MK
$(OBJ)/%.obj : %.cxx
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -53,7 +53,7 @@ $(OBJ)/%.obj : %.cxx
$(OBJ)/%.obj : %.cpp
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -75,7 +75,7 @@ $(OBJ)/%.obj : %.cpp
$(OBJ)/%.obj : %.cc
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -93,7 +93,7 @@ $(OBJ)/%.obj : %.cc
$(SLO)/%.obj : %.cxx
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx
.ELSE
@@ -104,14 +104,14 @@ $(SLO)/%.obj : %.cxx
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $@
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.ELSE
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.IF "$(nodep)"==""
# fixme: write to file
$(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
@@ -120,7 +120,7 @@ $(SLO)/%.obj : %.cxx
$(SLO)/%.obj : %.cpp
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp
.ELSE
@@ -146,7 +146,7 @@ $(SLO)/%.obj : %.cpp
$(SLO)/%.obj : $(MISC)/%.cxx
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx
.ELSE
@@ -171,7 +171,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx
$(SLO)/%.obj : $(MISC)/%.cc
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc
.ELSE
@@ -188,7 +188,7 @@ $(SLO)/%.obj : $(MISC)/%.cc
$(OBJ)/%.obj : $(MISC)/%.cxx
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx
.ELSE
@@ -213,7 +213,7 @@ $(OBJ)/%.obj : $(MISC)/%.cxx
$(OBJ)/%.obj : %.c
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
.ELSE
@@ -243,7 +243,7 @@ $(OBJ)/%.obj : %.c
$(OBJ)/%.obj : $(MISC)/%.c
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -265,7 +265,7 @@ $(OBJ)/%.obj : $(MISC)/%.c
$(SLO)/%.obj : $(MISC)/%.c
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -288,7 +288,7 @@ $(SLO)/%.obj : $(MISC)/%.c
$(SLO)/%.obj : %.c
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"==""
@@ -474,20 +474,20 @@ $(MISC)/o_%.dpcc : %.m
$(MISC)/s_%.dpcc : $(MISC)/%.m
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
@echo $@ : $(SLO)/$(<:b).obj >> $@
$(MISC)/o_%.dpcc : $(MISC)/%.m
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
@echo $@ : $(OBJ)/$(<:b).obj >> $@
# dependency dummy for *.s files
@@ -545,13 +545,13 @@ $(MISC)/%.dpz :
$(MISC)/%.dpj :
@echo "Making: " $(@:f)
.IF "$(nodep)"!=""
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo > $@
.ELSE
@$(ECHONL) > $@
.ENDIF
.ELSE # "$(ndep)"==""
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(shell @$(STARDEP) @$(mktmp -o $@ -i $(CLASSDIR) $(foreach,i,$(JAVADEPINCLUDES:s/:/ /) -i $i) $(JAVACLASSFILES)))
.ELSE
@echo javadeps
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c9bd34499624..967d417e642b 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -270,7 +270,7 @@ ZIPDEP:="zipdep.pl"
# ---------------------------------------------------------------------------
DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
-.IF "$(GUI_FOR_BUILD)"=="WNT"
+.IF "$(OS_FOR_BUILD)"=="WNT"
posix_PWD:=/cygdrive/$(PWD:s/://)
.ELSE
posix_PWD:=$(PWD)
@@ -531,12 +531,12 @@ ROUT=$(OUTPATH).tt
.ENDIF
.IF "$(PRJ)"!="."
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
PATH_IN_MODULE:=\
$(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))/, $(PWD))
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD))
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ELSE # "$(PRJ)"!="."
PATH_IN_MODULE:=
.ENDIF # "$(PRJ)"!="."
@@ -636,19 +636,19 @@ PROCESSOUT*:=$(MISC)
# Makros fuer die Librarynamen des Solar
.INCLUDE : libs.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
VERSIONOBJ=$(SLO)/_version.obj
.ENDIF
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
VERSIONOBJ=$(SLO)/_version.o
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
WINVERSIONNAMES=$(UNIXVERSIONNAMES)
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32
.ELSE
@@ -764,7 +764,7 @@ LIB:=$(LB);$(SLB);$(ILIB)
.ENDIF
# extend library path for MinGW Compiler
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
LIB:=$(LB);$(BIN);$(ILIB)
.ENDIF
@@ -913,11 +913,11 @@ LNT=$(DEVROOT)/lint/lint
LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u
LNTFLAGSOUTOBJ=-os
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.INCLUDE : wnt.mk
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
.INCLUDE : unx.mk
.ENDIF
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 8f20e72d8e43..43e7f6a1740c 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -194,11 +194,11 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i)
DEPIDLFILES:=$(IDLFILES)
.ENDIF # "$(EXTERNIDLFILES)"!=""
.ELSE # "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i) $i $(shell @($(FIND) $(IDLDIRS) -name $(i:f)) | $(SED) s/\//\\/g )))
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) $i $(shell @$(FIND) $(IDLDIRS) -name $(i:f) -print ) ))
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
.ENDIF # "$(IDLFILES)"!=""
@@ -408,7 +408,7 @@ ZIPALL=ZIPALLTARGET
.IF "$(APP1TARGET)"!=""
APP1TARGETN=$(BIN)/$(APP1TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP1BASE)"==""
APP1BASE=$(BASE)
.ENDIF
@@ -420,7 +420,7 @@ APP1BASEX=/BASE:$(APP1BASE)
.IF "$(APP2TARGET)"!=""
APP2TARGETN=$(BIN)/$(APP2TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP2BASE)"==""
APP2BASE=$(BASE)
.ENDIF
@@ -432,7 +432,7 @@ APP2BASEX=/BASE:$(APP2BASE)
.IF "$(APP3TARGET)"!=""
APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP3BASE)"==""
APP3BASE=$(BASE)
.ENDIF
@@ -444,7 +444,7 @@ APP3BASEX=/BASE:$(APP3BASE)
.IF "$(APP4TARGET)"!=""
APP4TARGETN=$(BIN)/$(APP4TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP4BASE)"==""
APP4BASE=$(BASE)
.ENDIF
@@ -456,7 +456,7 @@ APP4BASEX=/BASE:$(APP4BASE)
.IF "$(APP5TARGET)"!=""
APP5TARGETN=$(BIN)/$(APP5TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP5BASE)"==""
APP5BASE=$(BASE)
.ENDIF
@@ -468,7 +468,7 @@ APP5BASEX=/BASE:$(APP5BASE)
.IF "$(APP6TARGET)"!=""
APP6TARGETN=$(BIN)/$(APP6TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP6BASE)"==""
APP6BASE=$(BASE)
.ENDIF
@@ -480,7 +480,7 @@ APP6BASEX=/BASE:$(APP6BASE)
.IF "$(APP7TARGET)"!=""
APP7TARGETN=$(BIN)/$(APP7TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP7BASE)"==""
APP7BASE=$(BASE)
.ENDIF
@@ -492,7 +492,7 @@ APP7BASEX=/BASE:$(APP7BASE)
.IF "$(APP8TARGET)"!=""
APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP8BASE)"==""
APP8BASE=$(BASE)
.ENDIF
@@ -504,7 +504,7 @@ APP8BASEX=/BASE:$(APP8BASE)
.IF "$(APP9TARGET)"!=""
APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP9BASE)"==""
APP9BASE=$(BASE)
.ENDIF
@@ -520,7 +520,7 @@ SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL1DLLPRE*=$(DLLPRE)
SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL1BASE)"==""
SHL1BASE=$(BASE)
.ENDIF
@@ -536,7 +536,7 @@ SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL2DLLPRE*=$(DLLPRE)
SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL2BASE)"==""
SHL2BASE=$(BASE)
.ENDIF
@@ -552,7 +552,7 @@ SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL3DLLPRE*=$(DLLPRE)
SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL3BASE)"==""
SHL3BASE=$(BASE)
.ENDIF
@@ -568,7 +568,7 @@ SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL4DLLPRE*=$(DLLPRE)
SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL4BASE)"==""
SHL4BASE=$(BASE)
.ENDIF
@@ -584,7 +584,7 @@ SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL5DLLPRE*=$(DLLPRE)
SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL5BASE)"==""
SHL5BASE=$(BASE)
.ENDIF
@@ -600,7 +600,7 @@ SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL6DLLPRE*=$(DLLPRE)
SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL6BASE)"==""
SHL6BASE=$(BASE)
.ENDIF
@@ -616,7 +616,7 @@ SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL7DLLPRE*=$(DLLPRE)
SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL7BASE)"==""
SHL7BASE=$(BASE)
.ENDIF
@@ -632,7 +632,7 @@ SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL8DLLPRE*=$(DLLPRE)
SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL8BASE)"==""
SHL8BASE=$(BASE)
.ENDIF
@@ -648,7 +648,7 @@ SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
SHL9DLLPRE*=$(DLLPRE)
SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
.IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL9BASE)"==""
SHL9BASE=$(BASE)
.ENDIF
@@ -708,7 +708,7 @@ LIB8TARGETN=$(LIB8TARGET)
LIB9TARGETN=$(LIB9TARGET)
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"!="GCC"
LIB1ARCHIV=
LIB2ARCHIV=
@@ -720,7 +720,7 @@ LIB7ARCHIV=
LIB8ARCHIV=
LIB9ARCHIV=
.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.IF "$(RESLIB1NAME)" != ""
.IF "$(RESLIB1NOVERSION)"==""
@@ -867,9 +867,9 @@ SDI5TARGET=$(MISC)/$(SDI5NAME).don
.ENDIF
.IF "$(UNIXTEXT)"!=""
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
CONVERTUNIXTEXT:=$(UNIXTEXT)
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(UNIXTEXT)"!=""
.IF "$(EXTUPDATEINFO_NAME)"!=""
@@ -1618,7 +1618,7 @@ ALLTAR : forcedeps
@$(TOUCH) $(TMP)/makedt.don
killbin:
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
@$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI)
@$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI)
@$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI)
@@ -1638,7 +1638,7 @@ killbin:
@$(IFEXIST) $(BIN)/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP8TARGET)$(EXECPOST) $(FI)
@$(IFEXIST) $(BIN)/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP9TARGET)$(EXECPOST) $(FI)
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
.IF "$(SHL1TARGET)"!=""
@-$(RM) $(LB)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
.ENDIF
@@ -1693,7 +1693,7 @@ killbin:
.IF "$(APP9TARGET)"!=""
@-$(RM) $(BIN)/$(APP9TARGET)$(EXECPOST)
.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
killobj:
.IF "$(SLOFILES)" != ""
@@ -1911,17 +1911,17 @@ $(SUBDIRS) .PHONY :
.ELSE # "$(mk_tmp)"!=""
#.IF "$(PRJNAME)"!="sw"
-.IF "$(GUI)"!="UNX"
+.IF "$(OS)"=="WNT"
$(SUBDIRS) .PHONY :
@[
cd $@
cd
@$(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
]
-.ELSE # "$(GUI)"!="UNX"
+.ELSE # "$(OS)"=="WNT"
$(SUBDIRS) .PHONY :
cd $@; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
#.ENDIF
.ENDIF # "$(mk_tmp)"!=""
.ENDIF # "$(SUBDIRS)"!=""
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 3e81367f9be4..3f1e11403e49 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -65,14 +65,14 @@ APP$(TNR)STDLIB+= -lvclmain
.ENDIF
.ENDIF
-.IF "$(GUI)$(COM)" == "WNTGCC"
+.IF "$(OS)$(COM)" == "WNTGCC"
APP$(TNR)RESO=
.IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
APP$(TNR)RESO=$(MISC)/$(APP$(TNR)TARGET:b)_res.o
.ENDIF
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
APP$(TNR)DEPN+:=$(APP$(TNR)DEPNU)
USE_APP$(TNR)DEF=
.ENDIF
@@ -84,7 +84,7 @@ APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\"
.ENDIF # "$(APP$(TNR)PRODUCTNAME)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(APP$(TNR)LIBS)"!=""
$(MISC)/$(APP$(TNR)TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -103,7 +103,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
$(APP$(TNR)RES) \
$(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@@ -143,7 +143,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
@@-$(MKDIR) $(@:d:d)
.IF "$(APP$(TNR)LINKRES)" != ""
@@-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc
@@ -231,7 +231,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
$(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
.ENDIF # "$(TARGET)" == "setup"
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
.ENDIF # "$(APP$(TNR)TARGETN)"!=""
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index bd3e7bbd9413..93cade4c3628 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -28,7 +28,7 @@
PACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
XSLTPACKAGEDIR*:=$(subst,.,/ $(PACKAGE))
XCSROOTURL!:=$(ABSXCSROOT)
-.IF $(GUI)==WNT
+.IF $(OS)==WNT
XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL))
.ENDIF
SYSXSLDIR*:=$(XSLDIR)/
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 0e677e681493..0e984cfad91c 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -42,7 +42,7 @@ DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib)
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
.IF "$(DEF$(TNR)EXPORTFILE)"==""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF$(TNR)EXPORTFILE=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp
.IF "$(COM)"=="GCC"
$(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
@@ -63,12 +63,12 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
$(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
.ENDIF # .IF "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(DEF$(TNR)EXPORTFILE)"==""
.ENDIF # "$(SHL$(TNR)VERSIONMAP)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt
@@ -184,9 +184,9 @@ $(DEF$(TNR)TARGETN) .PHONY :
.ENDIF
$(COMMAND_ECHO)-$(RM) $@
$(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(DEF$(TNR)TARGETN): \
$(DEF$(TNR)DEPN) \
$(DEF$(TNR)EXPORTFILE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index ee09295df42f..a5cfd3f812fb 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -28,22 +28,22 @@
.EXPORT : CC CXX
# setup INCLUDE variable for use by VC++
-.IF "$(GUI)$(COM)"=="WNTMSC"
+.IF "$(OS)$(COM)"=="WNTMSC"
INCLUDE!:=. $(SOLARINC)
INCLUDE!:=$(INCLUDE:s/ -I/;/)
.EXPORT : INCLUDE
-.ENDIF # "$(GUI)$(COM)"=="WNTMSC"
+.ENDIF # "$(OS)$(COM)"=="WNTMSC"
.IF "$(OS)"=="MACOSX"
LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
.EXPORT : LDFLAGS
.ENDIF
-.IF "$(GUI_FOR_BUILD)"=="WNT"
+.IF "$(OS_FOR_BUILD)"=="WNT"
PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH)
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.EXPORT : PATH
#override
@@ -105,31 +105,31 @@ clean:
$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.xz
@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@noop $(assign UNPACKCMD := sh -c "xz -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.xz $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@noop $(assign UNPACKCMD := xz -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.xz $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ")
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - )
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
@@ -187,11 +187,11 @@ $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE
#add new files to patch and remove files from patch
$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy")
$(RM) $(foreach,i,$(REMOVE_FILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
@$(TOUCH) $@
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@$(TOUCH) $@
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
#patch
$(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
@@ -199,17 +199,17 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
@echo no patch needed...
$(COMMAND_ECHO)$(TOUCH) $@
.ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
-.IF "$(GUI_FOR_BUILD)"=="WNT"
+.IF "$(OS_FOR_BUILD)"=="WNT"
$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
$(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
.IF "$(T_ADDITIONAL_FILES)"!=""
-.IF "$(GUI_FOR_BUILD)"=="WNT"
+.IF "$(OS_FOR_BUILD)"=="WNT"
# Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds
$(DELAY) 2
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
$(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
.ENDIF # "$(T_ADDITIONAL_FILES)"!=""
@@ -285,19 +285,19 @@ $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
.IF "$(OS)"=="MACOSX"
$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app \
$(EXTRPATH) $(shell ls $(foreach,j,$(OUT2BIN) $(BIN)/$(j:f)))
-.ELIF "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
+.ELIF "$(OS)$(COM)$(COMEX)"=="WNTMSC12"
@noop $(foreach,j,$(foreach,k,$(OUT2BIN) \
$(shell -ls -1 $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$k | $(GREP) .dll)) \
$(shell @$(IFEXIST) $(j).manifest $(THEN) mt.exe \
-manifest $(j).manifest -outputresource:$(BIN)/$(j:f)$(EMQ);2 $(FI)))
-.ENDIF # "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
+.ENDIF # "$(OS)$(COM)$(COMEX)"=="WNTMSC12"
.ENDIF # "$(OUT2BIN)"!=""
.IF "$(OUT2BIN_NONE)"!=""
$(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2BIN_NONE) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(BIN)
.IF "$(OS)"=="MACOSX"
$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app \
NONE $(shell ls $(foreach,j,$(OUT2BIN_NONE) $(BIN)/$(j:f)))
-.ELIF "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
+.ELIF "$(OS)$(COM)$(COMEX)"=="WNTMSC12"
@noop $(foreach,j,$(foreach,k,$(OUT2BIN_NONE) \
$(shell -ls -1 $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$k | $(GREP) .dll)) \
$(shell @$(IFEXIST) $(j).manifest $(THEN) mt.exe \
@@ -321,7 +321,7 @@ $(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
.IF "$(CONVERTFILES)"!=""
$(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
.ENDIF # "$(CONVERTFILES)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
# hack to make 4nt version 4,01 work and still get propper
# errorcodes for versions < 3,00
#.IF "$(my4ver:s/.//:s/,//)" >= "300"
@@ -329,16 +329,16 @@ $(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack
#.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
$(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2
#.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300"
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
$(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.IF "$(CONVERTFILES)"!=""
$(COMMAND_ECHO)$(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
.ENDIF # "$(CONVERTFILES)"!=""
.ENDIF # "$(PATCH_FILES)"!="none" && "$(PATCH_FILES)"!="
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
$(COMMAND_ECHO)$(TOUCH) $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.IF "$(T_ADDITIONAL_FILES)"!=""
$(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 989395018f4b..2102ecd6633e 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -32,13 +32,13 @@ $(CLASSDIR)/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)
$(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY:
@echo "Making: " $(@:f)
@-$(MKDIRHIER) $(MISC)/java/com/sun/star/upd
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo package com.sun.star.upd\; > $@
@echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";}' >> $@
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@echo package com.sun.star.upd; > $@
@echo public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";} >> $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.IF "$(JAVATARGET)"!=""
.IF "$(PACKAGE)"!=""
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index a93d6ad5602c..53005a20b8f1 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -35,7 +35,7 @@
$(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
@echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
.IF "$(OS)$(COM)"=="NETBSDGCC"
@@ -48,8 +48,8 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
@cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
.ENDIF
@+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)$(COM)"=="WNTGCC"
@+-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
@+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
@+echo $(RANLIB) $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
@@ -59,8 +59,8 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
@+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
.ELSE
@echo just a dummy > $@
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)$(COM)"=="WNTGCC"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB$(TNR)ARCHIV)" != ""
@@ -75,7 +75,7 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
.ENDIF
@echo "Making: " $(@:f)
@@-$(RM) $@
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
@cat /dev/null $(LIB$(TNR)FILES:s/.obj/.o/) | xargs -n 1 >> $@
@$(RM) $(@:d)$(@:b).dump
@@ -85,8 +85,8 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
@nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)"!="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
@+cat /dev/null $(LIB$(TNR)FILES) | xargs -n1 >> $@
@@ -101,14 +101,14 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
.ENDIF # "$(LIB$(TNR)FILES)"!=""
@$(ECHONL)
.ENDIF # "$(LIB$(TNR)FILES)"!=""
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@-$(RM) $@
.IF "$(VERBOSE)" == "TRUE"
@echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
.ENDIF
$(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(LIB$(TNR)TARGET)" != ""
# Anweisungen fuer das LIBTARGETs
diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk
index 5f169c669c94..5f90058a022b 100644
--- a/solenv/inc/tg_moz.mk
+++ b/solenv/inc/tg_moz.mk
@@ -42,7 +42,7 @@ $(MISC)/%.xpt : %.idl
.INCLUDE : target.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CPUCFG=_winnt.cfg
.ENDIF
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
index 73fae59d6762..1c3a87ed20fd 100644
--- a/solenv/inc/tg_obj.mk
+++ b/solenv/inc/tg_obj.mk
@@ -31,7 +31,7 @@ MKFILENAME:=TG_OBJ.MK
$(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
$(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i)) > $@
.ELSE # "$(COM)"=="GCC"
@@ -40,15 +40,15 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
.ENDIF # "$(LIBTARGET)"!="NO"
$(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.IF "$(OS)"!="WNT"
@echo $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 > $@
.IF "$(OS)"=="MACOSX"
@-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ELSE
@nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(OBJTARGET)"!=""
@@ -57,7 +57,7 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
$($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
# $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)
$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i)) > $@
@@ -67,9 +67,9 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
.ENDIF # "$(LIBTARGET)"!="NO"
$(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
.ENDIF
-.ENDIF # "$(GUI)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"=="WNT"
+.IF "$(OS)"!="WNT"
@echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 >> $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$($(SECOND_BUILD)OBJTARGET)"!=""
.ENDIF # "$(SECOND_BUILD)"!=""
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 71a88b2347dc..4f060a0f132d 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -54,11 +54,11 @@ $(RESLIB$(TNR)TARGETN): \
$(RESLIB$(TNR)SRSFILES) \
$(RESLIB$(TNR)BMPS)
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI$(TNR))
-.ELSE # "$(GUI)"=="UNX"
+.ELSE # "$(OS)"!="WNT"
@@-$(RM) $(RSC_MULTI$(TNR))
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(RESLIB$(TNR)TARGETN)"!=""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index b7f24f23f319..d703b0585715 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -71,11 +71,11 @@ EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH)
.IF "$(VERSIONOBJ)"!=""
SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
USE_VERSIONH:=$(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
-.ELSE # "$(GUI)" == "UNX"
+.ELSE # "$(OS)" != "WNT"
SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
$(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
# $(COPY) $(SOLARENV)/src/version.c $@
$(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
@@ -84,8 +84,8 @@ $(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(
.ENDIF # "$(VERSIONOBJ)"!=""
.ENDIF
-.IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL$(TNR)IMPLIB)" == ""
SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR)
.ENDIF # "$(SHL$(TNR)IMPLIB)" == ""
@@ -103,9 +103,9 @@ ALLTAR : $(SHL$(TNR)IMPLIBN)
USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
-.ENDIF # "$(GUI)" == "WNT"
+.ENDIF # "$(OS)" == "WNT"
USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
-.ELSE # "$(GUI)" != "UNX"
+.ELSE # "$(OS)" == "WNT"
USE_SHL$(TNR)DEF=
SHL$(TNR)DEPN+:=$(SHL$(TNR)DEPNU)
@@ -214,13 +214,13 @@ $(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP)
.ENDIF # .IF "$(OS)"=="MACOSX"
.ENDIF # "$(SHL$(TNR)VERSIONMAP)"!=""
.ENDIF # "$(USE_SHL$(TNR)VERSIONMAP)"!=""
-.ENDIF # "$(GUI)" != "UNX"
+.ENDIF # "$(OS)" == "WNT"
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
-.ENDIF # "$(GUI)"!="UNX"
+.ENDIF # "$(OS)"=="WNT"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -240,7 +240,7 @@ SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
#.IF "$(SHL$(TNR)TARGETN)"!=""
.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(SHL$(TNR)LIBS)"!=""
$(MISC)/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY:
@@-$(RM) $@
@@ -270,7 +270,7 @@ $(SHL$(TNR)TARGETN) : \
$(SHL$(TNR)RES)\
$(SHL$(TNR)DEPN)
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(SHL$(TNR)DEFAULTRES)"!=""
@@-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
.IF "$(SHL$(TNR)ICON)" != ""
@@ -452,8 +452,8 @@ $(SHL$(TNR)TARGETN) : \
$(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
.ENDIF # "$(linkinc)"==""
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)" == "WNT"
-.IF "$(GUI)"=="UNX"
+.ENDIF # "$(OS)" == "WNT"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="MACOSX"
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@@ -508,7 +508,7 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(VERBOSE)" == "TRUE"
@ls -l $@
.ENDIF
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)" != "WNT"
.ENDIF # "$(SHL$(TNR)TARGETN)"!=""
@@ -529,8 +529,8 @@ USELIB$(TNR)DEPN+=$(SHL$(TNR)LIBS)
USE_SHL$(TNR)TARGET=$(SHL$(TNR)TARGETN)
.ENDIF
-.IF "$(GUI)$(COM)" != "WNTGCC"
-.IF "$(GUI)" != "UNX"
+.IF "$(OS)$(COM)" != "WNTGCC"
+.IF "$(OS)" == "WNT"
$(SHL$(TNR)IMPLIBN): \
$(SHL$(TNR)DEF) \
$(USE_SHL$(TNR)TARGET) \
@@ -541,7 +541,7 @@ $(SHL$(TNR)IMPLIBN): \
$(SHL$(TNR)LIBS)
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
$(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
index 4195ffda1c1d..d76a2d552c7b 100644
--- a/solenv/inc/tg_slo.mk
+++ b/solenv/inc/tg_slo.mk
@@ -36,7 +36,7 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
.ENDIF
@echo "Making: " $(@:f)
# @$(RM) $@
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@
.ELSE
@@ -45,16 +45,16 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
.ENDIF # "$(LIBTARGET)"!="NO"
$(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
.IF "$(OS)"=="MACOSX"
@-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ELSE
@nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
.ENDIF
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(SLOTARGET)"!=""
.IF "$(SECOND_BUILD)"!=""
@@ -65,7 +65,7 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
@echo $(&:+"\n")
.ENDIF
@echo "Making: " $(@:f)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@
.ELSE
@@ -75,10 +75,10 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
$(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
.ENDIF # "$(COM)"=="GCC"
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
@echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$($(SECOND_BUILD)SLOTARGET)"!=""
.ENDIF # "$(SECOND_BUILD)"!=""
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index b7283382c65e..86b3e7eaa5b2 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -28,7 +28,7 @@
#######################################################
# unroll begin
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
command_seperator=&&
#command_seperator=^
.ELSE
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index bbd51bf325a1..5b7ed0a6f35a 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -82,7 +82,7 @@ PIPEERROR=2>&1 |
CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then exit $$ret ; fi && echo "Nothing to update for zip"
# Platform specific
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
AWK*=awk
SORT*=sort
SED*=sed
@@ -111,7 +111,7 @@ TOUCH*=touch
TYPE*=cat
DUMPBIN*=dumpbin
-.ELIF "$(GUI)"=="UNX" # "$(GUI)"=="WNT"
+.ELIF "$(OS)"!="WNT" # "$(OS)"=="WNT"
SED*=sed
SORT*=sort
PERL*=perl
@@ -162,7 +162,7 @@ FIND=find
LS=ls
ECHON=echo -n
ECHONL=echo
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(OS)"!="WNT"
# (Global) Set if not set before
DELAY*=sleep
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 77bfae6e3321..2773cc34450a 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -26,7 +26,7 @@
#*************************************************************************
# --- Unix-Environment ---------------------------------------
-# Used if "$(GUI)" == "UNX"
+# Used if "$(OS)" != "WNT"
# Dieses Define gilt fuer alle WNT- Plattformen
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index dd3e0c8ce6f7..42e416c7ff80 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -26,7 +26,7 @@
#*************************************************************************
# --- Windows-NT-Environment ---------------------------------------
-# Used if "$(GUI)" == "WNT"
+# Used if "$(OS)" == "WNT"
# --- Compiler ---
diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk
index 93f2aac81cc5..12b1d81e9e64 100644
--- a/soltools/Module_soltools.mk
+++ b/soltools/Module_soltools.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,soltools,\
Executable_makedepend \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,soltools,\
Executable_checkdll \
))
@@ -30,7 +30,7 @@ endif # SOLARISC52
endif # CROSS_COMPILING
-ifeq ($(GUI)$(COM),WNTMSC)
+ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Module_add_targets,soltools,\
Executable_ldump4 \
Package_inc \
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk
index 7b127215cfd7..97c5950a3568 100644
--- a/stoc/test/makefile.mk
+++ b/stoc/test/makefile.mk
@@ -85,10 +85,10 @@ APP3STDLIBS= \
$(REGLIB) \
$(SALLIB)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
APP3STDLIBS+= -l$(SHL1TARGET)
.ENDIF
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
APP3STDLIBS+= i$(SHL1TARGET).lib
.ENDIF
@@ -187,7 +187,7 @@ TESTPROXYFAC:=com.sun.star.reflection.XProxyFactory
TESTSECURITY:=com.sun.star.security.AllPermission;com.sun.star.security.XPolicy;com.sun.star.security.XAccessController;com.sun.star.io.FilePermission;com.sun.star.connection.SocketPermission;com.sun.star.uno.XCurrentContext
$(BIN)$/test1.rdb: $(SHL1TARGETN)
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
cp $(SHL1TARGETN) $(BIN)
.ENDIF
cd $(BIN) && regcomp -register -r test1.rdb -c $(SHL1TARGET)
diff --git a/stoc/test/security/makefile.mk b/stoc/test/security/makefile.mk
index 64c12633d729..c71f91bac5e9 100644
--- a/stoc/test/security/makefile.mk
+++ b/stoc/test/security/makefile.mk
@@ -37,7 +37,7 @@ APP1STDLIBS= \
$(SALHELPERLIB) \
$(SALLIB)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
APP1STDLIBS+=
# $(LIBCIMT) $(LIBCMT)
.ENDIF
diff --git a/store/workben/makefile.mk b/store/workben/makefile.mk
index f26276eca5e9..8805c8e15acb 100644
--- a/store/workben/makefile.mk
+++ b/store/workben/makefile.mk
@@ -30,10 +30,10 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : settings.mk
.IF "$(STORELIB)" == ""
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
STORELIB= -lstore
.ELSE # unx
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
STORELIB= -lstore$(UDK_MAJOR)
.ELSE
STORELIB= $(LB)$/istore.lib
@@ -41,10 +41,10 @@ STORELIB= $(LB)$/istore.lib
.ENDIF # unx
.ENDIF # storelib
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
STOREDBGLIB= $(LB)$/libstoredbg.a
.ELSE # unx
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(OS)$(COM)"=="WNTGCC"
STOREDBGLIB= $(LB)$/libstoredbg.a
.ELSE
STOREDBGLIB= $(LB)$/storedbg.lib
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index 8f19199517d5..010593fbbcbc 100644
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \
$(gb_UWINAPI) \
))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,svl_lngmisc, \
oleaut32 \
))
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index 27543a741580..70871fb2ae14 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Module_add_targets,svtools,\
Executable_g2g \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,svtools,\
Executable_langsupport \
))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index db244aa66eee..f59a724cd6dd 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/pr
#BOOST switch in customshapes
#dialog:
-#.IF "$(GUI)"=="WNT"
+#.IF "$(OS)"=="WNT"
#CFLAGS+= -DUNICODE -D_UNICODE
#.ENDIF
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 4614e8bc6a50..21c919adb278 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -132,10 +132,10 @@ ICONDEPN = \
.INCLUDE : target.mk
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag
-.ENDIF # "$(GUI)"=="UNIX"
+.ENDIF # "$(OS)"!="WNT"
#
# Copy/patch the .desktop files to the output tree and
diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl
index da4104b29a95..9daf2625829d 100644
--- a/sysui/util/checksize.pl
+++ b/sysui/util/checksize.pl
@@ -70,7 +70,7 @@ sub check #04.02.2005 13:40
my $file = shift;
print "$path$file\n" if ((-e "$path$file") && $is_debug);
# don't check dpc,flag,rpmflag,sdf [obj for UNX] files, or etc subdirectory
- return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{GUI} eq 'UNX') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($file =~ /.+sdf/) );
+ return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{OS} ne 'WNT') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($file =~ /.+sdf/) );
if ( -z "$path$file" ) {
print "Error: $path$file 0 Bytes!\n";
$err++;
diff --git a/testtools/qa/cli/makefile.mk b/testtools/qa/cli/makefile.mk
index 1b56ff7ed301..13ee0bb96380 100644
--- a/testtools/qa/cli/makefile.mk
+++ b/testtools/qa/cli/makefile.mk
@@ -67,7 +67,7 @@ CT_NOOFFICE = -NoOffice
# --- Targets ------------------------------------------------------
RUN:
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
java -cp $(CLASSPATH) -Dcli_test=$(EXETARGET) -Dcli_test_arg=$(EXEARG) $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
.ENDIF
run: RUN
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index 46b708e1d0d6..5dbd0038f009 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -48,22 +48,22 @@ PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
.ELSE # "$(SYSTEM_PYTHON)"!="YES"
PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python
.ENDIF # "$(SYSTEM_PYTHON)"!="YES"
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
PYTHONPATH:=$(SOLARLIBDIR)$/pyuno;$(PWD);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
PYTHONPATH:=$(SOLARLIBDIR)$/pyuno:$(PWD):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
-.ENDIF # "$(GUI)"=="WNT"
+.ENDIF # "$(OS)"=="WNT"
.EXPORT: PYTHONPATH
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
TEST_ENV=export FOO=file://$(shell @pwd)$/$(DLLDEST) \
UNO_TYPES=uno_types.rdb UNO_SERVICES=pyuno_services.rdb
-.ELSE # "$(GUI)" != "WNT"
+.ELSE # "$(OS)" != "WNT"
# aaaaaa, how to get the current working directory on windows ???
CWD_TMP=$(strip $(shell @echo "import os;print os.getcwd()" | $(PYTHON)))
TEST_ENV=export FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) && \
export UNO_TYPES=uno_types.rdb && export UNO_SERVICES=pyuno_services.rdb
-.ENDIF # "$(GUI)"!="WNT"
+.ENDIF # "$(OS)"!="WNT"
PYFILES = \
$(DLLDEST)$/core.py \
$(DLLDEST)$/importer.py \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index cd8afecf5b73..ae274e32aa50 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -96,7 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/zcodec/zcodec \
))
-ifeq ($(GUI),UNX)
+ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,tl,\
tools/unx/source/dll/toolsdll \
))
diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk
index fc30c5912fab..447591b2ceac 100644
--- a/ucb/workben/ucb/makefile.mk
+++ b/ucb/workben/ucb/makefile.mk
@@ -45,11 +45,11 @@ APP1OBJS=\
.IF "$(COMPHELPERLIB)"==""
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
COMPHELPERLIB=-licomphelp2
.ENDIF # unx
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
COMPHELPERLIB=icomphelp2.lib
.ENDIF # wnt
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk
index fd64fcae04d8..534906075644 100644
--- a/writerfilter/qa/cppunittests/odiapi/makefile.mk
+++ b/writerfilter/qa/cppunittests/odiapi/makefile.mk
@@ -36,9 +36,9 @@ SHL1OBJS=\
SHL1TARGET=$(TARGET)
SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
SHL1STDLIBS+= $(LB)$/iodiapi.lib
-.ELIF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX"
+.ELIF "$(OS)"!="WNT" && "$(OS)"!="MACOSX"
SHL1STDLIBS+=$(LB)$/libodiapi.so
.ELIF "$(OS)"=="MACOSX"
SHL1STDLIBS+=$(LB)$/libodiapi.dylib
diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk
index 4b35c121b09c..82fe397f773f 100644
--- a/writerfilter/qa/cppunittests/qname/makefile.mk
+++ b/writerfilter/qa/cppunittests/qname/makefile.mk
@@ -31,7 +31,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
# BEGIN ----------------------------------------------------------------
# auto generated Target:testjob by codegen.pl
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
CFLAGS+=/Ob1
.ENDIF
@@ -42,10 +42,10 @@ SHL1TARGET=$(TARGET)
SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB)
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
SHL1STDLIBS+= $(LB)$/iodiapi.lib
.ENDIF
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
SHL1STDLIBS+=$(LB)$/libodiapi.so
.ENDIF
diff --git a/xmerge/Package_xmergesync.mk b/xmerge/Package_xmergesync.mk
index fbeead52090b..ef08b060a436 100644
--- a/xmerge/Package_xmergesync.mk
+++ b/xmerge/Package_xmergesync.mk
@@ -29,6 +29,6 @@
$(eval $(call gb_Package_Package,xmergesync,$(SRCDIR)/xmerge/source/activesync/BIN))
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_file,xmergesync,bin/xmergesync.dll,xmergesync.dll))
endif
diff --git a/xmerge/source/activesync/makefile.mk b/xmerge/source/activesync/makefile.mk
index 7e3b6d24ec04..45714ce3a4fa 100644
--- a/xmerge/source/activesync/makefile.mk
+++ b/xmerge/source/activesync/makefile.mk
@@ -29,7 +29,7 @@ SOLARINC+=-I$(POCKETPCSDK_HOME)$/support$/ActiveSync$/inc
.INCLUDE: settings.mk
.IF 0
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
.IF "$(POCKETPCSDK_HOME)" != ""
RCFILES=XMergeSync.rc
@@ -57,6 +57,6 @@ SHL1STDLIBS= uuid.lib Advapi32.lib
.INCLUDE : target.mk
ALLTAR :
- .IF "$(GUI)" == "WNT"
+ .IF "$(OS)" == "WNT"
$(COPY) BIN$/xmergesync.dll $(BIN)
.ENDIF
diff --git a/xmerge/source/regutil/makefile.mk b/xmerge/source/regutil/makefile.mk
index 12e0a65d9cb0..e520c2fb499d 100644
--- a/xmerge/source/regutil/makefile.mk
+++ b/xmerge/source/regutil/makefile.mk
@@ -25,7 +25,7 @@ LIBTARGET=NO
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
-.IF "$(GUI)" == "WNT"
+.IF "$(OS)" == "WNT"
OBJFILES=$(OBJ)$/regutil.obj
APP1TARGETDEPN=makefile.mk
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 23527d1f9df8..92bb38964f53 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_set_componentfile,ucpchelp1,xmlhelp/util/ucpchelp1))
# .ENDIF # "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
# .ENDIF # "$(COM)"=="GCC"
-ifeq ($(GUI)$(COM),WNTMSC)
+ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Library_add_cxxflags,ucpchelp1,\
-GR \
))
diff --git a/xmlhelp/source/cxxhelp/test/makefile.mk b/xmlhelp/source/cxxhelp/test/makefile.mk
index 71a7e5651a4a..b7c3859fffad 100644
--- a/xmlhelp/source/cxxhelp/test/makefile.mk
+++ b/xmlhelp/source/cxxhelp/test/makefile.mk
@@ -30,7 +30,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
CFLAGS+=-GR
.ENDIF
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 1396f026d973..4a9ca4d0d313 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -95,7 +95,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xsec_nss \
))
-ifeq ($(GUI)$(CROSS_COMPILING),WNT)
+ifeq ($(OS)$(CROSS_COMPILING),WNT)
$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_MSCRYPTO \
@@ -127,7 +127,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_NSS \
))
-ifeq ($(GUI)$(CROSS_COMPILING),WNTYES)
+ifeq ($(OS)$(CROSS_COMPILING),WNTYES)
$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
xmlsec1-nss \
))
@@ -152,7 +152,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl \
))
-endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT)
+endif # ifeq ($(OS)$(CROSS_COMPILING),WNT)
ifeq ($(OS),SOLARIS)
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
diff --git a/xmlsecurity/tools/standalone/csfit/makefile.mk b/xmlsecurity/tools/standalone/csfit/makefile.mk
index e2fb7073dbb1..841f3567d7cc 100644
--- a/xmlsecurity/tools/standalone/csfit/makefile.mk
+++ b/xmlsecurity/tools/standalone/csfit/makefile.mk
@@ -52,7 +52,7 @@ SHARE_LIBS = \
$(SALHELPERLIB) \
$(SALLIB)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
SHARE_LIBS+= "ixml2.lib" "nss3.lib" "nspr4.lib" "libxmlsec.lib" "libxmlsec-nss.lib" "xsec_xmlsec.lib"
.ELSE
SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec1" "-lxmlsec1-nss" "-lxsec_xmlsec"
diff --git a/xmlsecurity/tools/standalone/csfit/util/makefile.mk b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
index 1ada5afaac67..0e33cd99ca41 100644
--- a/xmlsecurity/tools/standalone/csfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
@@ -58,13 +58,13 @@ REGISTERLIBS+= \
$(DLLPRE)xsec_fw$(DLLPOST) \
$(DLLPRE)xsec_xmlsec$(DLLPOST)
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
MY_DLLDIR=$(SOLARLIBDIR)
REGISTERLIBS+= \
$(DLLPRE)dtransX11$(DLLPOSTFIX)$(DLLPOST)
-.ELSE # "$(GUI)" == "UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)" != "WNT"
+.IF "$(OS)"=="WNT"
MY_DLLDIR=$(SOLARBINDIR)
REGISTERLIBS+= \
@@ -72,14 +72,14 @@ REGISTERLIBS+= \
$(DLLPRE)ftransl$(DLLPOST) \
$(DLLPRE)dnd$(DLLPOST)
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@echo "**********************************************************"
@echo "*** unknown platform: don't know which librarys to use ***"
@echo "**********************************************************"
force_dmake_to_error
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)" != "WNT"
.IF "$(SOLAR_JAVA)" != ""
.IF "$(JAVANUMVER)" >= "000100040000"
@@ -102,7 +102,7 @@ REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
MY_CLASSPATH_TMP=$(foreach,i,$(REGCOMP_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(SOLARLIBDIR)$(PATH_SEPERATOR)$(XCLASSPATH)
REGCOMP_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
DOLLAR_SIGN=\$$
MY_JAVA_COMPPATH=file://$(SOLARBINDIR)
.IF "$(OS)"=="MACOSX"
@@ -114,7 +114,7 @@ REGCOMP_ENV=\
setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
.ENDIF
-.ELSE # "$(GUI)" != "WNT"
+.ELSE # "$(OS)" != "WNT"
.IF "$(USE_SHELL)" != "4nt"
DOLLAR_SIGN=\$$
REGCOMP_ENV=\
@@ -128,7 +128,7 @@ REGCOMP_ENV=\
set PATH=$(PATH);$(JREPATH)
MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))
.ENDIF # "$(USE_SHELL)" != "4nt"
-.ENDIF # "$(GUI)"!="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(JAVANUMVER)" >= "000100040000"
.ENDIF # "$(SOLAR_JAVA)" != ""
diff --git a/xmlsecurity/tools/standalone/mscsfit/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/makefile.mk
index 2c952d807e2e..b56671fd0a5a 100644
--- a/xmlsecurity/tools/standalone/mscsfit/makefile.mk
+++ b/xmlsecurity/tools/standalone/mscsfit/makefile.mk
@@ -43,7 +43,7 @@ SHARE_LIBS = \
$(CPPUHELPERLIB) \
$(SALLIB)
-.IF "$(GUI)"=="WNT"
+.IF "$(OS)"=="WNT"
SHARE_LIBS+= "libxml2.lib" "crypt32.lib" "advapi32.lib" "libxmlsec.lib" "libxmlsec-mscrypto.lib" "xsec_xmlsec.lib" "xs_comm.lib" "xs_mscrypt.lib"
.ELSE
SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec1" "-lxmlsec1-nss" "-lxsec_xmlsec" "-lxs_comm" "-lxs_nss"
diff --git a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
index 2689d6079b4a..94264370200a 100644
--- a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
@@ -58,13 +58,13 @@ REGISTERLIBS+= \
$(DLLPRE)xsec_fw$(DLLPOST) \
$(DLLPRE)xsec_xmlsec$(DLLPOST)
-.IF "$(GUI)" == "UNX"
+.IF "$(OS)" != "WNT"
MY_DLLDIR=$(SOLARLIBDIR)
REGISTERLIBS+= \
$(DLLPRE)dtransX11$(DLLPOSTFIX)$(DLLPOST)
-.ELSE # "$(GUI)" == "UNX"
-.IF "$(GUI)"=="WNT"
+.ELSE # "$(OS)" != "WNT"
+.IF "$(OS)"=="WNT"
MY_DLLDIR=$(SOLARBINDIR)
REGISTERLIBS+= \
@@ -72,14 +72,14 @@ REGISTERLIBS+= \
$(DLLPRE)ftransl$(DLLPOST) \
$(DLLPRE)dnd$(DLLPOST)
-.ELSE # "$(GUI)"=="WNT"
+.ELSE # "$(OS)"=="WNT"
@echo "**********************************************************"
@echo "*** unknown platform: don't know which librarys to use ***"
@echo "**********************************************************"
force_dmake_to_error
-.ENDIF # "$(GUI)"=="WNT"
-.ENDIF # "$(GUI)" == "UNX"
+.ENDIF # "$(OS)"=="WNT"
+.ENDIF # "$(OS)" != "WNT"
.IF "$(SOLAR_JAVA)" != ""
.IF "$(JAVANUMVER)" >= "000100040000"
@@ -102,7 +102,7 @@ REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
MY_CLASSPATH_TMP=$(foreach,i,$(REGCOMP_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(SOLARLIBDIR)$(PATH_SEPERATOR)$(XCLASSPATH)
REGCOMP_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))
-.IF "$(GUI)"!="WNT"
+.IF "$(OS)"!="WNT"
DOLLAR_SIGN=\$$
MY_JAVA_COMPPATH=file://$(SOLARBINDIR)
.IF "$(OS)"=="MACOSX"
@@ -114,7 +114,7 @@ REGCOMP_ENV=\
setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
.ENDIF
-.ELSE # "$(GUI)" != "WNT"
+.ELSE # "$(OS)" != "WNT"
.IF "$(USE_SHELL)" != "4nt"
DOLLAR_SIGN=\$$
REGCOMP_ENV=\
@@ -128,7 +128,7 @@ REGCOMP_ENV=\
set PATH=$(PATH);$(JREPATH)
MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))
.ENDIF # "$(USE_SHELL)" != "4nt"
-.ENDIF # "$(GUI)"!="WNT"
+.ENDIF # "$(OS)"!="WNT"
.ENDIF # "$(JAVANUMVER)" >= "000100040000"
.ENDIF # "$(SOLAR_JAVA)" != ""
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 53b3b676b3fe..8a2747a1dccf 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -65,7 +65,7 @@ CXXFLAGS+:=$(EXTRA_CDEFS)
.EXPORT: CFLAGS CXXFLAGS
.ENDIF
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
.IF "$(OS)"=="SOLARIS"
CFLAGS:=-O $(ARCH_FLAGS)
.IF "$(COM)$(CPU)" == "C52I"
@@ -123,7 +123,7 @@ OUT2INC= \
aconf.h \
aconf2.h
-.IF "$(GUI)"=="UNX"
+.IF "$(OS)"!="WNT"
OUT2LIB= \
fofi$/lib*.a \
goo$/lib*.a \