summaryrefslogtreecommitdiffstats
path: root/solenv/inc
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 /solenv/inc
parentfix officebean on mingw (diff)
downloadcore-c29098917a1118d4b435df2b5f542adc8505e123.tar.gz
core-c29098917a1118d4b435df2b5f542adc8505e123.zip
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'solenv/inc')
-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
29 files changed, 640 insertions, 640 deletions
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 ---
generated by cgit (git 2.34.1) at 2024-07-08 15:20:59 +0000