MWS_SRX644: migrate branch mws_srx644 -> HEAD

53 files changed, 1936 insertions, 1959 deletions

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index c72a66e699f5..c36dd8801fc8 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -51,6 +51,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP1TARGETN:b)_linkinc.ls
 $(APP1TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP1LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     $(APP1RES) \
     $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
@@ -97,7 +100,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP1OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -113,7 +116,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @+-$(RM) $(MISC)$/$(APP1LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP1ICON)" != ""
-    @-+echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
+    @-+echo 1 ICON "$(APP1ICON:s/\/\\/)" >> $(MISC)$/$(APP1LINKRES:b).rc
 .ENDIF
 .IF "$(APP1VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
@@ -121,7 +124,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP1ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP1ICON:s/\//\/\//)\" >> $(MISC)$/$(APP1LINKRES:b).rc
 .ENDIF
 .IF "$(APP1VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
@@ -262,6 +265,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP2TARGETN:b)_linkinc.ls
 $(APP2TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP2LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     $(APP2RES) \
     $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
@@ -308,7 +314,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP2OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -324,7 +330,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @+-$(RM) $(MISC)$/$(APP2LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP2ICON)" != ""
-    @-+echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
+    @-+echo 1 ICON "$(APP2ICON:s/\/\\/)" >> $(MISC)$/$(APP2LINKRES:b).rc
 .ENDIF
 .IF "$(APP2VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
@@ -332,7 +338,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP2ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP2ICON:s/\//\/\//)\" >> $(MISC)$/$(APP2LINKRES:b).rc
 .ENDIF
 .IF "$(APP2VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
@@ -473,6 +479,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP3TARGETN:b)_linkinc.ls
 $(APP3TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP3LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     $(APP3RES) \
     $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
@@ -519,7 +528,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP3OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -535,7 +544,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @+-$(RM) $(MISC)$/$(APP3LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP3ICON)" != ""
-    @-+echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
+    @-+echo 1 ICON "$(APP3ICON:s/\/\\/)" >> $(MISC)$/$(APP3LINKRES:b).rc
 .ENDIF
 .IF "$(APP3VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
@@ -543,7 +552,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP3ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP3ICON:s/\//\/\//)\" >> $(MISC)$/$(APP3LINKRES:b).rc
 .ENDIF
 .IF "$(APP3VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
@@ -684,6 +693,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP4TARGETN:b)_linkinc.ls
 $(APP4TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP4LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     $(APP4RES) \
     $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
@@ -730,7 +742,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP4OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -746,7 +758,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @+-$(RM) $(MISC)$/$(APP4LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP4ICON)" != ""
-    @-+echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
+    @-+echo 1 ICON "$(APP4ICON:s/\/\\/)" >> $(MISC)$/$(APP4LINKRES:b).rc
 .ENDIF
 .IF "$(APP4VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
@@ -754,7 +766,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP4ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP4ICON:s/\//\/\//)\" >> $(MISC)$/$(APP4LINKRES:b).rc
 .ENDIF
 .IF "$(APP4VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
@@ -895,6 +907,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP5TARGETN:b)_linkinc.ls
 $(APP5TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP5LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     $(APP5RES) \
     $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
@@ -941,7 +956,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP5OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -957,7 +972,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @+-$(RM) $(MISC)$/$(APP5LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP5ICON)" != ""
-    @-+echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
+    @-+echo 1 ICON "$(APP5ICON:s/\/\\/)" >> $(MISC)$/$(APP5LINKRES:b).rc
 .ENDIF
 .IF "$(APP5VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
@@ -965,7 +980,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP5ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP5ICON:s/\//\/\//)\" >> $(MISC)$/$(APP5LINKRES:b).rc
 .ENDIF
 .IF "$(APP5VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
@@ -1106,6 +1121,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP6TARGETN:b)_linkinc.ls
 $(APP6TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP6LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     $(APP6RES) \
     $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
@@ -1152,7 +1170,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP6OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -1168,7 +1186,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @+-$(RM) $(MISC)$/$(APP6LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP6ICON)" != ""
-    @-+echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
+    @-+echo 1 ICON "$(APP6ICON:s/\/\\/)" >> $(MISC)$/$(APP6LINKRES:b).rc
 .ENDIF
 .IF "$(APP6VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
@@ -1176,7 +1194,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP6ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP6ICON:s/\//\/\//)\" >> $(MISC)$/$(APP6LINKRES:b).rc
 .ENDIF
 .IF "$(APP6VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
@@ -1317,6 +1335,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP7TARGETN:b)_linkinc.ls
 $(APP7TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP7LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     $(APP7RES) \
     $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
@@ -1363,7 +1384,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP7OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -1379,7 +1400,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @+-$(RM) $(MISC)$/$(APP7LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP7ICON)" != ""
-    @-+echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
+    @-+echo 1 ICON "$(APP7ICON:s/\/\\/)" >> $(MISC)$/$(APP7LINKRES:b).rc
 .ENDIF
 .IF "$(APP7VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
@@ -1387,7 +1408,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP7ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP7ICON:s/\//\/\//)\" >> $(MISC)$/$(APP7LINKRES:b).rc
 .ENDIF
 .IF "$(APP7VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
@@ -1528,6 +1549,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP8TARGETN:b)_linkinc.ls
 $(APP8TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP8LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     $(APP8RES) \
     $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
@@ -1574,7 +1598,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP8OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -1590,7 +1614,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @+-$(RM) $(MISC)$/$(APP8LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP8ICON)" != ""
-    @-+echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
+    @-+echo 1 ICON "$(APP8ICON:s/\/\\/)" >> $(MISC)$/$(APP8LINKRES:b).rc
 .ENDIF
 .IF "$(APP8VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
@@ -1598,7 +1622,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP8ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP8ICON:s/\//\/\//)\" >> $(MISC)$/$(APP8LINKRES:b).rc
 .ENDIF
 .IF "$(APP8VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
@@ -1739,6 +1763,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP9TARGETN:b)_linkinc.ls
 $(APP9TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP9LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     $(APP9RES) \
     $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
@@ -1785,7 +1812,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP9OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -1801,7 +1828,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @+-$(RM) $(MISC)$/$(APP9LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP9ICON)" != ""
-    @-+echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
+    @-+echo 1 ICON "$(APP9ICON:s/\/\\/)" >> $(MISC)$/$(APP9LINKRES:b).rc
 .ENDIF
 .IF "$(APP9VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
@@ -1809,7 +1836,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP9ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP9ICON:s/\//\/\//)\" >> $(MISC)$/$(APP9LINKRES:b).rc
 .ENDIF
 .IF "$(APP9VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
@@ -1950,6 +1977,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP10TARGETN:b)_linkinc.ls
 $(APP10TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP10LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     $(APP10RES) \
     $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
@@ -1996,7 +2026,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP10OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -2012,7 +2042,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @+-$(RM) $(MISC)$/$(APP10LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP10ICON)" != ""
-    @-+echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
+    @-+echo 1 ICON "$(APP10ICON:s/\/\\/)" >> $(MISC)$/$(APP10LINKRES:b).rc
 .ENDIF
 .IF "$(APP10VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
@@ -2020,7 +2050,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP10ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP10ICON:s/\//\/\//)\" >> $(MISC)$/$(APP10LINKRES:b).rc
 .ENDIF
 .IF "$(APP10VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 6b459351bd64..1531ab94e0d9 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -26,7 +26,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB1NAME)"!=""
 
@@ -55,7 +55,7 @@ $(DEF1TARGETN) .PHONY : \
         $(DEF1DEPN) \
         $(DEF1EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB1NAME)"!=""
 .IF "$(BUILD_DRIVE1)"=="O"
@@ -175,19 +175,10 @@ $(DEF1TARGETN) .PHONY : \
 $(DEF1TARGETN): \
         $(DEF1DEPN) \
         $(DEF1EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF1TARGETN): \
-        $(DEF1DEPN) \
-        $(DEF1EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF1TARGETN)"!=""
 
@@ -221,7 +212,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB2NAME)"!=""
 
@@ -250,7 +241,7 @@ $(DEF2TARGETN) .PHONY : \
         $(DEF2DEPN) \
         $(DEF2EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB2NAME)"!=""
 .IF "$(BUILD_DRIVE2)"=="O"
@@ -370,19 +361,10 @@ $(DEF2TARGETN) .PHONY : \
 $(DEF2TARGETN): \
         $(DEF2DEPN) \
         $(DEF2EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF2TARGETN): \
-        $(DEF2DEPN) \
-        $(DEF2EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF2TARGETN)"!=""
 
@@ -416,7 +398,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB3NAME)"!=""
 
@@ -445,7 +427,7 @@ $(DEF3TARGETN) .PHONY : \
         $(DEF3DEPN) \
         $(DEF3EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB3NAME)"!=""
 .IF "$(BUILD_DRIVE3)"=="O"
@@ -565,19 +547,10 @@ $(DEF3TARGETN) .PHONY : \
 $(DEF3TARGETN): \
         $(DEF3DEPN) \
         $(DEF3EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF3TARGETN): \
-        $(DEF3DEPN) \
-        $(DEF3EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF3TARGETN)"!=""
 
@@ -611,7 +584,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB4NAME)"!=""
 
@@ -640,7 +613,7 @@ $(DEF4TARGETN) .PHONY : \
         $(DEF4DEPN) \
         $(DEF4EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB4NAME)"!=""
 .IF "$(BUILD_DRIVE4)"=="O"
@@ -760,19 +733,10 @@ $(DEF4TARGETN) .PHONY : \
 $(DEF4TARGETN): \
         $(DEF4DEPN) \
         $(DEF4EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF4TARGETN): \
-        $(DEF4DEPN) \
-        $(DEF4EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF4TARGETN)"!=""
 
@@ -806,7 +770,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB5NAME)"!=""
 
@@ -835,7 +799,7 @@ $(DEF5TARGETN) .PHONY : \
         $(DEF5DEPN) \
         $(DEF5EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB5NAME)"!=""
 .IF "$(BUILD_DRIVE5)"=="O"
@@ -955,19 +919,10 @@ $(DEF5TARGETN) .PHONY : \
 $(DEF5TARGETN): \
         $(DEF5DEPN) \
         $(DEF5EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF5TARGETN): \
-        $(DEF5DEPN) \
-        $(DEF5EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF5TARGETN)"!=""
 
@@ -1001,7 +956,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB6NAME)"!=""
 
@@ -1030,7 +985,7 @@ $(DEF6TARGETN) .PHONY : \
         $(DEF6DEPN) \
         $(DEF6EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB6NAME)"!=""
 .IF "$(BUILD_DRIVE6)"=="O"
@@ -1150,19 +1105,10 @@ $(DEF6TARGETN) .PHONY : \
 $(DEF6TARGETN): \
         $(DEF6DEPN) \
         $(DEF6EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF6TARGETN): \
-        $(DEF6DEPN) \
-        $(DEF6EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF6TARGETN)"!=""
 
@@ -1196,7 +1142,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB7NAME)"!=""
 
@@ -1225,7 +1171,7 @@ $(DEF7TARGETN) .PHONY : \
         $(DEF7DEPN) \
         $(DEF7EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB7NAME)"!=""
 .IF "$(BUILD_DRIVE7)"=="O"
@@ -1345,19 +1291,10 @@ $(DEF7TARGETN) .PHONY : \
 $(DEF7TARGETN): \
         $(DEF7DEPN) \
         $(DEF7EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF7TARGETN): \
-        $(DEF7DEPN) \
-        $(DEF7EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF7TARGETN)"!=""
 
@@ -1391,7 +1328,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB8NAME)"!=""
 
@@ -1420,7 +1357,7 @@ $(DEF8TARGETN) .PHONY : \
         $(DEF8DEPN) \
         $(DEF8EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB8NAME)"!=""
 .IF "$(BUILD_DRIVE8)"=="O"
@@ -1540,19 +1477,10 @@ $(DEF8TARGETN) .PHONY : \
 $(DEF8TARGETN): \
         $(DEF8DEPN) \
         $(DEF8EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF8TARGETN): \
-        $(DEF8DEPN) \
-        $(DEF8EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF8TARGETN)"!=""
 
@@ -1586,7 +1514,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB9NAME)"!=""
 
@@ -1615,7 +1543,7 @@ $(DEF9TARGETN) .PHONY : \
         $(DEF9DEPN) \
         $(DEF9EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB9NAME)"!=""
 .IF "$(BUILD_DRIVE9)"=="O"
@@ -1735,19 +1663,10 @@ $(DEF9TARGETN) .PHONY : \
 $(DEF9TARGETN): \
         $(DEF9DEPN) \
         $(DEF9EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF9TARGETN): \
-        $(DEF9DEPN) \
-        $(DEF9EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF9TARGETN)"!=""
 
@@ -1781,7 +1700,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB10NAME)"!=""
 
@@ -1810,7 +1729,7 @@ $(DEF10TARGETN) .PHONY : \
         $(DEF10DEPN) \
         $(DEF10EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB10NAME)"!=""
 .IF "$(BUILD_DRIVE10)"=="O"
@@ -1930,19 +1849,10 @@ $(DEF10TARGETN) .PHONY : \
 $(DEF10TARGETN): \
         $(DEF10DEPN) \
         $(DEF10EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF10TARGETN): \
-        $(DEF10DEPN) \
-        $(DEF10EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF10TARGETN)"!=""
 
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index c88d54a18d9a..975bb4db0442 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -219,9 +219,9 @@ $(SHL1TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL1DEFAULTRES)"!=""
@@ -253,31 +253,6 @@ $(SHL1TARGETN) : \
 .ENDIF			# "$(SHL1ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL1STACK) $(SHL1BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL1TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL1DEF) \
-        $(USE_1IMPLIB) \
-        $(STDOBJ) \
-        $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) \
-        $(SHL1LIBS) \
-        $(SHL1STDLIBS) \
-        $(STDSHL) $(STDSHL1) \
-        $(SHL1LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -314,28 +289,6 @@ $(SHL1TARGETN) : \
         $(STDSHL) $(STDSHL1)                           \
         $(SHL1LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL1BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL1STACK) -out:$(BIN)$/_$(SHL1TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL1IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL1OBJS) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ)    \
-        $(SHL1LIBS)                         \
-        $(SHL1STDLIBS)                      \
-        $(STDSHL) $(STDSHL1)                           \
-        $(SHL1LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL1TARGET).lnk
@@ -360,22 +313,22 @@ $(SHL1TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -416,9 +369,6 @@ $(SHL1TARGETN) : \
     $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL1NOCHECK)"==""
     +-$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
@@ -681,9 +631,9 @@ $(SHL2TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL2DEFAULTRES)"!=""
@@ -715,31 +665,6 @@ $(SHL2TARGETN) : \
 .ENDIF			# "$(SHL2ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL2STACK) $(SHL2BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL2TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL2DEF) \
-        $(USE_2IMPLIB) \
-        $(STDOBJ) \
-        $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) \
-        $(SHL2LIBS) \
-        $(SHL2STDLIBS) \
-        $(STDSHL) $(STDSHL2) \
-        $(SHL2LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -776,28 +701,6 @@ $(SHL2TARGETN) : \
         $(STDSHL) $(STDSHL2)                           \
         $(SHL2LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL2BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL2STACK) -out:$(BIN)$/_$(SHL2TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL2IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL2OBJS) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ)    \
-        $(SHL2LIBS)                         \
-        $(SHL2STDLIBS)                      \
-        $(STDSHL) $(STDSHL2)                           \
-        $(SHL2LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL2TARGET).lnk
@@ -822,22 +725,22 @@ $(SHL2TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -878,9 +781,6 @@ $(SHL2TARGETN) : \
     $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL2NOCHECK)"==""
     +-$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
@@ -1143,9 +1043,9 @@ $(SHL3TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL3DEFAULTRES)"!=""
@@ -1177,31 +1077,6 @@ $(SHL3TARGETN) : \
 .ENDIF			# "$(SHL3ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL3STACK) $(SHL3BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL3TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL3DEF) \
-        $(USE_3IMPLIB) \
-        $(STDOBJ) \
-        $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) \
-        $(SHL3LIBS) \
-        $(SHL3STDLIBS) \
-        $(STDSHL) $(STDSHL3) \
-        $(SHL3LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -1238,28 +1113,6 @@ $(SHL3TARGETN) : \
         $(STDSHL) $(STDSHL3)                           \
         $(SHL3LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL3BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL3STACK) -out:$(BIN)$/_$(SHL3TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL3IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL3OBJS) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ)    \
-        $(SHL3LIBS)                         \
-        $(SHL3STDLIBS)                      \
-        $(STDSHL) $(STDSHL3)                           \
-        $(SHL3LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL3TARGET).lnk
@@ -1284,22 +1137,22 @@ $(SHL3TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -1340,9 +1193,6 @@ $(SHL3TARGETN) : \
     $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL3NOCHECK)"==""
     +-$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
@@ -1605,9 +1455,9 @@ $(SHL4TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL4DEFAULTRES)"!=""
@@ -1639,31 +1489,6 @@ $(SHL4TARGETN) : \
 .ENDIF			# "$(SHL4ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL4STACK) $(SHL4BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL4TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL4DEF) \
-        $(USE_4IMPLIB) \
-        $(STDOBJ) \
-        $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) \
-        $(SHL4LIBS) \
-        $(SHL4STDLIBS) \
-        $(STDSHL) $(STDSHL4) \
-        $(SHL4LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -1700,28 +1525,6 @@ $(SHL4TARGETN) : \
         $(STDSHL) $(STDSHL4)                           \
         $(SHL4LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL4BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL4STACK) -out:$(BIN)$/_$(SHL4TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL4IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL4OBJS) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ)    \
-        $(SHL4LIBS)                         \
-        $(SHL4STDLIBS)                      \
-        $(STDSHL) $(STDSHL4)                           \
-        $(SHL4LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL4TARGET).lnk
@@ -1746,22 +1549,22 @@ $(SHL4TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -1802,9 +1605,6 @@ $(SHL4TARGETN) : \
     $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL4NOCHECK)"==""
     +-$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
@@ -2067,9 +1867,9 @@ $(SHL5TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL5DEFAULTRES)"!=""
@@ -2101,31 +1901,6 @@ $(SHL5TARGETN) : \
 .ENDIF			# "$(SHL5ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL5STACK) $(SHL5BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL5TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL5DEF) \
-        $(USE_5IMPLIB) \
-        $(STDOBJ) \
-        $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) \
-        $(SHL5LIBS) \
-        $(SHL5STDLIBS) \
-        $(STDSHL) $(STDSHL5) \
-        $(SHL5LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -2162,28 +1937,6 @@ $(SHL5TARGETN) : \
         $(STDSHL) $(STDSHL5)                           \
         $(SHL5LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL5BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL5STACK) -out:$(BIN)$/_$(SHL5TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL5IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL5OBJS) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ)    \
-        $(SHL5LIBS)                         \
-        $(SHL5STDLIBS)                      \
-        $(STDSHL) $(STDSHL5)                           \
-        $(SHL5LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL5TARGET).lnk
@@ -2208,22 +1961,22 @@ $(SHL5TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -2264,9 +2017,6 @@ $(SHL5TARGETN) : \
     $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL5NOCHECK)"==""
     +-$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
@@ -2529,9 +2279,9 @@ $(SHL6TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL6DEFAULTRES)"!=""
@@ -2563,31 +2313,6 @@ $(SHL6TARGETN) : \
 .ENDIF			# "$(SHL6ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL6STACK) $(SHL6BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL6TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL6DEF) \
-        $(USE_6IMPLIB) \
-        $(STDOBJ) \
-        $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) \
-        $(SHL6LIBS) \
-        $(SHL6STDLIBS) \
-        $(STDSHL) $(STDSHL6) \
-        $(SHL6LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -2624,28 +2349,6 @@ $(SHL6TARGETN) : \
         $(STDSHL) $(STDSHL6)                           \
         $(SHL6LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL6BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL6STACK) -out:$(BIN)$/_$(SHL6TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL6IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL6OBJS) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ)    \
-        $(SHL6LIBS)                         \
-        $(SHL6STDLIBS)                      \
-        $(STDSHL) $(STDSHL6)                           \
-        $(SHL6LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL6TARGET).lnk
@@ -2670,22 +2373,22 @@ $(SHL6TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -2726,9 +2429,6 @@ $(SHL6TARGETN) : \
     $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL6NOCHECK)"==""
     +-$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
@@ -2991,9 +2691,9 @@ $(SHL7TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL7DEFAULTRES)"!=""
@@ -3025,31 +2725,6 @@ $(SHL7TARGETN) : \
 .ENDIF			# "$(SHL7ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL7STACK) $(SHL7BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL7TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL7DEF) \
-        $(USE_7IMPLIB) \
-        $(STDOBJ) \
-        $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) \
-        $(SHL7LIBS) \
-        $(SHL7STDLIBS) \
-        $(STDSHL) $(STDSHL7) \
-        $(SHL7LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -3086,28 +2761,6 @@ $(SHL7TARGETN) : \
         $(STDSHL) $(STDSHL7)                           \
         $(SHL7LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL7BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL7STACK) -out:$(BIN)$/_$(SHL7TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL7IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL7OBJS) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ)    \
-        $(SHL7LIBS)                         \
-        $(SHL7STDLIBS)                      \
-        $(STDSHL) $(STDSHL7)                           \
-        $(SHL7LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL7TARGET).lnk
@@ -3132,22 +2785,22 @@ $(SHL7TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -3188,9 +2841,6 @@ $(SHL7TARGETN) : \
     $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL7NOCHECK)"==""
     +-$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
@@ -3453,9 +3103,9 @@ $(SHL8TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL8DEFAULTRES)"!=""
@@ -3487,31 +3137,6 @@ $(SHL8TARGETN) : \
 .ENDIF			# "$(SHL8ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL8STACK) $(SHL8BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL8TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL8DEF) \
-        $(USE_8IMPLIB) \
-        $(STDOBJ) \
-        $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) \
-        $(SHL8LIBS) \
-        $(SHL8STDLIBS) \
-        $(STDSHL) $(STDSHL8) \
-        $(SHL8LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -3548,28 +3173,6 @@ $(SHL8TARGETN) : \
         $(STDSHL) $(STDSHL8)                           \
         $(SHL8LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL8BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL8STACK) -out:$(BIN)$/_$(SHL8TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL8IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL8OBJS) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ)    \
-        $(SHL8LIBS)                         \
-        $(SHL8STDLIBS)                      \
-        $(STDSHL) $(STDSHL8)                           \
-        $(SHL8LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL8TARGET).lnk
@@ -3594,22 +3197,22 @@ $(SHL8TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -3650,9 +3253,6 @@ $(SHL8TARGETN) : \
     $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL8NOCHECK)"==""
     +-$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
@@ -3915,9 +3515,9 @@ $(SHL9TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL9DEFAULTRES)"!=""
@@ -3949,31 +3549,6 @@ $(SHL9TARGETN) : \
 .ENDIF			# "$(SHL9ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL9STACK) $(SHL9BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL9TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL9DEF) \
-        $(USE_9IMPLIB) \
-        $(STDOBJ) \
-        $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) \
-        $(SHL9LIBS) \
-        $(SHL9STDLIBS) \
-        $(STDSHL) $(STDSHL9) \
-        $(SHL9LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -4010,28 +3585,6 @@ $(SHL9TARGETN) : \
         $(STDSHL) $(STDSHL9)                           \
         $(SHL9LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL9BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL9STACK) -out:$(BIN)$/_$(SHL9TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL9IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL9OBJS) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ)    \
-        $(SHL9LIBS)                         \
-        $(SHL9STDLIBS)                      \
-        $(STDSHL) $(STDSHL9)                           \
-        $(SHL9LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL9TARGET).lnk
@@ -4056,22 +3609,22 @@ $(SHL9TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -4112,9 +3665,6 @@ $(SHL9TARGETN) : \
     $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL9NOCHECK)"==""
     +-$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
@@ -4377,9 +3927,9 @@ $(SHL10TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL10DEFAULTRES)"!=""
@@ -4411,31 +3961,6 @@ $(SHL10TARGETN) : \
 .ENDIF			# "$(SHL10ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL10STACK) $(SHL10BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL10TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL10DEF) \
-        $(USE_10IMPLIB) \
-        $(STDOBJ) \
-        $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) \
-        $(SHL10LIBS) \
-        $(SHL10STDLIBS) \
-        $(STDSHL) $(STDSHL10) \
-        $(SHL10LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -4472,28 +3997,6 @@ $(SHL10TARGETN) : \
         $(STDSHL) $(STDSHL10)                           \
         $(SHL10LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL10BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL10STACK) -out:$(BIN)$/_$(SHL10TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL10IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL10OBJS) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ)    \
-        $(SHL10LIBS)                         \
-        $(SHL10STDLIBS)                      \
-        $(STDSHL) $(STDSHL10)                           \
-        $(SHL10LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL10TARGET).lnk
@@ -4518,22 +4021,22 @@ $(SHL10TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -4574,9 +4077,6 @@ $(SHL10TARGETN) : \
     $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL10NOCHECK)"==""
     +-$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index f9abaf44feb4..1e02d6a1512e 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -10,12 +10,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP1TARGET)"!=""
-ZIP1ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP1ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP1ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP1ISO_LANGDIRS)"==""
 ZIP1DIR*=$(ZIPDIR)
 ZIP1FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -23,7 +17,7 @@ zip1langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip1langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip1alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip1langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip1alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip1langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP1TARGET)"!=""
 
 .IF "$(ZIP1TARGETN)"!=""
@@ -52,12 +46,12 @@ $(ZIP1TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP1TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).zip $(ZIP1LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).zip $(ZIP1LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP1TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP1TMP).zip
 .ELSE			# "$(ZIP1DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP1DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -72,25 +66,26 @@ $(ZIP1TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP1TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).zip $(ZIP1LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).zip $(ZIP1LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP1TMP).zip  $@ 
     +$(RM) $(ZIP1TMP).zip
 .ELSE			# "$(ZIP1DIR)" != ""
-    +-zip $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP1DIR)" != ""
-    +-$(ZIPDEP) $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP1HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP1DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP1DIR)" != ""
-    +-$(ZIPDEP) $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP1TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP1DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -110,12 +105,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP2TARGET)"!=""
-ZIP2ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP2ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP2ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP2ISO_LANGDIRS)"==""
 ZIP2DIR*=$(ZIPDIR)
 ZIP2FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -123,7 +112,7 @@ zip2langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip2langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip2alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip2langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip2alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip2langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP2TARGET)"!=""
 
 .IF "$(ZIP2TARGETN)"!=""
@@ -152,12 +141,12 @@ $(ZIP2TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP2TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).zip $(ZIP2LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).zip $(ZIP2LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP2TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP2TMP).zip
 .ELSE			# "$(ZIP2DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP2DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -172,25 +161,26 @@ $(ZIP2TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP2TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).zip $(ZIP2LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).zip $(ZIP2LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP2TMP).zip  $@ 
     +$(RM) $(ZIP2TMP).zip
 .ELSE			# "$(ZIP2DIR)" != ""
-    +-zip $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP2DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP2DIR)" != ""
-    +-$(ZIPDEP) $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP2HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP2DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP2DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP2DIR)" != ""
-    +-$(ZIPDEP) $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP2DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -210,12 +200,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP3TARGET)"!=""
-ZIP3ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP3ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP3ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP3ISO_LANGDIRS)"==""
 ZIP3DIR*=$(ZIPDIR)
 ZIP3FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -223,7 +207,7 @@ zip3langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip3langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip3alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip3langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip3alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip3langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP3TARGET)"!=""
 
 .IF "$(ZIP3TARGETN)"!=""
@@ -252,12 +236,12 @@ $(ZIP3TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP3TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).zip $(ZIP3LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).zip $(ZIP3LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP3TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP3TMP).zip
 .ELSE			# "$(ZIP3DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP3DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -272,25 +256,26 @@ $(ZIP3TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP3TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).zip $(ZIP3LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).zip $(ZIP3LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP3TMP).zip  $@ 
     +$(RM) $(ZIP3TMP).zip
 .ELSE			# "$(ZIP3DIR)" != ""
-    +-zip $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP3DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP3DIR)" != ""
-    +-$(ZIPDEP) $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP3HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP3DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP3DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP3DIR)" != ""
-    +-$(ZIPDEP) $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP3TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP3DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -310,12 +295,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP4TARGET)"!=""
-ZIP4ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP4ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP4ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP4ISO_LANGDIRS)"==""
 ZIP4DIR*=$(ZIPDIR)
 ZIP4FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -323,7 +302,7 @@ zip4langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip4langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip4alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip4langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip4alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip4langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP4TARGET)"!=""
 
 .IF "$(ZIP4TARGETN)"!=""
@@ -352,12 +331,12 @@ $(ZIP4TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP4TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).zip $(ZIP4LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).zip $(ZIP4LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP4TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP4TMP).zip
 .ELSE			# "$(ZIP4DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP4DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -372,25 +351,26 @@ $(ZIP4TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP4TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).zip $(ZIP4LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).zip $(ZIP4LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP4TMP).zip  $@ 
     +$(RM) $(ZIP4TMP).zip
 .ELSE			# "$(ZIP4DIR)" != ""
-    +-zip $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP4DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP4DIR)" != ""
-    +-$(ZIPDEP) $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP4HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP4DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP4DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP4DIR)" != ""
-    +-$(ZIPDEP) $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP4TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP4DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -410,12 +390,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP5TARGET)"!=""
-ZIP5ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP5ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP5ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP5ISO_LANGDIRS)"==""
 ZIP5DIR*=$(ZIPDIR)
 ZIP5FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -423,7 +397,7 @@ zip5langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip5langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip5alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip5langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip5alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip5langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP5TARGET)"!=""
 
 .IF "$(ZIP5TARGETN)"!=""
@@ -452,12 +426,12 @@ $(ZIP5TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP5TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).zip $(ZIP5LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).zip $(ZIP5LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP5TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP5TMP).zip
 .ELSE			# "$(ZIP5DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP5DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -472,25 +446,26 @@ $(ZIP5TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP5TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).zip $(ZIP5LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).zip $(ZIP5LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP5TMP).zip  $@ 
     +$(RM) $(ZIP5TMP).zip
 .ELSE			# "$(ZIP5DIR)" != ""
-    +-zip $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP5DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP5DIR)" != ""
-    +-$(ZIPDEP) $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP5HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP5DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP5DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP5DIR)" != ""
-    +-$(ZIPDEP) $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP5TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP5DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -510,12 +485,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP6TARGET)"!=""
-ZIP6ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP6ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP6ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP6ISO_LANGDIRS)"==""
 ZIP6DIR*=$(ZIPDIR)
 ZIP6FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -523,7 +492,7 @@ zip6langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip6langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip6alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip6langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip6alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip6langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP6TARGET)"!=""
 
 .IF "$(ZIP6TARGETN)"!=""
@@ -552,12 +521,12 @@ $(ZIP6TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP6TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).zip $(ZIP6LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).zip $(ZIP6LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP6TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP6TMP).zip
 .ELSE			# "$(ZIP6DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP6DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -572,25 +541,26 @@ $(ZIP6TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP6TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).zip $(ZIP6LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).zip $(ZIP6LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP6TMP).zip  $@ 
     +$(RM) $(ZIP6TMP).zip
 .ELSE			# "$(ZIP6DIR)" != ""
-    +-zip $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP6DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP6DIR)" != ""
-    +-$(ZIPDEP) $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP6HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP6DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP6DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP6DIR)" != ""
-    +-$(ZIPDEP) $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP6TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP6DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -610,12 +580,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP7TARGET)"!=""
-ZIP7ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP7ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP7ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP7ISO_LANGDIRS)"==""
 ZIP7DIR*=$(ZIPDIR)
 ZIP7FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -623,7 +587,7 @@ zip7langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip7langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip7alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip7langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip7alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip7langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP7TARGET)"!=""
 
 .IF "$(ZIP7TARGETN)"!=""
@@ -652,12 +616,12 @@ $(ZIP7TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP7TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).zip $(ZIP7LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).zip $(ZIP7LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP7TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP7TMP).zip
 .ELSE			# "$(ZIP7DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP7DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -672,25 +636,26 @@ $(ZIP7TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP7TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).zip $(ZIP7LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).zip $(ZIP7LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP7TMP).zip  $@ 
     +$(RM) $(ZIP7TMP).zip
 .ELSE			# "$(ZIP7DIR)" != ""
-    +-zip $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP7DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP7DIR)" != ""
-    +-$(ZIPDEP) $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP7HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP7DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP7DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP7DIR)" != ""
-    +-$(ZIPDEP) $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP7TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP7DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -710,12 +675,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP8TARGET)"!=""
-ZIP8ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP8ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP8ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP8ISO_LANGDIRS)"==""
 ZIP8DIR*=$(ZIPDIR)
 ZIP8FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -723,7 +682,7 @@ zip8langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip8langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip8alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip8langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip8alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip8langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP8TARGET)"!=""
 
 .IF "$(ZIP8TARGETN)"!=""
@@ -752,12 +711,12 @@ $(ZIP8TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP8TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).zip $(ZIP8LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).zip $(ZIP8LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP8TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP8TMP).zip
 .ELSE			# "$(ZIP8DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP8DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -772,25 +731,26 @@ $(ZIP8TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP8TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).zip $(ZIP8LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).zip $(ZIP8LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP8TMP).zip  $@ 
     +$(RM) $(ZIP8TMP).zip
 .ELSE			# "$(ZIP8DIR)" != ""
-    +-zip $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP8DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP8DIR)" != ""
-    +-$(ZIPDEP) $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP8HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP8DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP8DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP8DIR)" != ""
-    +-$(ZIPDEP) $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP8TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP8DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -810,12 +770,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP9TARGET)"!=""
-ZIP9ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP9ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP9ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP9ISO_LANGDIRS)"==""
 ZIP9DIR*=$(ZIPDIR)
 ZIP9FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -823,7 +777,7 @@ zip9langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR
 .ELSE			# "$(GUI)"=="UNX"
 zip9langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip9alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip9langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip9alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip9langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP9TARGET)"!=""
 
 .IF "$(ZIP9TARGETN)"!=""
@@ -852,12 +806,12 @@ $(ZIP9TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP9TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).zip $(ZIP9LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).zip $(ZIP9LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP9TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP9TMP).zip
 .ELSE			# "$(ZIP9DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP9DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -872,25 +826,26 @@ $(ZIP9TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP9TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).zip $(ZIP9LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).zip $(ZIP9LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP9TMP).zip  $@ 
     +$(RM) $(ZIP9TMP).zip
 .ELSE			# "$(ZIP9DIR)" != ""
-    +-zip $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP9DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP9DIR)" != ""
-    +-$(ZIPDEP) $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP9HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP9DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP9DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP9DIR)" != ""
-    +-$(ZIPDEP) $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP9TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP9DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
@@ -910,12 +865,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP10TARGET)"!=""
-ZIP10ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP10ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP10ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP10ISO_LANGDIRS)"==""
 ZIP10DIR*=$(ZIPDIR)
 ZIP10FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -923,7 +872,7 @@ zip10langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10
 .ELSE			# "$(GUI)"=="UNX"
 zip10langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip10alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip10langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip10alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip10langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP10TARGET)"!=""
 
 .IF "$(ZIP10TARGETN)"!=""
@@ -952,12 +901,12 @@ $(ZIP10TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP10TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).zip $(ZIP10LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).zip $(ZIP10LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP10TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP10TMP).zip
 .ELSE			# "$(ZIP10DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP10DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -972,25 +921,26 @@ $(ZIP10TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP10TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).zip $(ZIP10LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).zip $(ZIP10LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP10TMP).zip  $@ 
     +$(RM) $(ZIP10TMP).zip
 .ELSE			# "$(ZIP10DIR)" != ""
-    +-zip $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP10DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP10DIR)" != ""
-    +-$(ZIPDEP) $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP10HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP10DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP10DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP10DIR)" != ""
-    +-$(ZIPDEP) $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP10TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP10DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index efc13b6b552f..331e3074f294 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -1,3 +1,64 @@
+#*************************************************************************
+#
+#   $RCSfile: ant.mk,v $
+#
+#   $Revision: 1.20 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:02 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
 # --- Force JDK14 switch  ------------------------------------------
 
diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk
index 62bfb31f39c0..ee6948432a3a 100644
--- a/solenv/inc/lang.mk
+++ b/solenv/inc/lang.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: lang.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: hjs $ $Date: 2002-11-18 12:09:12 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,14 +76,16 @@ LANG_GUI=$(GUI)
 ###################################################
 
 pol$(LANG_GUI)=-CHARSET_microsoft-cp1250
-slov$(LANG_GUI)=-CHARSET_microsoft-cp1250
+slov$(LANG_GUI)=-CHARSET_UTF8
 russ$(LANG_GUI)=-CHARSET_microsoft-cp1251
-cz$(LANG_GUI)=-CHARSET_microsoft-cp1250
+czech$(LANG_GUI)=-CHARSET_UTF8
 hung$(LANG_GUI)=-CHARSET_microsoft-cp1250
 japn$(LANG_GUI)=-CHARSET_UTF8
 chinsim$(LANG_GUI)=-CHARSET_UTF8
 chintrad$(LANG_GUI)=-CHARSET_UTF8
 arab$(LANG_GUI)=-CHARSET_microsoft-cp1256
+hebrew$(LANG_GUI)=-CHARSET_UTF8
+estonian$(LANG_GUI)=-CHARSET_UTF8
 greek$(LANG_GUI)=-CHARSET_microsoft-cp1253
 turk$(LANG_GUI)=-CHARSET_microsoft-cp1254
 korean$(LANG_GUI)=-CHARSET_UTF8
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 9fcdae75cd0e..c3ca17681f9b 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: libs.mk,v $
 #
-#   $Revision: 1.59 $
+#   $Revision: 1.60 $
 #
-#   last change: $Author: sb $ $Date: 2002-12-06 10:58:54 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:05 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,7 +60,7 @@
 #
 #*************************************************************************
 
-LIBSMKREV!:="$$Revision: 1.59 $$"
+LIBSMKREV!:="$$Revision: 1.60 $$"
 
 .IF "$(COM)"=="WTC"
 LIBPRE=libr
@@ -76,7 +76,8 @@ ICUI18NLIB=-licui18n -licuuc -licule -licudata
 GPC3RDLIB=-lgpc
 SALHELPERLIB=-lsalhelper$(COMID)
 XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX)
-COMPHELPERLIB=-lcomphelp2
+.INCLUDE .IGNORE : comphelper$/version.mk
+COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID)
 CONNECTIVITYLIB=-lconnectivity
 LDAPBERLIB=-lldapber
 TOOLSLIBST=-latools
@@ -91,7 +92,6 @@ RTLLIB=
 TECLIB=
 CPPULIB=-lcppu
 CPPUHELPERLIB=-lcppuhelper$(COMID)
-JENVLIB=-ljenv
 .INCLUDE .IGNORE : ucbhelper$/version.mk
 UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
 REGLIB=-lreg
@@ -236,12 +236,11 @@ ICUI18NLIB=icuin.lib icuuc.lib icudata.lib icule.lib
 GPC3RDLIB=gpc.lib
 SALHELPERLIB=$(LIBPRE) isalhelper.lib
 XMLSCRIPTLIB=ixcr.lib
-COMPHELPERLIB=icomphelp2.lib
+COMPHELPERLIB=icomphelp.lib
 CONNECTIVITYLIB=connectivity.lib
 LDAPBERLIB=ldapber.lib
 CPPULIB=$(LIBPRE) icppu.lib
 CPPUHELPERLIB=$(LIBPRE) icppuhelper.lib
-JENVLIB=$(LIBPRE) ijenv.lib
 SALTLSLIB=isaltls.lib
 SALZIPLIB=isalzip.lib
 UCBHELPERLIB=$(LIBPRE) iucbhelper.lib
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 177e7445de87..689f56ec7065 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,5 @@
-RSCVERSION=670
-RSCREVISION=670b(Build:8438)
-BUILD=8438
-LAST_MINOR=b
-SOURCEVERSION=SRC670
-UDKSTAMP=UDK305
+RSCVERSION=644
+RSCREVISION=644m8s1(Build:8585)
+BUILD=8585
+LAST_MINOR=m8s1
+SOURCEVERSION=SRX644
diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk
index 2743df281faa..d38708f4c9be 100644
--- a/solenv/inc/os2.mk
+++ b/solenv/inc/os2.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: os2.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: hjs $ $Date: 2001-11-02 13:18:46 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:08 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,6 +80,7 @@ JAVADEF=-DSOLAR_JAVA
 ASM=tasm
 AFLAGS=
 
+CXX=bcc
 CC=bcc
 CFLAGS=-c -3 -a1 -X -d -wbbf -weas -wucp -w-hid -w-par -I. $(MINUS_I)$(INCLUDE)
 CFLAGSCXX=-Pcxx -RT- -x- -V
@@ -148,6 +149,7 @@ DLLPOSTFIX=bo
 ASM=tasm
 AFLAGS=/ml /oi
 
+CXX=icc
 CC=icc
 .IF "$(COMEX)"=="3"
 CFLAGS=/C+ /Q+ /Gf+ /Sp1 /G4 /Se /Gs+ /Gt+ /Gd+ /J- /W2 /D__EXTENDED__ /Si+ /Xi+ $(MINUS_I)$(INCLUDE)  /Wvft-
@@ -283,6 +285,7 @@ ASM=wasm
 AFLAGS=/ml /4pr
 
 CC=wcl386
+CXX=wcl386
 .IF "$(e2p)" != ""
 CFLAGS=-c -W3 -Zp4 -Zld $(MINUS_I)$(INCLUDE) -bt=os2 -zq  -zm -ep -ee
 .ELSE
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
deleted file mode 100644
index 823418056dab..000000000000
--- a/solenv/inc/postmac.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
-#*
-#*    $Workfile:   svpm.h  $
-#*
-#*    Ersterstellung    DV 01.10.97
-#*    Letzte Aenderung  $Author: pluby $ $Date: 2001-03-11 17:45:21 $
-#*    $Revision: 1.4 $
-#*
-#*    $Logfile:   T:/tools/os2/inc/svpm.h_v  $
-#*
-#*    Copyright (c) 2000, Sun Microsystems, Inc.
-#*
-#*************************************************************************
-
-      Source Code Control System - Header
-
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/solenv/inc/postmac.h,v 1.4 2001-03-11 17:45:21 pluby Exp $
-
-      Source Code Control System - Update
-
-      $Log: not supported by cvs2svn $
-      Revision 1.3  2000/11/28 19:13:56  pluby
-      Added Line to #define and #undef statements.
-
-      Revision 1.2  2000/09/27 22:52:33  patrick.luby
-      Updates to handle <AppKit/AppKit.h> includes
-
-      Revision 1.1.1.1  2000/09/20 14:43:16  hr
-      initial import
-
-      Revision 1.1  2000/06/11 09:18:58  patrick.luby
-      Updates to support SRC591 build on Mac OS X.
-
-      Revision 1.2  1997/10/15 12:26:50  dv
-      MAC_Ptr und MAC_Boolean neu
-
-      Revision 1.1  1997/10/01 06:45:40  dv
-      First checked in
-
-
-*************************************************************************/
-
-#undef Boolean
-#undef Button
-#undef Byte
-#undef Control
-#undef Cursor
-#undef FontInfo
-#undef GetItem
-#undef MemoryBlock
-#undef Palette
-#undef Polygon
-#undef Point
-#undef Ptr
-#undef Region
-#undef Size
-#undef LSize
-#undef ModalDialog
-#undef SetCursor
-#undef ShowWindow
-#undef StringPtr
-#undef DirInfo
-#undef BOOL
-#undef ULONG
-#undef Line
-#undef TimeValue
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index cca113a04fef..e71be4175a68 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: postset.mk,v $
 #
-#   $Revision: 1.17 $
+#   $Revision: 1.18 $
 #
-#   last change: $Author: hjs $ $Date: 2002-11-29 12:12:31 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,11 +64,12 @@
 
 #.IF "$(RES_GER)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=49
+completelangext+=49
 deut$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_49=deut
 longlang_49=german
 langext_49=49
-rsclang_49=-lgGERMAN $(IBM_PC_437)
+rsclang_49=-lgGERMAN 
 rescharset_49=$(deut$(LANG_GUI))
 RCLANGFLAGS_49+= -d GERMAN
 iso_49=de
@@ -78,11 +79,12 @@ defaultlangext=49
 .IF "$(RES_ENUS)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=01
 .ENDIF
+completelangext+=01
 enus$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_01=enus
 longlang_01=english_us
 langext_01=01
-rsclang_01=-lgENGLISH_US $(IBM_PC_437)
+rsclang_01=-lgENGLISH_US 
 rescharset_01=$(enus$(LANG_GUI))
 RCLANGFLAGS_01+= -d ENGLISH
 iso_01=en-US
@@ -91,11 +93,12 @@ iso_01=en-US
 .IF "$(RES_ITAL)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=39
 .ENDIF
+completelangext+=39
 ital$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_39=ital
 longlang_39=italian
 langext_39=39
-rsclang_39=-lgITALIAN $(IBM_PC_850)
+rsclang_39=-lgITALIAN 
 rescharset_39=$(ital$(LANG_GUI))
 RCLANGFLAGS_39+= -d ITALY
 iso_39=it
@@ -103,11 +106,12 @@ iso_39=it
 .IF "$(RES_SPAN)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=34
 .ENDIF
+completelangext+=34
 span$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_34=span
 longlang_34=spanish
 langext_34=34
-rsclang_34=-lgSPANISH $(IBM_PC_850)
+rsclang_34=-lgSPANISH 
 rescharset_34=$(span$(LANG_GUI))
 RCLANGFLAGS_34+= -d SPAIN
 iso_34=es
@@ -115,23 +119,25 @@ iso_34=es
 .IF "$(RES_FREN)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=33
 .ENDIF
+completelangext+=33
 fren$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_33=fren
 longlang_33=french
 langext_33=33
-rsclang_33=-lgFRENCH $(IBM_PC_850)
-rescharset_33=$(enus$(LANG_GUI))
+rsclang_33=-lgFRENCH 
+rescharset_33=$(fren$(LANG_GUI))
 RCLANGFLAGS_33+= -d FRENCH
 iso_33=fr
 
 .IF "$(RES_DTCH)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=31
 .ENDIF
+completelangext+=31
 dtch$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_31=dtch
 longlang_31=dutch
 langext_31=31
-rsclang_31=-lgDUTCH $(IBM_PC_850)
+rsclang_31=-lgDUTCH 
 rescharset_31=$(dtch$(LANG_GUI))
 RCLANGFLAGS_31+= -d DTCH
 iso_31=nl
@@ -139,22 +145,24 @@ iso_31=nl
 .IF "$(RES_DAN)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=45
 .ENDIF
+completelangext+=45
 dan$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_45=dan
 longlang_45=danish
 langext_45=45
-rsclang_45=-lgDANISH $(IBM_PC_850)
+rsclang_45=-lgDANISH 
 rescharset_45=$(dan$(LANG_GUI))
 iso_45=da
 
 .IF "$(RES_SWED)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=46
 .ENDIF
+completelangext+=46
 swed$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_46=swed
 longlang_46=swedish
 langext_46=46
-rsclang_46=-lgSWEDISH $(IBM_PC_850)
+rsclang_46=-lgSWEDISH 
 rescharset_46=$(swed$(LANG_GUI))
 RCLANGFLAGS_46+= -d SWED
 iso_46=sv
@@ -162,11 +170,12 @@ iso_46=sv
 .IF "$(RES_PORT)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=03
 .ENDIF 
+completelangext+=03
 port$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_03=port
 longlang_03=portuguese
 langext_03=03
-rsclang_03=-lgPORTUGUESE $(IBM_PC_850)
+rsclang_03=-lgPORTUGUESE 
 rescharset_03=$(port$(LANG_GUI))
 RCLANGFLAGS_03+= -d PORT
 iso_03=pt
@@ -174,6 +183,7 @@ iso_03=pt
 .IF "$(RES_JAPN)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=81
 .ENDIF
+completelangext+=81
 japn$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_81=japn
 longlang_81=japanese
@@ -186,6 +196,7 @@ iso_81=ja
 .IF "$(RES_CHINSIM)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=86
 .ENDIF 
+completelangext+=86
 chinsim$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_86=chinsim
 longlang_86=chinese_simplified
@@ -198,8 +209,8 @@ iso_86=zh-CN
 .IF "$(RES_CHINTRAD)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=88
 .ENDIF 
+completelangext+=88
 chintrad$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_chintrad:=chintrad 88 -lgCHINESE_TRADITIONAL $(chintrad$(LANG_GUI))
 lang_88=chintrad
 longlang_88=chinese_traditional
 langext_88=88
@@ -210,12 +221,12 @@ iso_88=zh-TW
 .IF "$(RES_RUSS)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=07
 .ENDIF
+completelangext+=07
 russ$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_russ:=russ 07 -lgRUSSIAN $(IBM_PC_852) $(russ$(LANG_GUI))
 lang_07=russ
 longlang_07=russian
 langext_07=07
-rsclang_07=-lgRUSSIAN $(IBM_PC_852)
+rsclang_07=-lgRUSSIAN 
 rescharset_07=$(russ$(LANG_GUI))
 RCLANGFLAGS_07+= -d RUSS
 iso_07=ru
@@ -223,12 +234,12 @@ iso_07=ru
 .IF "$(RES_POL)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=48
 .ENDIF 
+completelangext+=48
 pol$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_pol:=pol 48 -lgPOLISH $(IBM_PC_852) $(pol$(LANG_GUI))
 lang_48=pol
 longlang_48=polish
 langext_48=48
-rsclang_48=-lgPOLISH $(IBM_PC_852)
+rsclang_48=-lgPOLISH 
 rescharset_48=$(pol$(LANG_GUI))
 RCLANGFLAGS_48+= -d POLISH
 iso_48=pl
@@ -236,12 +247,12 @@ iso_48=pl
 .IF "$(RES_ARAB)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=96
 .ENDIF 
+completelangext+=96
 arab$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_arab:=arab 96 -lgARABIC $(IBM_PC_852) $(arab$(LANG_GUI))
 lang_96=arab
 longlang_96=arabic
 langext_96=96
-rsclang_96=-lgARABIC $(IBM_PC_852)
+rsclang_96=-lgARABIC 
 rescharset_96=$(arab$(LANG_GUI))
 RCLANGFLAGS_96+= -d ARABIC
 iso_96=ar
@@ -249,12 +260,12 @@ iso_96=ar
 .IF "$(RES_GREEK)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=30
 .ENDIF 
+completelangext+=30
 greek$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_greek:=greek 30 -lgGREEK $(IBM_PC_852) $(greek$(LANG_GUI))
 lang_30=greek
 longlang_30=greek
 langext_30=30
-rsclang_30=-lgGREEK $(IBM_PC_852)
+rsclang_30=-lgGREEK 
 rescharset_30=$(greek$(LANG_GUI))
 RCLANGFLAGS_30+= -d GREEK
 iso_30=el
@@ -262,12 +273,12 @@ iso_30=el
 .IF "$(RES_TURK)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=90
 .ENDIF 
+completelangext+=90
 turk$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_turk:=turk 90 -lgTURKISH $(IBM_PC_857) $(turk$(LANG_GUI))
 lang_90=turk
 longlang_90=turkish
 langext_90=90
-rsclang_90=-lgTURKISH $(IBM_PC_857)
+rsclang_90=-lgTURKISH 
 rescharset_90=$(turk$(LANG_GUI))
 RCLANGFLAGS_90+= -d TURKISH
 iso_90=tr
@@ -275,8 +286,8 @@ iso_90=tr
 .IF "$(RES_KOREAN)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=82
 .ENDIF 
+completelangext+=82
 korean$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_korean:=korean 82 -lgKOREAN $(IBM_PC_852) $(korean$(LANG_GUI))
 lang_82=korean
 longlang_82=korean
 langext_82=82
@@ -288,12 +299,12 @@ iso_82=ko
 .IF "$(RES_CAT)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=37
 .ENDIF 
+completelangext+=37
 catalan$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_catalan:=catalan 37 -lgCATALAN $(IBM_PC_850) $(catalan$(LANG_GUI))
 lang_37=catalan
 longlang_37=catalan
 langext_37=37
-rsclang_37=-lgCATALAN $(IBM_PC_850)
+rsclang_37=-lgCATALAN 
 rescharset_37=$(catalan$(LANG_GUI))
 RCLANGFLAGS_37+= -d CATALAN
 iso_37=ca
@@ -301,11 +312,12 @@ iso_37=ca
 .IF "$(RES_FINN)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=35
 .ENDIF          # "$(RES_FINN)"!="" || "$(give_me_all_languages)"!=""
+completelangext+=35
 finn$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_35=finn
 longlang_35=finnish
 langext_35=35
-rsclang_35=-lgFINNiSH $(IBM_PC_437)
+rsclang_35=-lgFINNiSH 
 rescharset_35=$(finn$(LANG_GUI))
 RCLANGFLAGS_35+= -d FINNISH
 iso_35=fi
@@ -313,6 +325,7 @@ iso_35=fi
 .IF "$(RES_THAI)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=66
 .ENDIF          # "$(RES_THAI)"!="" || "$(give_me_all_languages)"!=""
+completelangext+=66
 thai$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_66=thai
 longlang_66=thai
@@ -325,6 +338,7 @@ iso_66=th
 .IF "$(RES_HINDI)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=91
 .ENDIF          # "$(RES_HINDI)"!="" || "$(give_me_all_languages)"!=""
+completelangext+=91
 hindi$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_91=hindi
 longlang_91=hindi
@@ -337,27 +351,82 @@ iso_91=hi-IN
 .IF "$(RES_PORTBR)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=55
 .ENDIF 
+completelangext+=55
 portbr$(LANG_GUI)*=$(default$(LANG_GUI))
 lang_55=portbr
 longlang_55=portuguese_brazilian
 langext_55=55
-rsclang_55=-lgPORTUGUESE_BRAZILIAN $(IBM_PC_850)
+rsclang_55=-lgPORTUGUESE_BRAZILIAN 
 rescharset_55=$(portbr$(LANG_GUI))
 RCLANGFLAGS_55+= -d PORTBR
 iso_55=pt-BR
 
+.IF "$(RES_CZECH)"!="" || "$(give_me_all_languages)"!=""
+alllangext+=42
+.ENDIF 
+completelangext+=42
+czech$(LANG_GUI)*=$(default$(LANG_GUI))
+lang_42=czech
+longlang_42=czech
+langext_42=42
+rsclang_42=-lgCZECH 
+rescharset_42=$(czech$(LANG_GUI))
+RCLANGFLAGS_42+= -d CZECH
+iso_42=cs
+
+.IF "$(RES_SLOVAK)"!="" || "$(give_me_all_languages)"!=""
+alllangext+=43
+.ENDIF 
+completelangext+=43
+slovak$(LANG_GUI)*=$(default$(LANG_GUI))
+lang_43=slovak
+longlang_43=slovak
+langext_43=43
+rsclang_43=-lgSLOVAK 
+rescharset_43=$(slovak$(LANG_GUI))
+RCLANGFLAGS_43+= -d SLOVAK
+iso_43=sk
+
+.IF "$(RES_ESTONIAN)"!="" || "$(give_me_all_languages)"!=""
+alllangext+=77
+.ENDIF 
+completelangext+=77
+estonian$(LANG_GUI)*=$(default$(LANG_GUI))
+lang_77=estonian
+longlang_77=estonian
+langext_77=77
+rsclang_77=-lgESTONIAN 
+rescharset_77=$(estonian$(LANG_GUI))
+RCLANGFLAGS_77+= -d ESTONIAN
+iso_77=et
+
+.IF "$(RES_HEBREW)"!="" || "$(give_me_all_languages)"!=""
+alllangext+=97
+.ENDIF 
+completelangext+=97
+hebrew$(LANG_GUI)*=$(default$(LANG_GUI))
+lang_97=hebrew
+longlang_97=hebrew
+langext_97=97
+rsclang_97=-lgHEBREW 
+rescharset_97=$(hebrew$(LANG_GUI))
+RCLANGFLAGS_97+= -d HEBREW
+iso_97=he
+
 .IF "$(L10N_framework)"!=""
 .IF "$(native_lang_list)"!=""
 helplist=$(uniq $(alllangext) $(native_lang_list))
+helplist2=$(uniq $(completelangext) $(native_lang_list))
 alllangext!:=$(helplist)
+completelangext!:=$(helplist2)
 .ENDIF          # "$(native_lang_list)"!=""
+completelangext+=99
 alllangext+=99
 extern$(LANG_GUI)*=$(default$(LANG_GUI))
-cmd_extern:=extern 99 -lgEXTERN $(UTF8) $(extern$(LANG_GUI))
 lang_99=extern
 longlang_99=extern
 langext_99=99
-rsclang_99=-lgEXTERN $(UTF8)
+rsclang_99=-lgEXTERN
 rescharset_99=$(extern$(LANG_GUI))
 RCLANGFLAGS_99+= -d EXTERN
 iso_99=$(L10N_framework)
diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h
index 00aa89bedb39..bc4111943543 100644
--- a/solenv/inc/preinclude.h
+++ b/solenv/inc/preinclude.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: preinclude.h,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hjs $ $Date: 2001-12-11 19:29:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 11:48:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,4 +68,5 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-
+#include <features.h>
+#include <assert.h>
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
deleted file mode 100644
index df6131cd4c06..000000000000
--- a/solenv/inc/premac.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************
-#*
-#*    $Workfile:   svpm.h  $
-#*
-#*    Ersterstellung    DV 01.10.97
-#*    Letzte Aenderung  $Author: pluby $ $Date: 2001-03-11 17:45:21 $
-#*    $Revision: 1.4 $
-#*
-#*    $Logfile:   T:/tools/os2/inc/svpm.h_v  $
-#*
-#*    Copyright (c) 2000, Sun Microsystems, Inc.
-#*
-#*************************************************************************
-
-      Source Code Control System - Header
-
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/solenv/inc/premac.h,v 1.4 2001-03-11 17:45:21 pluby Exp $
-
-      Source Code Control System - Update
-
-      $Log: not supported by cvs2svn $
-      Revision 1.3  2000/11/28 19:13:56  pluby
-      Added Line to #define and #undef statements.
-
-      Revision 1.2  2000/09/27 22:52:33  patrick.luby
-      Updates to handle <AppKit/AppKit.h> includes
-
-      Revision 1.1.1.1  2000/09/20 14:43:16  hr
-      initial import
-
-      Revision 1.2  2000/06/26 17:08:58  patrick.luby
-      Updated files so that the %minor.mk dmake recipe will work for developers who
-      must use rsync to get the solver directories.
-
-      Revision 1.1  2000/06/11 09:18:58  patrick.luby
-      Updates to support SRC591 build on Mac OS X.
-
-      Revision 1.2  1997/10/15 12:26:32  dv
-      MacOSPtr und MacOSBoolean neu
-
-      Revision 1.1  1997/10/01 06:45:41  dv
-      First checked in
-
-
-*************************************************************************/
-
-#define Boolean MacOSBoolean
-#define Button MacOSButton
-#define Byte MacOSByte
-#define Control MacOSControl
-#define Cursor MacOSCursor
-#define FontInfo MacOSFontInfo
-#define MemoryBlock MacOSMemoryBlock
-#define Point MacOSPoint
-#define Size MacOSSize
-#define Region MacOSRegion
-#define Polygon MacOSPolygon
-#define Ptr MacOSPtr
-#define Palette MacOSPalette
-#define LSize MacOSLSize
-#define ModalDialog MacOSModalDialog
-#define SetCursor MacOSSetCursor
-#define ShowWindow MacOSShowWindow
-#define StringPtr MacOSStringPtr
-#define DirInfo MacOSDirInfo
-#define BOOL MacOSBOOL
-#define ULONG MacOSULONG
-#define Line MacOSLine
-#define TimeValue MacOSTimeValue
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index a758de7275db..ea2296a057f9 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: pstrules.mk,v $
 #
-#   $Revision: 1.24 $
+#   $Revision: 1.25 $
 #
-#   last change: $Author: hjs $ $Date: 2002-10-18 09:36:01 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:11 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -73,18 +73,18 @@ SVXLIGHTDEFS=-DSVX_LIGHT
 $(OBJ)$/sxl_%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
-.IF "$(GUI)"=="WNT"
-.IF "$(SPEW)"!=""
-    @+-spew x:\er\stardiv.spw
-.ENDIF
-.ENDIF
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
-    @+-$(RM) $@ >& $(NULLDEV)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.IF "$(COM)"=="BLC"
+    @+if exist $@ $(RM) /q $@ >& nul
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+.ELSE
+    @+if exist $@ $(RM) /q $@ >& nul
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.ENDIF
 .ENDIF
 
 .ENDIF			# "$(SVXLIGHTOBJFILES)"!=""
@@ -96,18 +96,18 @@ SVXLIGHTDEFS=-DSVX_LIGHT
 $(SLO)$/sxl_%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
-.IF "$(GUI)"=="WNT"
-.IF "$(SPEW)"!=""
-    @+-spew x:\er\stardiv.spw
-.ENDIF
-.ENDIF
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/sxl_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
-    @+-$(RM) $@ >& $(NULLDEV)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.IF "$(COM)"=="BLC"
+    @+if exist $@ $(RM) /q $@ >& nul
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+.ELSE
+    @+if exist $@ $(RM) /q $@ >& nul
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(SVXLIGHTDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/sxl_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.ENDIF
 .ENDIF
 
 .ENDIF			# "$(SVXLIGHTSLOFILES)"!=""
@@ -125,18 +125,18 @@ $(SLO)$/sxl_%.obj : %.cxx
 $(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
-.IF "$(GUI)"=="WNT"
-.IF "$(SPEW)"!=""
-    @+-spew x:\er\stardiv.spw
-.ENDIF
-.ENDIF
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
-    @+-$(RM) $@ >& $(NULLDEV)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.IF "$(COM)"=="BLC"
+    @+if exist $@ $(RM) /q $@ >& nul
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+.ELSE
+    @+if exist $@ $(RM) /q $@ >& nul
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.ENDIF
 .ENDIF
 
 $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
@@ -144,16 +144,19 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+    $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
+    $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ENDIF
 .ELSE
-    @+-$(RM) $@ >& $(NULLDEV)
+.IF "$(GUI)"=="MAC"
+    @$(RM) $@
+    $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+.ELSE
     @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
-    @+$(ECHONL)
+    @+echo.
 .IF "$(COM)"=="GCC"
     $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
 .ELSE
@@ -161,6 +164,7 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
 .ENDIF
     $(SEMADEBUG)
 .ENDIF
+.ENDIF
 
 .ENDIF			# "$($(SECOND_BUILD)_OBJFILES)"!=""
 
@@ -169,18 +173,18 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c
 $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
-.IF "$(GUI)"=="WNT"
-.IF "$(SPEW)"!=""
-    @+-spew x:\er\stardiv.spw
-.ENDIF
-.ENDIF
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
-    @+-$(RM) $@ >& $(NULLDEV)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.IF "$(COM)"=="BLC"
+    @+if exist $@ $(RM) /q $@ >& nul
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx)
+.ELSE
+    @+-$(RM) $@
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx
+.ENDIF
 .ENDIF
 
 $(SLO)$/$(SECOND_BUILD)_%.obj :  %.c
@@ -188,10 +192,14 @@ $(SLO)$/$(SECOND_BUILD)_%.obj :  %.c
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(cc) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
+    $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
-    @+-$(RM) $@ >& $(NULLDEV)
+.IF "$(GUI)"=="MAC"
+    @$(RM) $@
+    $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(shell $(UNIX2MACPATH) $@ $*.c)
+.ELSE
+    @+-$(RM) $@
 .IF "$(COM)"=="GCC"
        $(CC) $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c 
 .ELSE
@@ -199,6 +207,7 @@ $(SLO)$/$(SECOND_BUILD)_%.obj :  %.c
        $(CC) @$(mktmp $(CFLAGS:s/stl//) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c )
 .ENDIF
 .ENDIF
+.ENDIF
 
 .ENDIF			# "$($(SECOND_BUILD)_SLOFILES)"!=""
 .ENDIF			# "$(SECOND_BUILD)"!=""
@@ -216,9 +225,11 @@ $(PAR)$/%.par :
     @echo ------------------------------
     @echo Making: $@
     @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
-    +$(PERL) $(SOLARENV)$/bin$/scp_control.pl $(*:b).scp
+.IF "$(GUI)"=="OS2"
+    $(CXX) /P+ /Pe+ /Pd+ $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+.ENDIF
 .IF "$(GUI)"=="WNT"
-    $(CPPLCC) -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+    cpplcc -+ -P $(INCLUDE) -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
 .ENDIF
 .IF "$(GUI)"=="UNX"
 .IF "$(OS)"=="SOLARIS"
@@ -227,10 +238,7 @@ $(PAR)$/%.par :
     cpp.lcc -+ -P -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) $(SCPDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
 .ENDIF
 .ENDIF
-    +$(PERL) $(SOLARENV)$/bin$/scp_setcomma.pl $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre2
-    +$(SCPCOMP) -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre2 -o $@
-    @+$(RM) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre2
-    @+$(RM) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre
+    +scpcomp -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@
 
 .ENDIF			# "$(PARFILES)"!=""
 
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 15d31af83150..4bfc48aec9a7 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: rules.mk,v $
 #
-#   $Revision: 1.48 $
+#   $Revision: 1.49 $
 #
-#   last change: $Author: hjs $ $Date: 2002-10-25 16:14:10 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:11 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -62,52 +62,39 @@
 
 MKFILENAME:=RULES.MK
 
-.IF	"$(debug)"!=""
-SEMADEBUG=echo $(VCSID) hat das File $@ mit debug=$(debug) uebersetzt >$(MISC)\$*.!d!
-.ELSE
-#SEMADEBUG=@+rem dummy
-.ENDIF
-
 $(OBJ)$/%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
-.IF "$(GUI)"=="WNT"
-.IF "$(SPEW)"!=""
-    @+-spew x:\er\stardiv.spw
-.ENDIF
-.ENDIF
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
     @+-$(RM) $@ >& nul
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
     @+$(ECHONL)
 .IF "$(COM)"=="GCC"
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx 
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx 
 .ELSE
-    $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
 .ENDIF
 .ENDIF
 
 $(OBJ)$/%.obj : %.cpp
     @echo ------------------------------
     @echo Making: $@
-.IF "$(GUI)"=="WNT"
-.ENDIF
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
     @+-$(RM) $@ >& nul
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
     @+$(ECHONL)
 .IF "$(COM)"=="GCC"
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp 
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp 
 .ELSE
-    $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
 .ENDIF
 .ENDIF
 
@@ -115,24 +102,19 @@ $(OBJ)$/%.obj : %.cpp
 $(SLO)$/%.obj : %.cxx
     @echo ------------------------------
     @echo Making: $@
-.IF "$(GUI)"=="WNT"
-.IF "$(SPEW)"!=""
-    @+-spew x:\er\stardiv.spw
-.ENDIF
-.ENDIF
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ENDIF
 .ELSE			# "$(GUI)"=="UNX"
     @+-$(RM) $@ >& nul
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
     @+$(ECHONL)
-    $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx )
 .ENDIF			# "$(GUI)"=="UNX"
 
 $(SLO)$/%.obj : %.cpp
@@ -140,17 +122,17 @@ $(SLO)$/%.obj : %.cpp
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(PWD)$/$*.cpp
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ENDIF
 .ELSE
     @+-$(RM) $@ >& nul
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
     @+$(ECHONL)
-    $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp )
 .ENDIF
 
 $(SLO)$/%.obj : $(MISC)$/%.cxx
@@ -158,16 +140,16 @@ $(SLO)$/%.obj : $(MISC)$/%.cxx
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ENDIF
 .ELSE
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
     @+$(ECHONL)
-    $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
 .ENDIF
 
 $(OBJ)$/%.obj : $(MISC)$/%.cxx
@@ -175,16 +157,16 @@ $(OBJ)$/%.obj : $(MISC)$/%.cxx
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) -E  $(CFLAGSINCXX)$(MISC)$/$*.cxx
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHOBJFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ENDIF
 .ELSE
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
     @+$(ECHONL)
-    $(CC) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
+    $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx )
 .ENDIF
 
 $(OBJ)$/%.obj : %.c
@@ -192,22 +174,21 @@ $(OBJ)$/%.obj : %.c
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
-    $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+    $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
 .ELSE
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
+    $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ENDIF
 .ELSE
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
     @+$(ECHONL)
 .IF "$(COM)"=="GCC"
-    $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
+    $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c
 .ELSE
     +-@echo Cflags: $(CFLAGS)
     $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c )
 .ENDIF
-    $(SEMADEBUG)
 .ENDIF
 
 $(OBJ)$/%.obj : $(MISCX)$/%.c
@@ -215,14 +196,13 @@ $(OBJ)$/%.obj : $(MISCX)$/%.c
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
+    $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISCX)$/$*.c
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
     @+-$(RM) $@ >& nul
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
     @+$(ECHONL)
-    $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
-    $(SEMADEBUG)
+    $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c )
 .ENDIF
 
 $(SLO)$/%.obj : $(MISCX)$/%.c
@@ -230,18 +210,17 @@ $(SLO)$/%.obj : $(MISCX)$/%.c
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
+    $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISCX)$/$*.c
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
     @+-$(RM) $@ >& nul
-    @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+    @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
     @+$(ECHONL)
 .IF "$(COM)"=="GCC"
-    $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c 
+    $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c 
 .ELSE
-    $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
+    $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c )
 .ENDIF
-    $(SEMADEBUG)
 .ENDIF
 
 $(SLO)$/%.obj : %.c
@@ -249,14 +228,14 @@ $(SLO)$/%.obj : %.c
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
-    $(cc) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
+    $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c
     +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@
 .ELSE
     @+-$(RM) $@ >& nul
 .IF "$(COM)"=="GCC"
-       $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
+       $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c 
 .ELSE
-       $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
+       $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c )
 .ENDIF
 .ENDIF
 
@@ -531,7 +510,7 @@ $(MISC)$/%.dpsc :
     @echo Making: $@ $(noout)
     @+-$(RM) $@ >& $(NULLDEV)
     @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
-    @$(MAKEDEPEND) -f - -p$(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/ -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $@
+    @$(MAKEDEPEND) -f - -p$(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/ -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@
 .IF "$(LAZY_DEPS)"==""	
     @+echo $@ : $(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).par  >> $@
     @+echo $(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).par : $(*:b).scp >> $@
@@ -546,7 +525,7 @@ $(MISC)$/%.dprc :
     @echo Making: $@ $(noout)
     @+-$(RM) $@ >& $(NULLDEV)
     @+-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} >& $(NULLDEV)
-    @$(MAKEDEPEND) -f - -p$(RES)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/ -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).rc >> $@
+    @$(MAKEDEPEND) -f - -p$(RES)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/ -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLSUFFIX=$(DLLSUFFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)$/inc $(*:b).rc >> $@
 .IF "$(LAZY_DEPS)"==""	
     @+echo $@ : $(RES)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).res  >> $@
 .ELSE			# "$(LAZY_DEPS)"==""	
@@ -586,7 +565,7 @@ $(MISC)$/%.dpz :
 
 # Dependencies fuer java - Files
 
-$(MISC)$/%.dpj : makefile.mk
+$(MISC)$/%.dpj :
     @+echo Making dpj...
 .IF "$(nodep)"!=""
 .IF "$(GUI)"=="UNX"
@@ -619,7 +598,6 @@ $(SLO)$/%.obj : %.asm
 .ENDIF			# "$(ASM)"=="ml"
 .ENDIF			 "$(COM)"=="MSC"
 .ENDIF
-       @$(SEMADEBUG)
 
 $(OBJ)$/%.obj : %.asm
        @echo ------------------------------
@@ -633,7 +611,7 @@ $(OBJ)$/%.obj : %.asm
         $(ASM) $(AFLAGS) $*.asm,$(OBJ)\$*.obj;
 .ENDIF			# "$(ASM)"=="ml"
 .ENDIF			 "$(COM)"=="MSC"
-       @$(SEMADEBUG)
+
 #
 # keine rule fuer *.java - abh. innerhalb eines packages!
 #
diff --git a/solenv/inc/set_ext.mk b/solenv/inc/set_ext.mk
index 487b580df921..96e8b79cf26b 100644
--- a/solenv/inc/set_ext.mk
+++ b/solenv/inc/set_ext.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: set_ext.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: hjs $ $Date: 2001-10-08 17:29:00 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:11 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,11 +70,11 @@ wrapper_use_clean_sourcecheck=TRUE
 
 #defaults
 TARFILE_ROOTDIR*=$(TARFILE_NAME)
-UNTAR_FLAG_FILE*=so_unpacked
-ADD_FILES_FLAG_FILE*=so_addfiles
-PATCH_FLAG_FILE*=so_patched
-CONFIGURE_FLAG_FILE*=so_configured
-BUILD_FLAG_FILE*=so_built
-INSTALL_FLAG_FILE*=so_installed
-PREDELIVER_FLAG_FILE*=so_predeliver
+UNTAR_FLAG_FILE*=so_unpacked_$(TARGET)
+ADD_FILES_FLAG_FILE*=so_addfiles_$(TARGET)
+PATCH_FLAG_FILE*=so_patched_$(TARGET)
+CONFIGURE_FLAG_FILE*=so_configured_$(TARGET)
+BUILD_FLAG_FILE*=so_built_$(TARGET)
+INSTALL_FLAG_FILE*=so_installed_$(TARGET)
+PREDELIVER_FLAG_FILE*=so_predeliver_$(TARGET)
 
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 43b2b8d7e9b2..d745fba4b499 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: settings.mk,v $
 #
-#   $Revision: 1.128 $
+#   $Revision: 1.129 $
 #
-#   last change: $Author: rt $ $Date: 2002-12-10 17:02:03 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:11 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -179,7 +179,7 @@ CDEFSDBGUTIL=
 CDEFSOPT=
 HDEFS=
 
-CC=
+#CC=
 .IF "$(add_cflags)"!=""
 ENVCFLAGS+=$(add_cflags)
 .ENDIF
@@ -213,7 +213,7 @@ PCHSLOFLAGSU=
 
 CFLAGSINCXX=
 
-LINK=
+#LINK=
 LINKFLAGS=
 LINKFLAGSAPPGUI=
 LINKFLAGSSHLGUI=
@@ -278,7 +278,7 @@ AS=
 BC=
 COBOL=
 CPP=
-CXX=
+#CXX=
 FOR=
 PASCAL=
 
@@ -425,7 +425,7 @@ common_build*=$(COMMON_BUILD)
 use_shl_versions*=$(USE_SHL_VERSIONS)
 .ENDIF
 
-# --- env flags nicht case sensitiv --------------------------------
+# --- env flags not case sensitive --------------------------------
 
 .IF "$(envcflags)"!=""
 ENVCFLAGS*=$(envcflags)
@@ -498,6 +498,7 @@ product!=demo
 product!=compact
 .ENDIF
 .ELSE
+optimize!=true
 dbgutil!=true
 .ENDIF
 
@@ -732,8 +733,6 @@ SLB=$(OUT)$/slb
 # wir haben ein ucr verzeichnis
 UCR=$(OUT)$/ucr
 
-SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR)
-
 # $(L) nur noch pfad ins solver\upd\...\lib
 #L:={$(LB);$(SLB);$(ILIB)}
 L=$(SOLARLIBDIR)
@@ -915,6 +914,12 @@ INCCOMX=$(LDINC)$/comp
 
 # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
 
+.IF "$(common_build)"!=""
+SOLARIDLDIR=$(SOLARVERSION)$/common$(PROEXT)$/idl$(EXT_UPDMINOR)
+.ELSE
+SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR)
+.ENDIF
+
 .IF "$(UPDMINOR)" != ""
 EXT_UPDMINOR=.$(UPDMINOR)
 .ELSE
@@ -923,7 +928,6 @@ EXT_UPDMINOR=
 SOLARRESDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)
 SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(EXT_UPDMINOR)
 SOLARLIBDIR=$(SOLARVERSION)$/$(INPATH)$/lib$(EXT_UPDMINOR)
-SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(EXT_UPDMINOR)
 SOLARJAVADIR=$(SOLARVERSION)$/$(INPATH)$/java$(EXT_UPDMINOR)
 SOLARINCDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR)
 SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(EXT_UPDMINOR)
@@ -938,7 +942,12 @@ SOLARUCRDIR=$(SOLARVERSION)$/$(INPATH)$/ucr$(EXT_UPDMINOR)
 SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(EXT_UPDMINOR)
 SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(EXT_UPDMINOR)
 SOLARDOCDIR=$(SOLARVERSION)$/$(INPATH)$/doc$(EXT_UPDMINOR)
+SOLARPCKDIR=$(SOLARVERSION)$/$(INPATH)$/pck$(EXT_UPDMINOR)
 SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(EXT_UPDMINOR)
+.IF "$(common_build)"==""
+SOLARCOMMONBINDIR=$(SOLARBINDIR)
+.ENDIF
+
 
 # Full-Debug Pfade
 .IF "$(debug)" != ""
@@ -983,7 +992,6 @@ LIB:=$(LB);$(SLB);$(ILIB)
 CPUNAME=CPUNAME_HAS_TO_BE_SET_IN_ENVIRONMENT
 .ENDIF
 
-#.IF "$(BUILD_SOSL)"!=""
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
 DATESTRING:=$(shell date +%d%m%Y)
 .ELSE			# "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -991,7 +999,6 @@ DATESTRING:=$(shell date +%d%m%Y)
 DATESTRING:=$(shell +echo %@IF[%@LEN[%_DAY%]==1,0%_DAY%,%_DAY%]%@IF[%@LEN[%_MONTH%]==1,0%_MONTH%,%_MONTH%]%_YEAR%)
 .ENDIF			# "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
 SCPDEFS+=-DSCP_DATESTRING=$(DATESTRING)
-#.ENDIF			# "$(BUILD_SOSL)"!=""
 
 
 .IF "$(UDK_MAJOR)"!=""
@@ -1066,8 +1073,8 @@ CDEFSDBGUTIL=-DDBG_UTIL
 CDEFSOPT=-DOPTIMIZE
 HDEFS=-D:$(GUI) -D:$(COM)
 
-MKDEPFLAGS=-D_SOLAR__PRIVATE -I$(INCDEPN:s/ / -I/) $(INCPRE:^"-I":s/-I-I/-I/)
-MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
+MKDEPFLAGS=-D_SOLAR__PRIVATE -I$(INCDEPN:s/ / -I/)
+MKDEPALLINC=$(SOLARINC:s/-I/ -I/) $(INCPRE:^"-I":s/-I-I/-I/)
 MKDEPPREINC=-I$(PREPATH)$/$(INPATH)$/inc$(UPDMINOREXT)
 MKDEPSOLENV=-I$(SOLARENV)$/inc -I$(SOLARENV)$/$(GUI)$(CVER)$(COMEX)$/inc
 MKDEPSOLVER=-I$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) -I$(SOLARVERSION)$/$(INPATH)$/inc
diff --git a/solenv/inc/startup/FREEBSD/macros.mk b/solenv/inc/startup/FREEBSD/macros.mk
deleted file mode 100644
index 5387b1940198..000000000000
--- a/solenv/inc/startup/FREEBSD/macros.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-
-.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk
diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index 09ce546307ca..85b6b829449e 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -17,7 +17,6 @@ __.silent !:= $(.SILENT)	# Preserve user's .SILENT flag
 .SILENT   !:= yes
 .NOTABS	  !:= yes
 .ERROR :
-    @+echo found ERROR
     @echo ---* $(MKFILENAME) *---
 
 # Define the directory separator string.
@@ -100,7 +99,7 @@ MAXLINELENGTH	= 65530
    RMTARGET      *=  $<
 
 # Default recipe that is used to remove intermediate targets.
-.REMOVE :; +-echo dummy remove #$(RM) $(RMFLAGS) $(RMTARGET)
+.REMOVE :; #+-echo dummy remove #$(RM) $(RMFLAGS) $(RMTARGET)
 #.REMOVE :; echo $(RM) $(RMFLAGS) $(RMTARGET)
 
 dummy_mh:
@@ -146,7 +145,7 @@ NULLPRQ *:= __.NULLPRQ
 
    # Standard C-language command names and flags
    CPP	      *:= $/lib$/cpp	# C-preprocessor
-   CC         *:= cc		# C   compiler
+#   CC         *:= cc		# C   compiler
    CFLAGS     *=		# C   compiler flags
    "C++"      *:= CC		# C++ Compiler
    "C++FLAGS" *=                # C++ Compiler flags
diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk
index 1a7a4fc61567..1a59318d509f 100644
--- a/solenv/inc/startup/wnt/macros.mk
+++ b/solenv/inc/startup/wnt/macros.mk
@@ -42,7 +42,7 @@ V *:= 		# RCS suffix
 #   DIVFILE          *=  $(TMPFILE:s,/,\)
    RM               *=  del
 #   RM               *=  +-del
-   RMFLAGS          *= /y /E
+   RMFLAGS          *= /y
    MV	            *=  rename
    __.DIVSEP-sh-yes *:= \\
    __.DIVSEP-sh-no  *:= \\
@@ -66,6 +66,10 @@ V *:= 		# RCS suffix
    __.DIVSEP-sh-yes *:= \\\
    __.DIVSEP-sh-no  *:= \\
    DIRSEPSTR :=/
+# See IZ 11093 why PWD has to be overwritten
+   PWD:=$(shell +pwd)
+.EXPORT : PWD
+
 .ENDIF
 
 
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index d6d442de0585..59a09efe8ec2 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.131 $
+#   $Revision: 1.132 $
 #
-#   last change: $Author: rt $ $Date: 2002-11-06 14:50:21 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:12 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,7 +76,7 @@ INCEXT*=.
 INCPRE*=.
 INCPOST*=.
 .IF "$(PRE)"!=""
-INCPRE+=-I$(PRE)$/inc
+ENVINCPRE+=-I$(PRE)$/inc
 .ENDIF			# "$(PRE)"!=""
 .IF "$(LOCAL_SOLENV)"!=""
 SOLARINC+=$(JDKINCS)
@@ -85,9 +85,9 @@ SOLARINC+=$(DB2INC)
 SOLARINC+=$(DAOINC)
 .ENDIF "$(LOCAL_SOLENV)"!=""
 .IF "$(PRJINC)"!=""
-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCLOCPRJ) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCLOCPRJ) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
 .ELSE		# "$(PRJINC)"!=""
-INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
+INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST)
 .ENDIF		# "$(PRJINC)"!=""
 .EXPORT : LIB
 # --- Compiler -----------------------------------------------------
@@ -186,19 +186,6 @@ something_wrong_with_objects :
 
 .INCLUDE : postset.mk
 
-.IF "$(UPDATER)"!=""
-.IF "$(BUILD_SOSL)"==""
-.IF "$(PRJNAME)"=="vcl"
-.IF "$(REMOTE_BUILD_FLAG)" == ""
-.IF "$(remote)" == ""
-#REMOTE_BUILD=do_it_remote
-#REMOTE_DEPEND=do_it_remote
-.ENDIF          # "$(remote)" == ""
-.ENDIF          # "$(REMOTE_BUILD_FLAG)" == ""
-.ENDIF          # "$(PRJNAME)"=="vcl"
-.ENDIF          # "$(BUILD_SOSL)"!=""
-.ENDIF          # "$(UPDATER)"!=""
-
 .IF "$(depend)" == ""
 
 # -------
@@ -551,9 +538,9 @@ JAVATARGET:=$(MISC)$/$(TARGET)_dummy.java
 .IF "$(JARTARGET)"!=""
 JARCLASSDIRS*=.
 .IF "$(NEW_JAR_PACK)"!=""
-JARMANIFEST*=META-INF$/MANIFEST.MF
+JARMANIFEST*=$(CLASSDIR)$/META-INF$/MANIFEST.MF
 .ENDIF			# "$(NEW_JAR_PACK)"!=""
-JARTARGETN=$(JARTARGET)
+JARTARGETN=$(CLASSDIR)$/$(JARTARGET)
 .IF "$(NOJARDEP)$(NEW_JAR_PACK)"==""
 JARTARGETDEP=$(JARTARGET).dep
 JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
@@ -1772,19 +1759,22 @@ TARGETDPJ=$(MISC)$/$(TARGET).dpj
 .ENDIF			# "$(L10N_framework)"==""
 .ENDIF
 
-.IF "$(UPDATER)"=="YES"
+#.IF "$(UPDATER)"=="YES"
 #.IF "$(product)"!=""
-.IF "$(GEN_HID)"!=""
-.IF "$(no_hids)"==""
-.IF "$(BUILD_SOSL)" == ""
+.IF "$(no_hids)$(NO_HIDS)"==""
+#.IF "$(BUILD_SOSL)" == ""
 .IF "$(GUI)"=="WNT"
-PRJHIDTARGET=$(MISC)$/$(PRJNAME).hid
+.IF "$(GEN_HID_OTHER)"!=""
+PRJHIDOTHERTARGET=$(SRS)$/hidother.hid
 .ENDIF
+.IF "$(GEN_HID)"!=""
+PRJHIDTARGET=$(MISC)$/$(PRJNAME).hid
 .ENDIF
+#.ENDIF
 .ENDIF
 .ENDIF
 #.ENDIF
-.ENDIF
+#.ENDIF
 
 .IF "$(OS2_SOLENV_INC)"!=""
 OS2_COPY_MK=do_copy_mk
@@ -2005,6 +1995,7 @@ ALLTAR: $(MAKELANGDIR)	$(MAKEDEMODIR)	$(MAKECOMPDIR) $(MAKEXLDIR)	\
         $(RESLIBSPLIT3TARGETN) $(RESLIBSPLIT4TARGETN)\
         $(RESLIBSPLIT5TARGETN) $(RESLIBSPLIT6TARGETN)\
         $(RESLIBSPLIT7TARGETN) \
+        $(PRJHIDOTHERTARGET) \
         $(PRJHIDTARGET) \
                 $(SIGNFORNETSCAPE) \
                 $(SIGNFOREXPLORER) \
@@ -2050,9 +2041,9 @@ CPPUMAKERFLAGS*=-L
 .IF "$(SINGLE_SHOT)"==""
 # makeing all in one
 .DIRCACHE=no
-.IF "$(INCPRE))"!=""
-MKDEPFLAGS+=-I:$(INCPRE)
-.ENDIF			# "$(INCPRE))"!=""
+.IF "$(ENVINCPRE))"!=""
+MKDEPFLAGS+=-I:$(ENVINCPRE)
+.ENDIF			# "$(ENVINCPRE))"!=""
 .IF "$(OBJFILES)"!=""
 $(OBJFILES) : $(UNOUCRHEADER)
 .ENDIF			# "$(OBJFILES)"!=""
@@ -2168,7 +2159,7 @@ $(SCP_PRODUCT_TYPE):
 
 .ENDIF			# "$(PARFILES)"!=""
 
-$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg :
+"$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg" :
     +$(TOUCH) $@
 
 .IF "$(COMPVERMK)"!=""
@@ -2479,9 +2470,9 @@ $(PROJECTPCHTARGET) .PHONY :
 $(PROJECTPCHTARGET) : $(PROJECTPCHSOURCE).cxx
 .IF "$(COM)"=="MSC" || "(COM)"=="BLC"
 .IF "$(PROJECTPCH4DLL)" != ""
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(PCHSLOFLAGSC) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSOUTOBJ)$(SLO)$/$(PROJECTPCH).obj $(PROJECTPCHSOURCE).cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(PCHSLOFLAGSC) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSOUTOBJ)$(SLO)$/$(PROJECTPCH).obj $(PROJECTPCHSOURCE).cxx
 .ELSE
-    $(CC) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSC) $(CDEFS) $(CDEFSOBJ) $(CFLAGSOUTOBJ)$(OBJ)$/$(PROJECTPCH).obj $(PROJECTPCHSOURCE).cxx
+    $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSC) $(CDEFS) $(CDEFSOBJ) $(CFLAGSOUTOBJ)$(OBJ)$/$(PROJECTPCH).obj $(PROJECTPCHSOURCE).cxx
 .ENDIF
 .ENDIF
 .ENDIF			# "$(PROJECTPCH_FLAG)"!=""
@@ -2561,7 +2552,6 @@ $(EXCEPTIONSNOOPTFILES):
 
 .IF "$(REMOTE_BUILD)"!=""
 .IF "$(UPDATER)"!=""
-.IF "$(BUILD_SOSL)"==""
 .IF "$(PRJNAME)"=="vcl"
 .IF "$(REMOTE_BUILD_FLAG)" == ""
 .IF "$(remote)" == ""
@@ -2572,7 +2562,6 @@ $(REMOTE_BUILD):
 .ENDIF          # "$(remote)" == ""
 .ENDIF          # "$(REMOTE_BUILD_FLAG)" == ""
 .ENDIF          # "$(PRJNAME)"=="vcl"
-.ENDIF          # "$(BUILD_SOSL)"==""
 .ENDIF          # "$(UPDATER)"!=""
 .ENDIF			# "$(REMOTE_BUILD)"!=""
 
@@ -2885,13 +2874,13 @@ $(INCCOM)$/_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkch
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
         @+echo "#define" _BUILD \"$(BUILD)\"	> $@
         @+echo "#define" _UPD \"$(UPD)\"		>> $@
-        @+echo "#define" _LAST_MINOR \'$(LAST_MINOR)\'	>> $@
+        @+echo "#define" _LAST_MINOR \"$(LAST_MINOR)\"	>> $@
         @+echo '#define _RSCREVISION "$(RSCREVISION)"' >> $@
         @+echo "#define" _INPATH \"$(INPATH)\"	>> $@
 .ELSE
         @+echo #define _BUILD "$(BUILD)"	> $@
         @+echo #define _UPD "$(UPD)"		>> $@
-        @+echo #define _LAST_MINOR '$(LAST_MINOR)'	>> $@
+        @+echo #define _LAST_MINOR "$(LAST_MINOR)"	>> $@
         @+echo #define _DLL_POSTFIX "$(DLL_POSTFIX)">> $@
         @+echo #define _RSCREVISION "$(RSCREVISION)">> $@
         @+echo #define _INPATH "$(INPATH)"	>> $@
@@ -2912,7 +2901,13 @@ warn_target_empty:
 UNOUCRDEPxxx : $(UNOUCRDEP);
 .ENDIF			# "$(UNOTYPES)" != ""
 
-$(MISC)$/$(PRJNAME).hid : $(RESLIB1SRSFILES)
+$(SRS)$/hidother.hid : hidother.src
+    @+echo Making $@ :
+    @+echo ---------------
+    @+mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE)
+    @+echo done Making $@
+
+$(MISC)$/$(PRJNAME).hid : $(RESLIB1SRSFILES) $(PRJHIDOTHERTARGET)
     @echo Making $@ :
     @echo ---------------
     @+if exist $@ del $@
@@ -2957,7 +2952,6 @@ ALLTAR : ALLDEP \
 
 .IF "$(REMOTE_DEPEND)"!=""
 .IF "$(UPDATER)"!=""
-.IF "$(BUILD_SOSL)"==""
 .IF "$(PRJNAME)"=="vcl"
 .IF "$(REMOTE_BUILD_FLAG)" == ""
 .IF "$(remote)" == ""
@@ -2968,7 +2962,6 @@ $(REMOTE_DEPEND):
 .ENDIF          # "$(remote)" == ""
 .ENDIF          # "$(REMOTE_BUILD_FLAG)" == ""
 .ENDIF          # "$(PRJNAME)"=="vcl"
-.ENDIF          # "$(BUILD_SOSL)"==""
 .ENDIF          # "$(UPDATER)"!=""
 .ENDIF			# "$(REMOTE_DEPEND)"!=""
 
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index c4a2ef441e0e..194cd8d19259 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_app.mk,v $
 #
-#   $Revision: 1.37 $
+#   $Revision: 1.38 $
 #
-#   last change: $Author: hro $ $Date: 2002-12-10 16:27:58 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:12 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -146,6 +146,9 @@ LINKINCTARGETS+=$(MISC)$/$(APP$(TNR)TARGETN:b)_linkinc.ls
 $(APP$(TNR)TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
 
+# Allow for target specific LIBSALCPPRT override
+APP$(TNR)LIBSALCPPRT*=$(LIBSALCPPRT)
+
 $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     $(APP$(TNR)RES) \
     $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
@@ -192,7 +195,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
     -o $@ $(APP$(TNR)OBJS:s/.obj/.o/) "\" >  $(MISC)$/$(@:b).cmd
     @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(@:b).cmd
-    @+echo $(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) >> $(MISC)$/$(@:b).cmd
+    @+echo $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) >> $(MISC)$/$(@:b).cmd
     cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
@@ -208,7 +211,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @+-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV)
 .IF "$(USE_SHELL)"=="4nt"
 .IF "$(APP$(TNR)ICON)" != ""
-    @-+echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    @-+echo 1 ICON "$(APP$(TNR)ICON:s/\/\\/)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
 .ENDIF
 .IF "$(APP$(TNR)VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
@@ -216,7 +219,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
 .ENDIF
 .ELSE			# "$(USE_SHELL)"=="4nt"
 .IF "$(APP$(TNR)ICON)" != ""
-    @-+guw.pl echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+    @-+guw.pl echo 1 ICON \"$(APP$(TNR)ICON:s/\//\/\//)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
 .ENDIF
 .IF "$(APP$(TNR)VERINFO)" != ""
     @-+echo #define VERVARIANT	$(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index f895a7f61e6d..e171a3db569a 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_compv.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: svesik $ $Date: 2002-08-29 14:12:44 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:13 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -89,11 +89,11 @@ CFLAGSNUMVERSION_CMD= -V |& nawk -v num=true -f $(SOLARENV)$/bin$/getcompver.awk
 
 # that's the version known by the specific
 # compiler
-CCVER:=$(shell -$(CC) $(CFLAGSVERSION_CMD))
+CCVER:=$(shell -$(CXX) $(CFLAGSVERSION_CMD))
 
 # and a computed integer for comparing
 # each point seperated token blown up to 4 digits
-CCNUMVER:=$(shell -$(CC) $(CFLAGSNUMVERSION_CMD))
+CCNUMVER:=$(shell -$(CXX) $(CFLAGSNUMVERSION_CMD))
 
 .IF "$(COM)"=="MSC"
 .IF "$(CCNUMVER)">="001200000000"
@@ -152,6 +152,21 @@ LIBSTDCPP3="5.0.0"
 SHORTSTDCPP3="5"
 .ENDIF
 
+.IF "$(CCNUMVER)"=="000300020001"
+LIBSTDCPP3="5.0.1"
+SHORTSTDCPP3="5"
+.ENDIF
+
+.IF "$(CCNUMVER)"=="000300020002"
+LIBSTDCPP3="5.0.2"
+SHORTSTDCPP3="5"
+.ENDIF
+
+.IF "$(CCNUMVER)"=="000300020003"
+LIBSTDCPP3="5.0.3"
+SHORTSTDCPP3="3"
+.ENDIF
+
 .ENDIF
 .ENDIF
 
@@ -174,8 +189,8 @@ compiler_version_error:
     @+echo  Please extend tg_compv.mk in 
     @+echo  "solenv/inc".
     @+echo ++++++++++++++++++++++++++++++++++++
-    @+echo "$(CC) $(CFLAGSVERSION)" returns
-    @+$(CC) $(CFLAGSVERSION)
+    @+echo "$(CXX) $(CFLAGSVERSION)" returns
+    @+$(CXX) $(CFLAGSVERSION)
     @+echo ++++++++++++++++++++++++++++++++++++
     @+exit 255
 
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 133c3ef7ae7a..e1a58741a32e 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_def.mk,v $
 #
-#   $Revision: 1.21 $
+#   $Revision: 1.22 $
 #
-#   last change: $Author: hjs $ $Date: 2002-08-15 15:42:40 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:13 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,8 +60,6 @@
 #
 #*************************************************************************
 
-
-
 # -------
 # - DEF -
 # -------
@@ -129,7 +127,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
 
 .IF "$(GUI)"=="WNT"
 
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB$(TNR)NAME)"!=""
 
@@ -158,7 +156,7 @@ $(DEF$(TNR)TARGETN) .PHONY : \
         $(DEF$(TNR)DEPN) \
         $(DEF$(TNR)EXPORTFILE)
 .ENDIF			# "$(UPDATER)"=="" || "$(solarlang)"!="deut" || "$(link_always)"==""
-.IF "$(BUILD_SOSL)"==""
+.IF "$(BSCLIENT)"!=""
 .IF "$(UPDATER)"!=""
 .IF "$(DEFLIB$(TNR)NAME)"!=""
 .IF "$(BUILD_DRIVE$(TNR))"=="O"
@@ -278,19 +276,10 @@ $(DEF$(TNR)TARGETN) .PHONY : \
 $(DEF$(TNR)TARGETN): \
         $(DEF$(TNR)DEPN) \
         $(DEF$(TNR)EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo just a dummy for UNIX
-    @echo > $@
-.ENDIF
-.IF "$(GUI)"=="MAC"
-$(DEF$(TNR)TARGETN): \
-        $(DEF$(TNR)DEPN) \
-        $(DEF$(TNR)EXPORTFILE)
-    @echo ------------------------------
-    @echo Making Module-Definitionfile : $@
-    @echo fuer MAC nur dummy
-    @echo > $@
+    @+echo ------------------------------
+    @+echo Making Module-Definitionfile : $@
+    @+echo just a dummy for UNIX
+    @+echo > $@
 .ENDIF
 .ENDIF			# "$(DEF$(TNR)TARGETN)"!=""
 
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 531a40333564..8066196913b6 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_dep.mk,v $
 #
-#   $Revision: 1.14 $
+#   $Revision: 1.15 $
 #
-#   last change: $Author: hjs $ $Date: 2001-12-12 12:42:22 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:13 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -62,7 +62,7 @@
 
 .IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HXX1TARGET)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!=""
 ALLDEP .PHONY: 
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @+if ( -e  "$(SRS)$/$(PWD:f).*.dpr" ) +-$(RM) "$(SRS)$/$(PWD:f).*.dpr" >& $(NULLDEV)
 .ELSE
     @+-$(RM) $(SRS)$/$(PWD:f).*.dpr >& $(NULLDEV)
@@ -85,11 +85,11 @@ ALLDEP .PHONY:
 .IF "$(GROUPSHELL:b:l)"=="4dos"
     @+-echo $(foreach,i,$(DEPFILES) $(shell +-del $i >& $(NULLDEV))) >& $(NULLDEV)
 .ELSE			# "$(GROUPSHELL:b)"=="4dos"
-.IF "$(GUI)"=="WNT"
+.IF "$(USE_SHELL)"=="4nt"
     @+-echo $(foreach,i,$(DEPFILES) $(shell +-del $i >& $(NULLDEV))) >& $(NULLDEV)
-.ELSE			# "$(GUI)"=="WNT"
+.ELSE			# "$(USE_SHELL)"=="4nt"
     @+-$(RM) $(DEPFILES) >& $(NULLDEV)
-.ENDIF			# "$(GUI)"=="WNT"
+.ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF			# "$(GROUPSHELL:b)"=="4dos"
 .ENDIF			# "$(DEPFILES)" != ""
     +@echo ---
@@ -119,7 +119,7 @@ ALLDPC: \
 .ENDIF
 .ENDIF
 .IF "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)$(PARFILES)"!=""
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
 #	@+if ( -e  $(MISC)$/$(TARGET).dpr ) $(RM) $(MISC)$/$(TARGET).dpr >& $(NULLDEV)
     @+if ( -e  $(MISC)$/$(TARGET).dpw ) $(RM) $(MISC)$/$(TARGET).dpw >& $(NULLDEV)
     @+if ( -e  $(MISC)$/$(TARGET).dpj ) $(RM) $(MISC)$/$(TARGET).dpj >& $(NULLDEV)
@@ -147,7 +147,7 @@ ALLDPC: \
 .ENDIF
 .IF "$(GROUP)"=="WRITER"
 .IF "$(debug)"==""
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @+-$(RM) $(MISC)$/$(TARGET).dpw
     @$(TYPE)  $(MISC)$/$(TARGET).dpc | $(SED) s\#$/slo$/\#$/dso$/\# | $(SED) s\#$/obj$/\#$/dbo$/\# > $(MISC)$/$(TARGET).dpw
 .ELSE
@@ -157,7 +157,7 @@ ALLDPC: \
     @+-$(RM) $(TEMP)$/$(TARGET).dpt >& $(NULLDEV)
 .ENDIF
 .ELSE			# "$(debug)"==""
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @+$(COPY) $(MISC)$/$(TARGET).dpc $(MISC)$/$(TARGET).dpw
     @+-$(RM) $(MISC)$/$(TARGET).dpc
     @$(TYPE)  $(MISC)$/$(TARGET).dpw | $(SED) s\#$/dso$/\#$/slo$/\# | $(SED) s\#$/dbo$/\#$/obj$/\# > $(MISC)$/$(TARGET).dpc
@@ -180,17 +180,17 @@ ALLDPC: \
 ALLDPC:
     @echo ------------------------------
     @echo No Dependencies
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @echo "#" > $(MISC)$/$(TARGET).dpc
 .IF "$(GROUP)"=="WRITER"
     @echo "#" > $(MISC)$/$(TARGET).dpw
 .ENDIF
-.ELSE			# "$(GUI)"=="UNX"
+.ELSE			# "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
     @echo # > $(MISC)$/$(TARGET).dpc
 .IF "$(GROUP)"=="WRITER"
     @echo # > $(MISC)$/$(TARGET).dpw
 .ENDIF
-.ENDIF			# "$(GUI)"=="UNX"
+.ENDIF			# "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
 
 ALLDEP:
     @echo ------------------------------
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index ca0ad87d577f..10ee7f96cb4c 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -10,27 +10,27 @@ JARCOMPRESS_FLAG=0
 XSTARJARPATH=$(strip $(STARJARPATH))
 .ENDIF			# "$(use_starjar)"!=""
 $(JARTARGETN) : $(JARMANIFEST)
-.ENDIF			# "$(NEW_JAR_PACK)"==""
+.ENDIF			# "$(NEW_JAR_PACK)"!=""
 
 .IF "$(NEW_JAR_PACK)"!=""
 .IF "$(JARMANIFEST)"!=""
 
 .IF "$(CUSTOMMANIFESTFILE)"!=""
 
-CUSTOMMANIFESTFILEDEP:=..$/misc$/$(TARGET)_$(CUSTOMMANIFESTFILE:f)
+CUSTOMMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f)
 
-..$/misc$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE)
+$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE)
     +-$(RM) $@
 #>& $(NULLDEV)
     +$(COPY) $< $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
 
 .IF "$(USE_EXTENDED_MANIFESTFILE)"!=""
-EXTENDEDMANIFESTFILE=..$/misc$/$(JARTARGET:b)
+EXTENDEDMANIFESTFILE=$(MISC)$/$(JARTARGET:b)
 .IF "$(JARMANIFEST)"!=""
 $(JARMANIFEST) : $(EXTENDEDMANIFESTFILE)
 .ENDIF			# "$(JARMANIFEST)"!=""
-..$/misc$/$(JARTARGET:b) : $(SOLARINCDIR)$/$(UPD)minor.mk
+$(MISC)$/$(JARTARGET:b) : $(SOLARINCDIR)$/$(UPD)minor.mk
     @+echo Specification-Title: $(SPECTITLE) > $@
     @+echo Specification-Version: $(VERSION) >> $@
     @+echo Specification-Vendor: $(VENDOR) >> $@
@@ -45,15 +45,15 @@ $(JARMANIFEST) : $(EXTENDEDMANIFESTFILE)
 
 .IF "$(EXTENDEDMANIFESTFILE)"!=""
 
-EXTENDEDMANIFESTFILEDEP:=..$/misc$/$(TARGET)_$(EXTENDEDMANIFESTFILE:f)
+EXTENDEDMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(EXTENDEDMANIFESTFILE:f)
 
-..$/misc$/$(TARGET)_$(EXTENDEDMANIFESTFILE:f) : $(EXTENDEDMANIFESTFILE)
+$(MISC)$/$(TARGET)_$(EXTENDEDMANIFESTFILE:f) : $(EXTENDEDMANIFESTFILE)
     +-$(RM) $@
     +$(COPY) $(EXTENDEDMANIFESTFILE) $@
 .ENDIF			# "$(EXTENDEDMANIFESTFILE)"!=""
 
 $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) $(EXTENDEDMANIFESTFILEDEP)
-    +-$(MKDIR) .$/META-INF >& $(NULLDEV)
+    +-$(MKDIR) $(@:d) >& $(NULLDEV)
     +-$(RM) $@ >& $(NULLDEV)
     +echo Manifest-Version: 1.0 > $@
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -62,99 +62,34 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) $(EXTENDEDMANIFESTFILEDEP)
     +echo Solar-Version: $(RSCREVISION) >> $@
 .ENDIF			# "$(GUI)"=="UNX"" || "$(USE_SHELL)"!="4nt"
 .IF "$(EXTENDEDMANIFESTFILE)"!=""
-    +$(TYPE) ..$/misc$/$(TARGET)_$(EXTENDEDMANIFESTFILE:f) >> $@
+    +$(TYPE) $(MISC)$/$(TARGET)_$(EXTENDEDMANIFESTFILE:f) >> $@
 .ENDIF			# "$(EXTENDEDMANIFESTFILE)"!=""
 .IF "$(CUSTOMMANIFESTFILE)"!=""
-    +$(TYPE) ..$/misc$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
+    +$(TYPE) $(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
 .ENDIF			# "$(JARMANIFEST)"!=""
-.ENDIF			# "$(NEW_JAR_PACK)"==""
-
-#
-# old jar dependencies...
-#
-.IF "$(NOJARDEP)$(NEW_JAR_PACK)"==""
-
-..$/misc$/$(JARTARGETDEP) $(MISC)$/$(JARTARGETDEP) .SETDIR=$(CLASSDIR) : # $(JARTARGETN)
-    @+echo -------------------------
-    @+echo Making $@
-    +-$(RM) ..$/misc$/$(JARTARGETDEP) >& $(NULLDEV)
-    +-$(RM) ..$/misc$/$(JARTARGETDEP).tmp >& $(NULLDEV)
-.IF "$(GUI)"=="UNX"
-    +echo " $(JARTARGET) : \" > ..$/misc$/$(JARTARGETDEP)
-    @+cat $(mktmp $(foreach,i,$(JARCLASSDIRS) $(shell find $i -type f -name "*.class" \! -name '*$$*' ))) >> ..$/misc$/$(JARTARGETDEP)
-.ENDIF
-.IF "$(GUI)"=="OS2"
-#	@+echo $(foreach,i,$(JARCLASSDIRS) $(shell $(FIND) $i -type f -name "*.class" ! -name "*\$$*" -print >> ..$/misc$/$(JARTARGETDEP) )) >& $(NULLDEV)
-    +echo  $(JARTARGETN) : \> ..$/misc$/$(JARTARGETDEP)
-    +echo $(foreach,i,$(JARCLASSDIRS) $(shell $(FIND) $i -type f -name "*.class" ! -name "*$$*" -print >> ..$/misc$/$(JARTARGETDEP).tmp )) >& $(NULLDEV)
-    +type ..$/misc$/$(JARTARGETDEP).tmp | sed "s#\.class#\.class \\#" >> ..$/misc$/$(JARTARGETDEP)
-    +$(ECHONL) >> ..$/misc$/$(JARTARGETDEP)
-    +-$(RM) ..$/misc$/$(JARTARGETDEP).tmp >& $(NULLDEV)
-.ENDIF
-.IF "$(GUI)"=="WNT"
-    +echo  $(JARTARGETN) : \> ..$/misc$/$(JARTARGETDEP)
-    +echo $(foreach,i,$(JARCLASSDIRS) $(shell $(FIND) $i -type f -name "*.class" ! -name "*$$*" -print >> ..$/misc$/$(JARTARGETDEP).tmp )) >& $(NULLDEV)
-    +type ..$/misc$/$(JARTARGETDEP).tmp | sed "s#\.class#\.class \\#" >> ..$/misc$/$(JARTARGETDEP)
-    +$(ECHONL) >> ..$/misc$/$(JARTARGETDEP)
-    +-$(RM) ..$/misc$/$(JARTARGETDEP).tmp >& $(NULLDEV)
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"!=""
-.IF "$(depend)"==""
-.INCLUDE : $(MISC)$/$(JARTARGETN).dep
-.ENDIF
-
-# jardepfile=$(shell -cat -s $(MISC)$/$(JARTARGETN).dep )
-.ENDIF
-.ENDIF			# "$(NOJARDEP)$(NEW_JAR_PACK)"==""
+.ENDIF			# "$(NEW_JAR_PACK)"!=""
 
 #
 # build jar 
 #
 .IF "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
-$(JARTARGETN) .SETDIR=$(CLASSDIR) .PHONY :
+$(JARTARGETN) .PHONY :
 #  $(JARMANIFEST)
 .ELSE			# "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
 .DIRCACHE = no
-$(JARTARGETN) .SETDIR=$(CLASSDIR) :
+$(JARTARGETN) :
 #$(JARTARGETN) .SETDIR=$(CLASSDIR) .SEQUENTIAL : $(JARTARGETDEP) $(shell -cat -s $(MISC)$/$(JARTARGETN).dep )
 .ENDIF			# "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!=""
-.IF "$(UPDATER)"!=""
-.IF "$(GUI)"=="WNT"
-#	+tolodir .
-.IF "$(JARIMGDIRS)"!=""
-#	+toloimg $(JARIMGDIRS)
-.ENDIF
-.ENDIF
 .IF "$(OS)$(CPU)"=="SOLARISS"
     @+-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1 
 .ENDIF
-.ENDIF
-.IF "$(NEW_JAR_PACK)"==""
-    +-$(RM) $@
-.IF "$(use_starjar)"!=""
-    @+-$(COPY) ..$/..$/util$/$(JARFLT) $(JARFLT) >& $(NULLDEV)
-.IF "$(JARMANIFEST)"!=""
-    $(STARJAR) $@ $(JARMANIFEST) $(JARFLT) $(PATH_SEPERATOR) $(STARJARPATH)  
-.ELSE
-    $(STARJAR) $@ - $(JARFLT) $(PATH_SEPERATOR) $(STARJARPATH)  
-.ENDIF
-.ELSE			# "$(use_starjar)"!=""
-.IF "$(JARMANIFEST)"!=""
-    jar -cvmf$(JARCOMPRESS_FLAG) $(JARMANIFEST) $@ $(JARCLASSDIRS)
-.ELSE
-    jar -cvf$(JARCOMPRESS_FLAG) $@ $(JARCLASSDIRS)
-.ENDIF
-.ENDIF			# "$(use_starjar)"!=""
-.ELSE			# "$(NEW_JAR_PACK)"==""
 .IF "$(use_starjar)"!=""
     +-$(RM) $@
     @+-$(COPY) $(DMAKE_WORK_DIR)$/$(JARFLT) $(TARGET)_$(JARFLT) >& $(NULLDEV)
-    $(STARJAR) $@ $(JARMANIFEST) $(TARGET)_$(JARFLT) + $(XSTARJARPATH:s/ /+/)
+    cd $(CLASSDIR) && $(STARJAR) $@ $(JARMANIFEST) $(TARGET)_$(JARFLT) + $(XSTARJARPATH:s/ /+/)
 .ELSE			# "$(use_starjar)"!=""
-    zip -u -r $@ $(JARMANIFEST) $(subst,\,/ $(JARCLASSDIRS))
+    +cd $(CLASSDIR) && zip -u -r $(@:f) $(subst,$(CLASSDIR)$/, $(JARMANIFEST)) $(subst,\,/ $(JARCLASSDIRS))
 .ENDIF			# "$(use_starjar)"!=""
-.ENDIF			# "$(NEW_JAR_PACK)"==""
 .ENDIF
 
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 465e7a3d2c1b..b75f22bbe43c 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_shl.mk,v $
 #
-#   $Revision: 1.71 $
+#   $Revision: 1.72 $
 #
-#   last change: $Author: hro $ $Date: 2002-12-10 16:27:58 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:13 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -319,9 +319,9 @@ $(SHL$(TNR)TARGETN) : \
 .IF "$(GUI)" == "WNT"
 .IF "$(UPDATER)"=="YES"
 .IF "$(COM)"=="GCC"
-            gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE
-            $(CC) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+            $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(UPDATER)"=="YES"
 .IF "$(SHL$(TNR)DEFAULTRES)"!=""
@@ -353,31 +353,6 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
 .IF "$(linkinc)"==""
 .IF "$(USE_DEFFILE)"!=""
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp \
-        $(LINKFLAGS) \
-        $(LINKFLAGSSHL) \
-        $(SHL$(TNR)STACK) $(SHL$(TNR)BASEX)	\
-        /DEBUG /PDB:NONE \
-        -out:$(BIN)$/_$(SHL$(TNR)TARGET).dll \
-        -map:$(MISC)$/_$(@:b).map \
-        -def:$(SHL$(TNR)DEF) \
-        $(USE_$(TNR)IMPLIB) \
-        $(STDOBJ) \
-        $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) \
-        $(SHL$(TNR)LIBS) \
-        $(SHL$(TNR)STDLIBS) \
-        $(STDSHL) $(STDSHL$(TNR)) \
-        $(SHL$(TNR)LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .IF "$(COM)"=="GCC"
     @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \
         $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) | tr -d �\r\n� > $(MISC)$/$(@:b).cmd
@@ -414,28 +389,6 @@ $(SHL$(TNR)TARGETN) : \
         $(STDSHL) $(STDSHL$(TNR))                           \
         $(SHL$(TNR)LINKRES) \
     )
-.IF "$(BOTH)"!=""
-.IF "$(PRODUCT)"=="full"
-.IF "$(UPDATER)"=="YES"
-#
-#	product mit debug gelinkt
-#
-    $(LINK) @$(mktmp	$(LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\
-        /DEBUG /PDB:NONE \
-        $(SHL$(TNR)STACK) -out:$(BIN)$/_$(SHL$(TNR)TARGET).dll	\
-        -map:$(MISC)$/_$(@:B).map				\
-        $(LB)$/$(SHL$(TNR)IMPLIB).exp				\
-        $(STDOBJ)							\
-        $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ)    \
-        $(SHL$(TNR)LIBS)                         \
-        $(SHL$(TNR)STDLIBS)                      \
-        $(STDSHL) $(STDSHL$(TNR))                           \
-        $(SHL$(TNR)LINKRES) \
-    )
-.ENDIF			# "$(UPDATER)"=="YES"
-.ENDIF			# "$(PRODUCT)"=="full"
-.ENDIF			# "$(BOTH)"!=""
 .ENDIF			# "$(USE_DEFFILE)"!=""
 .ELSE			# "$(linkinc)"==""
         +-$(RM) del $(MISC)$/$(SHL$(TNR)TARGET).lnk
@@ -460,22 +413,22 @@ $(SHL$(TNR)TARGETN) : \
 .IF "$(UPDATER)"=="YES"
 .IF "$(OS)"=="SOLARIS"
 .IF "$(COM)"=="GCC"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ELSE		
-        $(cc) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -KPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF		
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-        $(cc) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @echo "------------------------------"
         @echo "Updating static data member initializations"
         @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
-        $(cc) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
 .ENDIF
 .IF "$(OS)"=="IRIX"
-        $(cc) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+        $(CC) -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
         @+if ( ! -e $(SOLARLIBDIR) ) mkdir $(SOLARLIBDIR)
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
@@ -516,9 +469,6 @@ $(SHL$(TNR)TARGETN) : \
     $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL$(TNR)NOCHECK)"==""
     +-$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index b5fd5a31b501..6c1677979cf7 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -39,8 +39,8 @@ $(SRCTARGET) : $(SRCFILES)
     @echo Making: $@
 .IF "$(GUI)"=="WNT"
 .IF "$(CPU)"=="I"
-.IF "$(UPDATER)"=="YES"
-.IF "$(BUILD_SOSL)"==""
+#.IF "$(UPDATER)"=="YES"
+#.IF "$(BUILD_SOSL)"==""
 .IF "$(no_hids)$(NO_HIDS)"==""
 .IF "$(USE_SHELL)"=="4nt"
     @+type $(mktmp $(SRCFILES:+"\n")) > $(TMP)$/$(TARGET).tra
@@ -51,8 +51,8 @@ $(SRCTARGET) : $(SRCFILES)
     @+-del $(TMP)$/$(TARGET).art
 .ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF
-.ENDIF
-.ENDIF
+#.ENDIF
+#.ENDIF
 .ENDIF
 .ENDIF			 # "$(GUI)"=="WNT"
 .IF "$(make_srs_deps)" != ""
@@ -116,8 +116,8 @@ $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
     @echo Making: $@
 .IF "$(GUI)"=="WNT"
 .IF "$(CPU)"=="I"
-.IF "$(UPDATER)"=="YES"
-.IF "$(BUILD_SOSL)"==""
+#.IF "$(UPDATER)"=="YES"
+#.IF "$(BUILD_SOSL)"==""
 .IF "$(no_hids)$(NO_HIDS)"==""
 .IF "$(USE_SHELL)"=="4nt"
     @+type $(mktmp $(SRC$(TNR)FILES:+"\n")) > $(TMP)$/$(TARGET).tra
@@ -128,8 +128,8 @@ $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
     @+del $(TMP)$/$(TARGET).tra
 .ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF
-.ENDIF
-.ENDIF
+#.ENDIF
+#.ENDIF
 .ENDIF
 .ENDIF
 .IF "$(make_srs_deps)" != ""
diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk
index f827226ce222..a8c34d5be0c6 100644
--- a/solenv/inc/tg_yxx.mk
+++ b/solenv/inc/tg_yxx.mk
@@ -1,65 +1,3 @@
-#*************************************************************************
-#
-#   $RCSfile: tg_yxx.mk,v $
-#
-#   $Revision: 1.6 $
-#
-#   last change: $Author: mh $ $Date: 2002-09-29 06:13:46 $
-#
-#   The Contents of this file are made available subject to the terms of
-#   either of the following licenses
-#
-#          - GNU Lesser General Public License Version 2.1
-#          - Sun Industry Standards Source License Version 1.1
-#
-#   Sun Microsystems Inc., October, 2000
-#
-#   GNU Lesser General Public License Version 2.1
-#   =============================================
-#   Copyright 2000 by Sun Microsystems, Inc.
-#   901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License version 2.1, as published by the Free Software Foundation.
-#
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#   MA  02111-1307  USA
-#
-#
-#   Sun Industry Standards Source License Version 1.1
-#   =================================================
-#   The contents of this file are subject to the Sun Industry Standards
-#   Source License Version 1.1 (the "License"); You may not use this file
-#   except in compliance with the License. You may obtain a copy of the
-#   License at http://www.openoffice.org/license.html.
-#
-#   Software provided under this License is provided on an "AS IS" basis,
-#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-#   See the License for the specific provisions governing your rights and
-#   obligations concerning the Software.
-#
-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-#
-#   Copyright: 2000 by Sun Microsystems, Inc.
-#
-#   All Rights Reserved.
-#
-#   Contributor(s): _______________________________________
-#
-#
-#
-#*************************************************************************
-
 
 .IF "$(YACCTARGET)"!=""
 $(MISC)$/%.cxx : %.y
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index 257432114767..0cb8e01aad1d 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_zip.mk,v $
 #
-#   $Revision: 1.14 $
+#   $Revision: 1.15 $
 #
-#   last change: $Author: rt $ $Date: 2002-11-26 09:15:40 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:14 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -101,12 +101,6 @@ avoid_cvs_dir=-x "*CVS*"
 .ENDIF
 
 .IF "$(ZIP$(TNR)TARGET)"!=""
-ZIP$(TNR)ISO_LANGDIRS*=$(ZIPISO_LANGDIRS)
-.IF "$(ZIP$(TNR)ISO_LANGDIRS)"==""
-langdir_type*=longlang
-.ELSE			# "$(ZIP$(TNR)ISO_LANGDIRS)"==""
-langdir_type*=iso
-.ENDIF			# "$(ZIP$(TNR)ISO_LANGDIRS)"==""
 ZIP$(TNR)DIR*=$(ZIPDIR)
 ZIP$(TNR)FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@@ -114,7 +108,7 @@ zip$(TNR)langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) .
 .ELSE			# "$(GUI)"=="UNX"
 zip$(TNR)langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP$(TNR)DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
-zip$(TNR)alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip$(TNR)langdirs) $(eq,$($(langdir_type)_$i),$j  $i $(NULL))))
+zip$(TNR)alllangext:=$(foreach,i,$(alllangext) $(foreach,j,$(zip$(TNR)langdirs) $(eq,$(longlang_$i),$j  $i $(NULL))))
 .ENDIF			# "$(ZIP$(TNR)TARGET)"!=""
 
 .IF "$(ZIP$(TNR)TARGETN)"!=""
@@ -143,12 +137,12 @@ $(ZIP$(TNR)TARGETN) :
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip $(avoid_cvs_dir) 
     +$(COPY) $(ZIP$(TNR)TMP).zip $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)    
     +$(RM) $(ZIP$(TNR)TMP).zip
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) >& $(NULLDEV)
-    +-zip $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
     @+-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) >& $(NULLDEV)
     @+-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
@@ -163,25 +157,26 @@ $(ZIP$(TNR)TARGETN) :
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
     @+-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).zip >& $(NULLDEV)
-    +-cd $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
+    +-cd $(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).zip $(ZIP$(TNR)LIST:s/LANGDIR/./) -x delzip  $(avoid_cvs_dir)
     +$(COPY) $(ZIP$(TNR)TMP).zip  $@ 
     +$(RM) $(ZIP$(TNR)TMP).zip
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    +-zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
+    +-zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )) -x delzip $(avoid_cvs_dir)
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
 .ELSE			# "$(make_zip_deps)" == ""
+    +echo # > $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .IF "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    +-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(ZIP$(TNR)HELPVAR), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ELSE			# "$(common_build_zip)"!=""
 .IF "$(ZIP$(TNR)DIR)" != ""
-    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-cd $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ELSE			# "$(ZIP$(TNR)DIR)" != ""
-    +-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$($(langdir_type)_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+    +-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
 .ENDIF			# "$(ZIP$(TNR)DIR)" != ""
 .ENDIF			# "$(common_build_zip)"!=""
     @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index c8000980c8dd..74473ab47345 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unx.mk,v $
 #
-#   $Revision: 1.19 $
+#   $Revision: 1.20 $
 #
-#   last change: $Author: armin $ $Date: 2002-10-30 11:53:42 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:14 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -116,10 +116,6 @@ OLE2DEF=
 .INCLUDE : unxlngp.mk
 .ENDIF
 
-.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUXX2REDHAT60"
-.INCLUDE : unxlngx4.mk
-.ENDIF
-
 .IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC295LINUXI2REDHAT60"
 .INCLUDE : unxlngi3.mk
 .ENDIF
@@ -128,14 +124,22 @@ OLE2DEF=
 .INCLUDE : unxlngi4.mk
 .ENDIF
 
-.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC295LINUXP2REDHAT60" 
-.INCLUDE : unxlngppc.mk 
-.ENDIF 
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC322LINUXI2REDHAT60"
+.INCLUDE : unxlngi5.mk
+.ENDIF
+
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC295LINUXP2REDHAT60"
+.INCLUDE : unxlngppc.mk
+.ENDIF
+
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUXP2REDHAT60"
+.INCLUDE : unxlngppc4.mk
+.ENDIF
+
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUX32REDHAT60"
+.INCLUDE : unxlngs3904.mk
+.ENDIF
 
-.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUXP2REDHAT60" 
-.INCLUDE : unxlngppc4.mk 
-.ENDIF 
- 
 .IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXR2REDHAT60"
 .INCLUDE : unxlngr.mk
 .ENDIF
@@ -152,10 +156,6 @@ OLE2DEF=
 .INCLUDE : unxbsda.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "ICCS390G"
-.INCLUDE : unxmvsg.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "ICCAIXP"
 .INCLUDE : unxaixp.mk
 .ENDIF
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
index b9403d75df61..74aef6c41af7 100644
--- a/solenv/inc/unxaixp.mk
+++ b/solenv/inc/unxaixp.mk
@@ -1,12 +1,71 @@
+#*************************************************************************
+#
+#   $RCSfile: unxaixp.mk,v $
+#
+#   $Revision: 1.3 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:15 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
 # mak file fuer unxaixp
 ASM=
 AFLAGS=
 
-# kann c++ was c braucht??
-
-CC=				xlC_r
-cc=				xlc_r
+CXX=				xlC_r
+CC=				xlc_r
 CFLAGS=			-c -qlanglvl=extended -qchars=signed 
 CFLAGS+=		$(INCLUDE)
 CDEFS+=			-D_PTHREADS
diff --git a/solenv/inc/unxbsda.mk b/solenv/inc/unxbsda.mk
index 8a1adc6677a2..390775c28034 100644
--- a/solenv/inc/unxbsda.mk
+++ b/solenv/inc/unxbsda.mk
@@ -1,11 +1,72 @@
+#*************************************************************************
+#
+#   $RCSfile: unxbsda.mk,v $
+#
+#   $Revision: 1.2 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:15 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
 # mak file fuer unxbsda
 
 ASM=
 AFLAGS=
 
-cc=				gcc -c
-CC=				g++ -c
+CC=				gcc -c
+CXX=			g++ -c
 CDEFS+=			-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
 CDEFS+=			-D_REENTRANT 		# -D_PTHREADS -DPOSIX_PTHREAD_SEMANTICS
 CDEFS+= 		-DNO_AUDIO -DPRINTER_DUMMY
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index afed8222f914..f2fd6ff48fe7 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -1,196 +1,77 @@
-#*************************************************************************
-#
-#   $RCSfile: unxbsdi.mk,v $
-#
-#   $Revision: 1.3 $
-#
-#   last change: $Author: mrauch $ $Date: 2002-03-19 21:16:03 $
-#
-#   The Contents of this file are made available subject to the terms of
-#   either of the following licenses
-#
-#          - GNU Lesser General Public License Version 2.1
-#          - Sun Industry Standards Source License Version 1.1
-#
-#   Sun Microsystems Inc., October, 2000
-#
-#   GNU Lesser General Public License Version 2.1
-#   =============================================
-#   Copyright 2000 by Sun Microsystems, Inc.
-#   901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License version 2.1, as published by the Free Software Foundation.
-#
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#   MA  02111-1307  USA
-#
-#
-#   Sun Industry Standards Source License Version 1.1
-#   =================================================
-#   The contents of this file are subject to the Sun Industry Standards
-#   Source License Version 1.1 (the "License"); You may not use this file
-#   except in compliance with the License. You may obtain a copy of the
-#   License at http://www.openoffice.org/license.html.
-#
-#   Software provided under this License is provided on an "AS IS" basis,
-#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-#   See the License for the specific provisions governing your rights and
-#   obligations concerning the Software.
-#
-#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-#
-#   Copyright: 2000 by Sun Microsystems, Inc.
-#
-#   All Rights Reserved.
-#
-#   Contributor(s): _______________________________________
-#
-#
-#
-#*************************************************************************
-
-# mk file for unxbsdi
+# mak file fuer unxbsdi
+
 ASM=
 AFLAGS=
 
-SOLAR_JAVA=TRUE
-JAVAFLAGSDEBUG=-g
-
-# filter for supressing verbose messages from linker
-#not needed at the moment
-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-
-# _PTHREADS is needed for the stl
-CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 
-
-# this is a platform with JAVA support
-.IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-.ENDIF 
-
-# name of C++ Compiler
-CC=g++
-# name of C Compiler
-cc=gcc
-# flags for C and C++ Compiler
-CFLAGS=-c $(INCLUDE)
-# flags for the C++ Compiler
-CFLAGSCC= -pipe 
-
-# Flags for enabling exception handling
+cc=gcc -c
+CC=g++ -c
+CDEFS+=-D_PTHREADS -D_REENTRANT
+CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
+CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR -DNCIfeature
+CFLAGS+=-w -c $(INCLUDE)
+CFLAGSCC=-pipe -mpentium
 CFLAGSEXCEPTIONS=-fexceptions
-# Flags for disabling exception handling
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+CFLAGSCXX=-pipe -mpentium -fguiding-decls -frtti
 
-# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe -fno-for-scope -fpermissive 
-
-# Compiler flags for compiling static object in single threaded environment with graphical user interface
 CFLAGSOBJGUIST=
-# Compiler flags for compiling static object in single threaded environment with character user interface
 CFLAGSOBJCUIST=
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
 CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
 CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
+CFLAGSSLOGUIMT=	-fPIC
+CFLAGSSLOCUIMT=	-fPIC
+CFLAGSPROF=     -pg
+CFLAGSDEBUG=	-g
 CFLAGSDBGUTIL=
-# Compiler flags for enabling optimazations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimazations
+# die zusaetzlichen Optimierungsschalter schalten alle Optimierungen ein, die zwischen -O und -O2 liegen und
+# per Schalter einschaltbar sind. Dennoch gibt es einen Unterschied: einige Files im Writer werden
+# misoptimiert wenn -O2 eingeschaltet ist und waehrend die untenstehenden Schalter funktionieren.
+CFLAGSOPT=-O -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fstrength-reduce -fforce-mem -fcaller-saves -fgcse -frerun-cse-after-loop -frerun-loop-opt -fschedule-insns2 -fregmove -foptimize-register-move
+#CFLAGSOPT=-O2
 CFLAGSNOOPT=-O
-# Compiler flags for discibing the output path
 CFLAGSOUTOBJ=-o
-# Enable all warnings
-CFLAGSWALL=-Wall
-# Set default warn level
-CFLAGSDFLTWARN=-w
-
-# switches for dynamic and static linking
-STATIC		= -Wl,-Bstatic
-DYNAMIC		= -Wl,-Bdynamic
-
-# name of linker
-LINK=gcc
-# default linker flags
-LINKFLAGS=
 
-# linker flags for linking applications
-LINKFLAGSAPPGUI= -Wl,-export-dynamic 
-LINKFLAGSAPPCUI= -Wl,-export-dynamic
-# linker flags for linking shared libraries
-LINKFLAGSSHLGUI= -Wl,-export-dynamic -shared
-LINKFLAGSSHLCUI= -Wl,-export-dynamic -shared
+STATIC=			-Bstatic
+DYNAMIC=		-Bdynamic
 
+THREADLIB=
+LINK= gcc
+LINKFLAGS=
+.IF "$(PRJNAME)"=="osl" ||  "$(PRJNAME)"=="rtl" 
+LINKFLAGSSHLGUI= -shared -nostdlib
+LINKFLAGSSHLCUI= -shared -nostdlib
+.ELSE
+LINKFLAGSSHLGUI= -shared -nostdlib /usr/lib/c++rt0.o
+LINKFLAGSSHLCUI= -shared -nostdlib /usr/lib/c++rt0.o
+.ENDIF
+LINKFLAGSAPPGUI= -L/nw386/dev/s/solenv/unxbsdi/lib -lpthread_init -lpthread
+LINKFLAGSAPPCUI= -L/nw386/dev/s/solenv/unxbsdi/lib -lpthread_init -lpthread
 LINKFLAGSTACK=
 LINKFLAGSPROF=
-LINKFLAGSDEBUG=-g
+LINKFLAGSDEBUG=
 LINKFLAGSOPT=
 
-.IF "$(NO_BSYMBOLIC)"==""
-.IF "$(PRJNAME)" != "envtest"
-LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
-LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
-.ENDIF
-.ENDIF				# "$(NO_BSYMBOLIC)"==""
-
-LINKVERSIONMAPFLAG=-Wl,--version-script
-
-SONAME_SWITCH=-Wl,-h
+_SYSLIBS= -lpthread -lgcc -lc -lm 
+_X11LIBS= -L/usr/X11R6/lib -lXext -lX11
 
-# Sequence of libs does matter !
+STDLIBCPP= -lstdc++
 
-STDLIBCPP=-lstdc++
-
-# default objectfilenames to link
 STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
 
-# libraries for linking applications
-STDLIBCUIST=-lm
-STDLIBGUIMT=-lX11 -lpthread -lm
-STDLIBCUIMT=-lpthread -lm
-STDLIBGUIST=-lX11 -lm
-# libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext -lpthread -lm
-STDSHLCUIMT=-lpthread -lm
-
-# STLport always needs pthread. This may yield some redundant -lpthread
-# but that doesn't matter. 
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -lpthread
+STDLIBGUIST=  ${_X11LIBS} ${_SYSLIBS}
+STDLIBCUIST=              ${_SYSLIBS}
+STDLIBGUIMT=  ${_X11LIBS} ${_SYSLIBS}
+STDLIBCUIMT=              ${_SYSLIBS}
+STDSHLGUIMT=
+STDSHLCUIMT=
 
+LIBMGR=			ar
+LIBFLAGS=		-r
+LIBEXT=			.a
 
-# name of library manager
-LIBMGR=ar
-LIBFLAGS=-r
-
-# tool for generating import libraries
 IMPLIB=
 IMPLIBFLAGS=
 
@@ -198,13 +79,14 @@ MAPSYM=
 MAPSYMFLAGS=
 
 RC=irc
-RCFLAGS=-fo$@ $(RCFILES)
+RCFLAGS=		-fo$@ $(RCFILES)
 RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
 
-# platform specific identifier for shared libs
-DLLPOSTFIX=bi
-DLLPRE=lib
-DLLPOST=.so
+DLLPOSTFIX=		bi
+DLLPRE=			lib
+DLLPOST=		.so.1.0
+
+LDUMP=
 
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index 57e5c3e21daf..689eda69a105 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -1,11 +1,10 @@
-
 #*************************************************************************
 #
 #   $RCSfile: unxbsds.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: pl $ $Date: 2001-10-24 17:21:47 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:16 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -86,9 +85,9 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF 
 
 # name of C++ Compiler
-CC=g++ 
+CXX=g++ 
 # name of C Compiler
-cc=gcc 
+CC=gcc 
 # flags for C and C++ Compiler
 CFLAGS=-w -c $(INCLUDE) -I$(SOLARENV)/unxbsds/usr/include
 # flags for the C++ Compiler
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index 1c40b2230cb2..afeeac8b62ec 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -1,5 +1,66 @@
-
-# mak file fuer unxfbsdi
+#*************************************************************************
+#
+#   $RCSfile: unxfbsdi.mk,v $
+#
+#   $Revision: 1.5 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:16 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+# mak file for unxfbsdi
 
 ASM=
 AFLAGS=
@@ -10,8 +71,8 @@ JAVAFLAGSDEBUG=-g
 LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 
-cc=				gcc
-CC=				g++
+CC=				gcc
+CXX=			g++
 CDEFS+=			-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400
 CDEFS+=			-D_REENTRANT -D_PTHREADS -D_THREAD_SAFE
 CFLAGS+= -w -c $(INCLUDE)
diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk
index 4b8f64a21efa..d85daff51b2f 100644
--- a/solenv/inc/unxhpgr.mk
+++ b/solenv/inc/unxhpgr.mk
@@ -1,3 +1,65 @@
+#*************************************************************************
+#
+#   $RCSfile: unxhpgr.mk,v $
+#
+#   $Revision: 1.3 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:16 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
 
 # mak file fuer unxhpxr
 ASM=
@@ -16,10 +78,10 @@ CDEFS+=-DNO_AUDIO -DSYSV -D_POSIX_PTHREAD_SEMANTICS  -D_HPUX_SOURCE -DRWSTD_MULT
 # 600 = Type specifier is omitted; "int" is no longer assumed.
 DISWARN=+W67,251,370,600
 
-#CC=/opt/aCC/bin/aCC
-#cc=/opt/ansic/bin/cc
-CC=g++
-cc=gcc
+#CXX=/opt/aCC/bin/aCC
+#CC=/opt/ansic/bin/cc
+CXX=g++
+CC=gcc
 CFLAGS= -Wall -w -nostdinc -c $(INCLUDE) -I/nw386/dev/s/solenv/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.91.57/include
 CFLAGSCC=-pipe -fguiding-decls
 CFLAGSCXX=-pipe -fguiding-decls
diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk
index 3742ba1d75c9..46d1d0fcf979 100644
--- a/solenv/inc/unxhpxr.mk
+++ b/solenv/inc/unxhpxr.mk
@@ -1,3 +1,64 @@
+#*************************************************************************
+#
+#   $RCSfile: unxhpxr.mk,v $
+#
+#   $Revision: 1.3 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:16 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
 # mak file fuer unxhpxr
 ASM=
@@ -16,10 +77,10 @@ CDEFS+=-D_PTHREADS -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -
 # 600 = Type specifier is omitted; "int" is no longer assumed.
 DISWARN=+W67,251,370,600
 
-#CC=/opt/aCC/bin/aCC
-#cc=/opt/ansic/bin/cc
-CC=aCC
-cc=cc
+#CXX=/opt/aCC/bin/aCC
+#CC=/opt/ansic/bin/cc
+CXX=aCC
+CC=cc
 CFLAGS= -c $(INCLUDE)
 CFLAGSCC= -Aa +e +Z
 CFLAGSCXX=$(DISWARN) +Z
diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk
index c05f905aa575..b09a6ff42a85 100644
--- a/solenv/inc/unxirgm.mk
+++ b/solenv/inc/unxirgm.mk
@@ -1,3 +1,65 @@
+#*************************************************************************
+#
+#   $RCSfile: unxirgm.mk,v $
+#
+#   $Revision: 1.5 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:16 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
 
 # Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI
 ASM=
@@ -12,17 +74,15 @@ AFLAGS=
 #		(ts&sdo/10.06.98)
 #
 #cc=			cc -KPIC -c -n32 -ansi
-cc=			gcc
-#CC=			CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
-CC=			g++ -c
+CC=			gcc
+#CXX=			CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
+CXX=			g++ -c
 CFLAGS=		$(INCLUDE)
-CDEFS+=	-DVCL -D_PTHREADS
-CDEFS+=	-D_STD_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450
-#CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DHAVE_UNISTD_H -DSTLPORT_VERSION=0x450
+CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
 # CFLAGS+=	-D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include
 # CFLAGS+=	-D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include
-CFLAGSCC=	 -w -c -nostdinc
-CFLAGSCXX= 	-w -fno-for-scope -fpermissive -nostdinc -nostdinc++
+CFLAGSCC=	 -c
+CFLAGSCXX= 	-fno-for-scope -fpermissive
 CFLAGSOBJGUIST=
 CFLAGSOBJCUIST=
 CFLAGSOBJGUIMT=
@@ -46,27 +106,20 @@ DYNAMIC=		-Wl,-Bdynamic
 #				**VALID MECHANISM SOMETIMES MISSING FOR LOCAL STANDS**
 #
 LINK=			g++
-LINKFLAGS=	-L/usr/lib32 -Wl,-no_unresolved
-
-.IF "$(TARGETTHREAD)"=="MT"
-LINKFLAGSAPPGUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs
-LINKFLAGSAPPCUI= $(THREADLIB) -Wl,-multigot -nodefaultlibs
-LINKFLAGSSHLGUI= $(THREADLIB) -shared -nodefaultlibs
-LINKFLAGSSHLCUI= $(THREADLIB) -shared -nodefaultlibs
-.ELSE
-LINKFLAGSAPPGUI= -Wl,-multigot -nodefaultlibs
-LINKFLAGSAPPCUI= -Wl,-multigot -nodefaultlibs
-LINKFLAGSSHLGUI= -shared -nodefaultlibs
-LINKFLAGSSHLCUI= -shared -nodefaultlibs
-.ENDIF
+LINKFLAGS=	-L/usr/lib32	
+LINKFLAGSAPPGUI= -Wl,-multigot
+LINKFLAGSAPPCUI= -Wl,-multigot
+
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
 
 LINKFLAGSTACK=
 LINKFLAGSPROF=
 LINKFLAGSDEBUG= -g
 LINKFLAGSOPT=
 
-#LINKFLAGSSHLGUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
-#LINKFLAGSSHLCUI += -Wl,-Bsymbolic -Wl,-soname -Wl,$(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOST) $(DYNAMIC)
+LINKFLAGSSHLGUI += -Wl,-Bsymbolic
+LINKFLAGSSHLCUI += -Wl,-Bsymbolic
 
 APPLINKSTATIC=-Bstatic
 APPLINKSHARED=-Bsymbolic
@@ -76,17 +129,17 @@ STDOBJGUI=
 STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
+# STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
 STDLIBGUIST=	$(DYNAMIC) -lX11 -lc -lm
-STDLIBCUIST=	$(DYNAMIC) -lgcc -lc
-STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
-STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
+STDLIBCUIST=	$(DYNAMIC) -lc -lm
+# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
+STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
+STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lc -lm
+# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
+STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
+STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
 THREADLIB=		-lpthread
 
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST= -lstlport_gcc
-
 LIBMGR=			ar
 LIBFLAGS=		-r
 # LIBEXT=		.so
@@ -111,9 +164,9 @@ DLLPRE=			lib
 DLLPOST=		.so
 
 
-LDUMP=c++filt
+LDUMP=
 
-#STDLIBCPP = -lstdc++
+STDLIBCPP = -lstdc++
 
 # --------------------------
 # FROM THE OLE ENVIRONMENT:
diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk
index 45b2219c94eb..8b403e14f51d 100644
--- a/solenv/inc/unxirxm.mk
+++ b/solenv/inc/unxirxm.mk
@@ -1,5 +1,66 @@
+#*************************************************************************
+#
+#   $RCSfile: unxirxm.mk,v $
+#
+#   $Revision: 1.5 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:17 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
-# mak-file fuer IRIX/mips
+# mak-file for IRIX/mips
 ASM=
 AFLAGS=
 
@@ -11,8 +72,8 @@ AFLAGS=
 #				statische Memberfunktion nicht instantisieren liess.
 #				(ts&sdo/10.06.98)
 #
-cc=			cc -KPIC -c -n32
-CC=			CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
+CC=			cc -KPIC -c -n32
+CXX=		CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
 CFLAGS=		$(INCLUDE)
 CDEFS+=-D_PTHREADS
 CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk
index 555d2d6c6db7..de5c4dff94e2 100644
--- a/solenv/inc/unxirxm3.mk
+++ b/solenv/inc/unxirxm3.mk
@@ -1,3 +1,64 @@
+#*************************************************************************
+#
+#   $RCSfile: unxirxm3.mk,v $
+#
+#   $Revision: 1.5 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:17 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
 # Makefile for IRIX/mips using MIPSpro 7.2+ compiler for n32 ABI
 ASM=
@@ -11,10 +72,10 @@ AFLAGS=
 #		couldn't be instantiated.
 #		(ts&sdo/10.06.98)
 #
-#cc=			cc -KPIC -c -n32 -ansi
-cc=			cc -KPIC -c -n32
-#CC=			CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
-CC=			CC -KPIC -c -n32 -ansi -ptused -OPT:Olimit=20523 
+#CC=			cc -KPIC -c -n32 -ansi
+CC=			cc -KPIC -c -n32
+#CXX=			CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
+CXX=			CC -KPIC -c -n32 -ansi -ptused -OPT:Olimit=20523 
 CFLAGS=		$(INCLUDE)
 CDEFS+=-D_PTHREADS
 CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
diff --git a/solenv/inc/unxlngi4.mk b/solenv/inc/unxlngi4.mk
index 47eea71d9b71..088d29492494 100644
--- a/solenv/inc/unxlngi4.mk
+++ b/solenv/inc/unxlngi4.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxlngi4.mk,v $
 #
-#   $Revision: 1.13 $
+#   $Revision: 1.14 $
 #
-#   last change: $Author: hr $ $Date: 2002-03-04 15:53:59 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:17 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -85,16 +85,16 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF 
 
 # name of C++ Compiler
-CC=g++
+CXX*=g++
 # name of C Compiler
-cc=gcc
+CC*=gcc
 # flags for C and C++ Compiler
 # do not use standard header search paths
 # if installed elsewhere
 .IF "$(BUILD_SOSL)"!=""
 CFLAGS=
 .ENDIF
-CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+CFLAGS+=-fmessage-length=0 -c $(INCLUDE) -g
 # flags for the C++ Compiler
 CFLAGSCC= -pipe -mcpu=pentiumpro
 # Flags for enabling exception handling
@@ -106,11 +106,9 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti 
 
 # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
-.IF "$(BUILD_SOSL)"==""
-.IF "$(UPDATER)"==""
+.IF "$(BUILD_SPECIAL)"==""
 CFLAGSCXX+=-include preinclude.h
 .ENDIF
-.ENDIF
 
 # Compiler flags for compiling static object in single threaded environment with graphical user interface
 CFLAGSOBJGUIST=
@@ -130,8 +128,9 @@ CFLAGSPROF=
 CFLAGSDEBUG=-g
 CFLAGSDBGUTIL=
 # Compiler flags for enabling optimazations
-# don't assume that strict aliasing rules apply
-CFLAGSOPT=-O2 -fno-strict-aliasing
+# CFLAGSOPT=-O2
+# reduce to -O1 to avoid optimisation problems
+CFLAGSOPT=-O1
 # Compiler flags for disabling optimazations
 CFLAGSNOOPT=-O
 # Compiler flags for discibing the output path
@@ -146,9 +145,11 @@ STATIC		= -Wl,-Bstatic
 DYNAMIC		= -Wl,-Bdynamic
 
 # name of linker
-LINK=gcc
+LINK*=$(CC)
+
 # default linker flags
-LINKFLAGS=
+# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
+LINKFLAGS=-z combreloc $(LINKFLAGSRUNPATH)
 
 # linker flags for linking applications
 LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
@@ -195,6 +196,8 @@ STDSHLCUIMT=-ldl -lpthread -lm
 STDSHLGUIST=-lX11 -lXext -ldl -lm
 STDSHLCUIST=-ldl -lm
 
+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+
 LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
 LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
 
diff --git a/solenv/inc/unxlngp.mk b/solenv/inc/unxlngp.mk
index 744720ed0eb7..db349deea0bf 100644
--- a/solenv/inc/unxlngp.mk
+++ b/solenv/inc/unxlngp.mk
@@ -1,5 +1,66 @@
+#*************************************************************************
+#
+#   $RCSfile: unxlngp.mk,v $
+#
+#   $Revision: 1.3 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:18 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
-# mak file fuer unxlngp
+# mak file for unxlngp
 ASM=
 AFLAGS=
 
@@ -19,8 +80,8 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF
 .ENDIF 
 
-CC=g++
-cc=gcc
+CXX*=g++
+CC*=gcc
 CFLAGS=-w -nostdinc -c $(INCLUDE) 
 CFLAGSCC= -pipe
 CFLAGSCXX= -pipe -fguiding-decls -fno-rtti -fno-exceptions
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index aec20b8bf1c9..b55ffad74363 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -1,3 +1,64 @@
+#*************************************************************************
+#
+#   $RCSfile: unxlngppc.mk,v $
+#
+#   $Revision: 1.10 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:18 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
 
 # Makefile for linux-ppc 
 # Christer Gustavsson <cg@nocrew.org> 
@@ -26,9 +87,9 @@ JAVA_RUNTIME=-ljava_g
 
 
 # name of C++ Compiler
-CC=g++ 
+CXX*=g++ 
 # name of C Compiler
-cc=gcc
+CC*=gcc
 
 # source code is still not signed versus unsigned char clean 
 CFLAGS=-fsigned-char -w -nostdinc -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include 
@@ -81,7 +142,7 @@ STATIC = -Wl,-Bstatic
 DYNAMIC = -Wl,-Bdynamic 
 
 # name of linker
-LINK=gcc 
+LINK*=gcc 
 # default linker flags
 LINKFLAGS= 
 
diff --git a/solenv/inc/unxlngppc4.mk b/solenv/inc/unxlngppc4.mk
index ee2290e3f2fc..14e758ed685a 100644
--- a/solenv/inc/unxlngppc4.mk
+++ b/solenv/inc/unxlngppc4.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxlngppc4.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: mh $ $Date: 2002-10-02 13:11:54 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -85,9 +85,9 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF 
 
 # name of C++ Compiler
-CC=g++
+CXX*=g++
 # name of C Compiler
-cc=gcc
+CC*=gcc
 
 # flags for C and C++ Compiler
 # do not use standard header search paths
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index c33d1dbf67c9..db6a3dc8834e 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -1,9 +1,10 @@
 #*************************************************************************
 #
-# unxlngr.mk for armv4l
-# Tak-Shing Chan <chan@aleph1.co.uk>
+#   $RCSfile: unxlngr.mk,v $
+#
+#   $Revision: 1.4 $
 #
-# Derived from unxlngi3.mk by obo
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -11,8 +12,56 @@
 #          - GNU Lesser General Public License Version 2.1
 #          - Sun Industry Standards Source License Version 1.1
 #
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+# 					Tak-Shing Chan <chan@aleph1.co.uk>
+#
+#
 #*************************************************************************
 
+# unxlngr.mk for armv4l
+
 # mk file for unxlngr
 ASM=
 AFLAGS=
@@ -37,9 +86,9 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF 
 
 # name of C++ Compiler
-CC=g++
+CXX*=g++
 # name of C Compiler
-cc=gcc
+CC*=gcc
 # flags for C and C++ Compiler
 # do not use standard header search paths
 # here the Compiler is installed in the solenv hierarchy, to be changed
diff --git a/solenv/inc/unxlngs3904.mk b/solenv/inc/unxlngs3904.mk
new file mode 100644
index 000000000000..e8d822169eb3
--- /dev/null
+++ b/solenv/inc/unxlngs3904.mk
@@ -0,0 +1,228 @@
+#*************************************************************************
+#
+#   $RCSfile: unxlngs3904.mk,v $
+#
+#   $Revision: 1.2 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:18 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+# mk file for linux s390 using gcc 3.X
+ASM=
+AFLAGS=
+
+SOLAR_JAVA=TRUE
+JAVAFLAGSDEBUG=-g
+
+# filter for supressing verbose messages from linker
+#not needed at the moment
+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+# _PTHREADS is needed for the stl
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# this is a platform with JAVA support
+.IF "$(SOLAR_JAVA)"!=""
+JAVADEF=-DSOLAR_JAVA
+.IF "$(debug)"==""
+JAVA_RUNTIME=-ljava
+.ELSE
+JAVA_RUNTIME=-ljava_g
+.ENDIF
+.ENDIF 
+
+# name of C++ Compiler
+CXX*=g++-3.2
+# name of C Compiler
+CC*=gcc-3.2
+
+# flags for C and C++ Compiler
+# do not use standard header search paths
+# if installed elsewhere
+.IF "$(BUILD_SOSL)"!=""
+CFLAGS= 
+.ENDIF
+CFLAGS+=-fsigned-char -fmessage-length=0 -c $(INCLUDE)
+
+# flags for the C++ Compiler
+CFLAGSCC= -fsigned-char -pipe 
+
+# Flags for enabling exception handling
+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+
+# Flags for disabling exception handling
+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+# -fpermissive should be removed as soon as possible
+#CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive -fno-rtti 
+CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive
+
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=-fPIC
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=-fPIC
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=-fPIC
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+
+# Compiler flags for profiling
+CFLAGSPROF=
+
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+
+# Compiler flags for enabling optimazations
+#CFLAGSOPT=-O2 -fno-schedule-insns -fno-strict-aliasing -fno-schedule-insns2
+CFLAGSOPT=-O2 -fno-strict-aliasing
+
+# Compiler flags for disabling optimazations
+# don't change - require dto work around optimization bugs
+CFLAGSNOOPT=-O0
+
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
+
+# Enable all warnings
+CFLAGSWALL=-Wall
+
+# Set default warn level
+CFLAGSDFLTWARN=-w
+
+# switches for dynamic and static linking
+STATIC		= -Wl,-Bstatic
+DYNAMIC		= -Wl,-Bdynamic
+
+# name of linker
+LINK*=g++-3.2
+# default linker flags
+LINKFLAGS=
+
+# linker flags for linking applications
+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+
+# linker flags for linking shared libraries
+LINKFLAGSSHLGUI= -shared
+LINKFLAGSSHLCUI= -shared
+
+LINKFLAGSTACK=
+LINKFLAGSPROF=
+LINKFLAGSDEBUG=-g
+LINKFLAGSOPT=
+
+.IF "$(NO_BSYMBOLIC)"==""
+.IF "$(PRJNAME)" != "envtest"
+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
+.ENDIF
+.ENDIF				# "$(NO_BSYMBOLIC)"==""
+
+LINKVERSIONMAPFLAG=-Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-ldl -lm
+STDLIBGUIMT=-lX11 -ldl -lpthread -lm
+STDLIBCUIMT=-ldl -lpthread -lm
+STDLIBGUIST=-lX11 -ldl -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
+STDSHLCUIMT=-ldl -lpthread -lm
+
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+
+# name of library manager
+LIBMGR=ar
+LIBFLAGS=-r
+
+# tool for generating import libraries
+IMPLIB=
+IMPLIBFLAGS=
+
+MAPSYM=
+MAPSYMFLAGS=
+
+RC=irc
+RCFLAGS=-fo$@ $(RCFILES)
+RCLINK=
+RCLINKFLAGS=
+RCSETVERSION=
+
+# platform specific identifier for shared libs
+DLLPOSTFIX=l3
+DLLPRE=lib
+DLLPOST=.so
diff --git a/solenv/inc/unxlnxi.mk b/solenv/inc/unxlnxi.mk
index ef37688188aa..61acc61b36a6 100644
--- a/solenv/inc/unxlnxi.mk
+++ b/solenv/inc/unxlnxi.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxlnxi.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: hjs $ $Date: 2001-05-09 10:51:49 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:19 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -79,8 +79,8 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF
 .ENDIF                                        
 
-CC=g++
-cc=gcc
+CXX*=g++
+CC*=gcc
 .IF "$(GLIBC)"=="2"
 CFLAGS=-w -c -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC)
 .ELSE
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index e7dca744e721..0af290dd748f 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxmacxp.mk,v $
 #
-#   $Revision: 1.41 $
+#   $Revision: 1.42 $
 #
-#   last change: $Author: hr $ $Date: 2002-08-16 16:38:00 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:19 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -83,8 +83,8 @@ JAVAFLAGSDEBUG=-g
 JAVA_RUNTIME=-framework JavaVM
 .ENDIF
 
-CC=cc
-cc=cc
+CXX*=cc
+CC*=cc
 objc=cc
 
 # [ed] 6/15/02 Some .. bleep .. decided to make a directory within a module that has the same
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
index e23ad96e8b5c..6ecf5f421433 100644
--- a/solenv/inc/unxscoi.mk
+++ b/solenv/inc/unxscoi.mk
@@ -1,3 +1,65 @@
+#*************************************************************************
+#
+#   $RCSfile: unxscoi.mk,v $
+#
+#   $Revision: 1.3 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:20 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
 
 # mak file fuer wnticci
 ASM=
@@ -7,8 +69,8 @@ CDEFS+=-D_PTHREADS -D_REENTRANT
 CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DX86 -DNEW_SOLAR
 # kann c++ was c braucht??
 
-CC=/nw386/dev/s/solenv/unxscoi/bin/g++
-cc=/nw386/dev/s/solenv/unxscoi/bin/gcc
+CXX*=/nw386/dev/s/solenv/unxscoi/bin/g++
+CC*=/nw386/dev/s/solenv/unxscoi/bin/gcc
 CFLAGS=-w -c $(INCLUDE)
 CFLAGSCC=-mpentium
 CFLAGSCXX= -mpentium
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index 13a734066d82..db593c04fc66 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -1,3 +1,65 @@
+#*************************************************************************
+#
+#   $RCSfile: unxsogs.mk,v $
+#
+#   $Revision: 1.5 $
+#
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:20 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
 # mk file fuer unxsogs
 ASM=
 AFLAGS=
@@ -21,8 +83,8 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF
 .ENDIF 
 
-CC=g++
-cc=gcc
+CXX*=g++
+CC*=gcc
 CFLAGS=-w -c $(INCLUDE)
 CFLAGSCC= -pipe
 
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 2a638986cc33..24290502cfe1 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -15,10 +15,10 @@ JAVA_RUNTIME=-ljava_g
 .ENDIF
 .ENDIF
 
-CC=CC
-cc=cc
+CXX=CC
+CC=cc
 
-CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp $(INCLUDE)
+CFLAGS=$(PREENVCFLAGS) -c -temp=/tmp $(INCLUDE) -g0
 CFLAGSCC=-xCC
 CFLAGSCXX=-features=no%altspell,no%localfor -library=no%Cstd
 
@@ -33,7 +33,7 @@ CFLAGSSLOGUIMT=-KPIC
 CFLAGSSLOCUIMT=-KPIC
 CFLAGSPROF=-xpg
 CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=-norunpath 
+CFLAGSDBGUTIL=
 CFLAGSOPT=-xarch=v8 -xO3 -xspace
 CFLAGSNOOPT=
 CFLAGSOUTOBJ=-o
@@ -54,7 +54,8 @@ LINK=CC
 
 # -z combreloc combines multiple relocation sections. Reduces overhead on startup
 # -norunpath prevents the compiler from recording his own libs in the runpath
-LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
+# LINKFLAGSRUNPATH*=-R\''$$ORIGIN'\'
+LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp $(LINKFLAGSRUNPATH) -norunpath -library=no%Cstd
 
 # -z text force fatal error if non PIC code is linked into shared library. Such code 
 #    would be expensive on startup
@@ -105,6 +106,8 @@ STDSHLCUIMT=-Bdynamic -lpthread -lCrun -lm -lc
 STDLIBGUIST+=-lX11
 STDLIBGUIMT+=-lX11
 
+LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
+
 LIBSTLPORT=$(DYNAMIC) -lstlport_sunpro
 LIBSTLPORTST=$(STATIC) -lstlport_sunpro $(DYNAMIC)
 
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index a9e201f82d5b..e8bc48f466cc 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: wnt.mk,v $
 #
-#   $Revision: 1.45 $
+#   $Revision: 1.46 $
 #
-#   last change: $Author: rt $ $Date: 2002-12-11 13:30:43 $
+#   last change: $Author: hr $ $Date: 2003-03-27 11:48:22 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -75,119 +75,6 @@ OLE2DEF=
 
 # --- C/C++ defines fuer nt ----------------------------------------
 
-.IF "$(HBTOOLKIT)"!=""
-CDEFS+=-DHB_DEBUG
-.ENDIF
-
-# --- Base fuer WNT setzen -----------------------------------------
-
-.IF "$(GUI)"=="WNT"
-BASE=0x1100000
-RESBASE=0x1100000
-.IF "$(PRJNAME)"=="OSL" || "$(PRJNAME)"=="osl"
-BASE=0x1c000000
-.ENDIF
-.IF "$(PRJNAME)"=="RTL" || "$(PRJNAME)"=="rtl"
-BASE=0x1c100000
-.ENDIF
-.IF "$(PRJNAME)"=="VOS" || "$(PRJNAME)"=="vos"
-BASE=0x1c200000
-.ENDIF
-.IF "$(PRJNAME)"=="UCR" || "$(PRJNAME)"=="ucr"
-BASE=0x1c300000
-.ENDIF
-.IF "$(PRJNAME)"=="USR" || "$(PRJNAME)"=="usr"
-BASE=0x1c400000
-.ENDIF
-.IF "$(PRJNAME)"=="UNO" || "$(PRJNAME)"=="uno"
-BASE=0x1c500000
-.ENDIF
-.IF "$(PRJNAME)"=="SOT" || "$(PRJNAME)"=="sot"
-BASE=0x1c900000
-.ENDIF
-.IF "$(PRJNAME)"=="TOOLS" || "$(PRJNAME)"=="tools"
-BASE=0x1c800000
-.ENDIF
-.IF "$(PRJNAME)"=="VCL" || "$(PRJNAME)"=="vcl"
-BASE=0x1c600000
-.ENDIF
-.IF "$(PRJNAME)"=="TOOLKIT" || "$(PRJNAME)"=="toolkit"
-BASE=0x1ca00000
-.ENDIF
-.IF "$(PRJNAME)"=="TKT" || "$(PRJNAME)"=="tkt"
-BASE=0x1cd00000
-.ENDIF
-.IF "$(PRJNAME)"=="SJ" || "$(PRJNAME)"=="sj"
-BASE=0x1d000000
-.ENDIF
-.IF "$(PRJNAME)"=="STARONE" || "$(PRJNAME)"=="starone" || "$(PRJNAME)"=="ONE" || "$(PRJNAME)"=="one" 
-BASE=0x1ce00000
-.ENDIF
-.IF "$(PRJNAME)"=="CHAOS" || "$(PRJNAME)"=="chaos" 
-BASE=0x1d100000
-.ENDIF
-.IF "$(PRJNAME)"=="SVTOOLS" || "$(PRJNAME)"=="svtools"
-BASE=0x1cb00000
-.ENDIF
-.IF "$(PRJNAME)"=="SO3" || "$(PRJNAME)"=="so3"
-BASE=0x1d400000
-.ENDIF
-.IF "$(PRJNAME)"=="GOODIES" || "$(PRJNAME)"=="goodies"
-BASE=0x1d290000
-.ENDIF
-.IF "$(PRJNAME)"=="BASIC" || "$(PRJNAME)"=="basic"
-BASE=0x1d380000
-.ENDIF
-.IF "$(PRJNAME)"=="HM2" || "$(PRJNAME)"=="hm2"
-BASE=0x1c700000
-.ENDIF
-.IF "$(PRJNAME)"=="SFX2" || "$(PRJNAME)"=="sfx2"
-BASE=0x1d500000
-RESBASE=0x1a00000
-.ENDIF
-.IF "$(PRJNAME)"=="SVX" || "$(PRJNAME)"=="svx"
-RESBASE=0x1d70000
-.ENDIF
-.IF "$(PRJNAME)"=="OFFMGR" || "$(PRJNAME)"=="offmgr"
-BASE=0x1dc00000
-RESBASE=0x1a20000
-.ENDIF
-.IF "$(PRJNAME)"=="SIM" || "$(PRJNAME)"=="sim" || "$(PRJNAME)"=="simage3"
-BASE=0x1cd00000
-RESBASE=0x1a30000
-.ENDIF
-.IF "$(PRJNAME)"=="SCH" || "$(PRJNAME)"=="sch" || "$(PRJNAME)"=="schart3"
-BASE=0x1ce00000
-RESBASE=0x1a40000
-.ENDIF
-.IF "$(PRJNAME)"=="SM" || "$(PRJNAME)"=="sm" || "$(PRJNAME)"=="smath3"
-BASE=0x1cf00000
-RESBASE=0x1a50000
-.ENDIF
-.IF "$(PRJNAME)"=="SDB" || "$(PRJNAME)"=="sdb"
-BASE=0x1d000000
-.ENDIF
-.IF "$(PRJNAME)"=="INET" || "$(PRJNAME)"=="inet"
-BASE=0x1d800000
-.ENDIF
-.IF "$(PRJNAME)"=="SW" || "$(PRJNAME)"=="sw" || "$(PRJNAME)"=="swriter3"
-BASE=0x1e000000
-RESBASE=0x1a60000
-.ENDIF
-.IF "$(PRJNAME)"=="SC" || "$(PRJNAME)"=="sc" || "$(PRJNAME)"=="scalc3"
-BASE=0x1e800000
-RESBASE=0x1a70000
-.ENDIF
-.IF "$(PRJNAME)"=="SD" || "$(PRJNAME)"=="sd" || "$(PRJNAME)"=="sdraw3"
-BASE=0x1eb00000
-RESBASE=0x1a80000
-.ENDIF
-.IF "$(PRJNAME)"=="OFF" || "$(PRJNAME)"=="off" || "$(PRJNAME)"=="offmgr"
-BASE=0x1b900000
-RESBASE=0x1a90000
-.ENDIF
-.ENDIF
-
 .IF "$(GUI)"=="WNT"
 .IF "$(profile)" != ""
 .IF "$(WST)"!=""
@@ -237,37 +124,37 @@ AFLAGS=/c /Cp /coff
 OLE2ANSI=TRUE
 
 .IF "$(bndchk)" != ""
-CC=nmcl
+CXX*=nmcl
 .ELSE
 .IF "$(truetime)" != ""
-CC=nmcl /NMttOn
+CXX*=nmcl /NMttOn
 .ELSE
 .IF "$(syntax)"!=""
-CC=$(SOLARROOT)\gcc\h-i386-cygwin32\bin\i386-cygwin32-gcc
+CXX*=$(SOLARROOT)\gcc\h-i386-cygwin32\bin\i386-cygwin32-gcc
 .ELSE
 .IF "$(USE_SHELL)"=="4nt"
-CC=cl
+CXX*=cl
 .ELSE			# "$(USE_SHELL)"=="4nt"
-CC=$(WRAPCMD) cl
+CXX*=$(WRAPCMD) cl
 .ENDIF			# "$(USE_SHELL)"=="4nt"
 .ENDIF
 .ENDIF
 .ENDIF
 
 .IF "$(stoponerror)" != ""
-CC+= /NMstoponerror
+CXX+= /NMstoponerror
 .ENDIF
 
 .IF "$(nmpass)" != ""
-CC+= /NMpass
+CXX+= /NMpass
 .ENDIF
 
 .IF "$(ttinlines)" != ""
-CC+= /NMttInlines	
+CXX+= /NMttInlines
 .ENDIF
 
 .IF "$(ttnolines)" != ""
-CC+= /NMttNoLines
+CXX+= /NMttNoLines
 .ENDIF
 
 #.IF"$(bndchk)"==""
@@ -278,7 +165,7 @@ CFLAGS+=-Zm200
 
 #.IF"$(bndchk)"==""
 .IF "$(COMEX)"=="8"
-CFLAGS+=-Zm500
+CFLAGS+=-Zm500 /wd4290 /wd4786 /wd4800
 .ENDIF
 #.ENDIF
 
@@ -287,7 +174,7 @@ CFLAGS+=-Zm500
 .IF "$(seg)" == ""
 .IF "$(demo)" == ""
 CDEFS+= -D_X86_=1 $(OLE2DEF)
-CFLAGS+=-c -nologo -W3 -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE)
+CFLAGS+=-c -nologo -W3 -Gs -Gy $(NOLOGO) $(MINUS_I)$(INCLUDE) -Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
 .IF "$(bndchk)" == ""
 CFLAGS+= -Ob1
 .ENDIF
@@ -363,11 +250,11 @@ CDEFSOBJST+=-DWIN32
 CDEFSOBJMT+=-DWIN32 -D_MT
 CDEFSOBJMT+=-DWIN32 -D_MT
 .ENDIF
-CFLAGSPROF=-Gh -Zd -Fd$(MISC)\$(TARGET).PDB
+CFLAGSPROF=-Gh -Zd -Fd$(MISC)\_ooo_st_$(TARGET).PDB
 .IF "$(PDBTARGET)"!=""
 CFLAGSDEBUG=-Zi -Fd$(MISC)\$(PDBTARGET).PDB
 .ELSE
-CFLAGSDEBUG=-Zi -Fd$(MISC)\$(TARGET).PDB
+CFLAGSDEBUG=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB
 .ENDIF
 CFLAGSDBGUTIL=
 CFLAGSOPT=-Ox
@@ -441,7 +328,7 @@ LINKFLAGS+= /NODEFAULTLIB /DEBUG:notmapped,full /DEBUGTYPE:cv
 .ENDIF
 .ELSE # ist keine product...
 .IF "$(COMEX)"!="3"
-LINKFLAGS+= /RELEASE
+LINKFLAGS+= /RELEASE /DEBUG:notmapped,full
 .ENDIF
 .ENDIF
 MAPFILE=-out:$$@
@@ -567,7 +454,7 @@ CPPLCC=$(WRAPCMD) cpplcc
 ASM=
 AFLAGS=
 
-CC=gcc
+CXX*=gcc
 ### Der gcc vertraegt kein Semikolon im Include-Pfad         RT
 # old:
 #CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF) 
@@ -599,7 +486,7 @@ CDEFS+=-D_M_IX86
 STATIC= -static
 DYNAMIC= -dynamic
 
-LINK=ld
+LINK*=ld
 CYGLIB=$(LIB:s/;/ -L/)
 LINKFLAGS=-nodefaultlibs -L$(CYGLIB)
 LINKFLAGSAPPGUI=$(COMPATH)$/i386-mingw32$/lib$/crt1.o