#92372# support for more than one link target

8 files changed, 200 insertions, 136 deletions

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index e2451b5d649e..2df362f74edc 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -43,6 +43,12 @@ APP1STDLIBS+=$(STATICLIB)
 .IF "$(APP1TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP1TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP1TARGETN:b)_linkinc.ls
 $(APP1TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -235,6 +241,12 @@ APP2STDLIBS+=$(STATICLIB)
 .IF "$(APP2TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP2TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP2TARGETN:b)_linkinc.ls
 $(APP2TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -427,6 +439,12 @@ APP3STDLIBS+=$(STATICLIB)
 .IF "$(APP3TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP3TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP3TARGETN:b)_linkinc.ls
 $(APP3TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -619,6 +637,12 @@ APP4STDLIBS+=$(STATICLIB)
 .IF "$(APP4TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP4TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP4TARGETN:b)_linkinc.ls
 $(APP4TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -811,6 +835,12 @@ APP5STDLIBS+=$(STATICLIB)
 .IF "$(APP5TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP5TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP5TARGETN:b)_linkinc.ls
 $(APP5TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -1003,6 +1033,12 @@ APP6STDLIBS+=$(STATICLIB)
 .IF "$(APP6TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP6TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP6TARGETN:b)_linkinc.ls
 $(APP6TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -1195,6 +1231,12 @@ APP7STDLIBS+=$(STATICLIB)
 .IF "$(APP7TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP7TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP7TARGETN:b)_linkinc.ls
 $(APP7TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -1387,6 +1429,12 @@ APP8STDLIBS+=$(STATICLIB)
 .IF "$(APP8TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP8TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP8TARGETN:b)_linkinc.ls
 $(APP8TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -1579,6 +1627,12 @@ APP9STDLIBS+=$(STATICLIB)
 .IF "$(APP9TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP9TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP9TARGETN:b)_linkinc.ls
 $(APP9TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
@@ -1771,6 +1825,12 @@ APP10STDLIBS+=$(STATICLIB)
 .IF "$(APP10TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP10TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP10TARGETN:b)_linkinc.ls
 $(APP10TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk
index 6ec4a49414a2..e55bfa089a23 100644
--- a/solenv/inc/_tg_lib.mk
+++ b/solenv/inc/_tg_lib.mk
@@ -6,9 +6,6 @@
 $(LIB1ARCHIV) :	$(LIB1TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB1ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -26,7 +23,6 @@ $(LIB1ARCHIV) :	$(LIB1TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB1ARCHIV)" != ""
 
@@ -60,23 +56,19 @@ $(LIB1TARGET) :	$(LIB1FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES))
+    @-+echo $(LIB1OBJFILES) > $(null,$(LIB1OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB1FILES:+"&\n") \
-    $(LIB1OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB1OBJFILES)
     $(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB1TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB2TARGET)" != ""
@@ -85,9 +77,6 @@ $(LIB1TARGET) :	$(LIB1FILES) \
 $(LIB2ARCHIV) :	$(LIB2TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB2ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -105,7 +94,6 @@ $(LIB2ARCHIV) :	$(LIB2TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB2ARCHIV)" != ""
 
@@ -139,23 +127,19 @@ $(LIB2TARGET) :	$(LIB2FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES))
+    @-+echo $(LIB2OBJFILES) > $(null,$(LIB2OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB2FILES:+"&\n") \
-    $(LIB2OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB2OBJFILES)
     $(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB2TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB3TARGET)" != ""
@@ -164,9 +148,6 @@ $(LIB2TARGET) :	$(LIB2FILES) \
 $(LIB3ARCHIV) :	$(LIB3TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB3ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -184,7 +165,6 @@ $(LIB3ARCHIV) :	$(LIB3TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB3ARCHIV)" != ""
 
@@ -218,23 +198,19 @@ $(LIB3TARGET) :	$(LIB3FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES))
+    @-+echo $(LIB3OBJFILES) > $(null,$(LIB3OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB3FILES:+"&\n") \
-    $(LIB3OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB3OBJFILES)
     $(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB3TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB4TARGET)" != ""
@@ -243,9 +219,6 @@ $(LIB3TARGET) :	$(LIB3FILES) \
 $(LIB4ARCHIV) :	$(LIB4TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB4ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -263,7 +236,6 @@ $(LIB4ARCHIV) :	$(LIB4TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB4ARCHIV)" != ""
 
@@ -297,23 +269,19 @@ $(LIB4TARGET) :	$(LIB4FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES))
+    @-+echo $(LIB4OBJFILES) > $(null,$(LIB4OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB4FILES:+"&\n") \
-    $(LIB4OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB4OBJFILES)
     $(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB4TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB5TARGET)" != ""
@@ -322,9 +290,6 @@ $(LIB4TARGET) :	$(LIB4FILES) \
 $(LIB5ARCHIV) :	$(LIB5TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB5ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -342,7 +307,6 @@ $(LIB5ARCHIV) :	$(LIB5TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB5ARCHIV)" != ""
 
@@ -376,23 +340,19 @@ $(LIB5TARGET) :	$(LIB5FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES))
+    @-+echo $(LIB5OBJFILES) > $(null,$(LIB5OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB5FILES:+"&\n") \
-    $(LIB5OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB5OBJFILES)
     $(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB5TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB6TARGET)" != ""
@@ -401,9 +361,6 @@ $(LIB5TARGET) :	$(LIB5FILES) \
 $(LIB6ARCHIV) :	$(LIB6TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB6ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -421,7 +378,6 @@ $(LIB6ARCHIV) :	$(LIB6TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB6ARCHIV)" != ""
 
@@ -455,23 +411,19 @@ $(LIB6TARGET) :	$(LIB6FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES))
+    @-+echo $(LIB6OBJFILES) > $(null,$(LIB6OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB6FILES:+"&\n") \
-    $(LIB6OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB6OBJFILES)
     $(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB6TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB7TARGET)" != ""
@@ -480,9 +432,6 @@ $(LIB6TARGET) :	$(LIB6FILES) \
 $(LIB7ARCHIV) :	$(LIB7TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB7ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -500,7 +449,6 @@ $(LIB7ARCHIV) :	$(LIB7TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB7ARCHIV)" != ""
 
@@ -534,23 +482,19 @@ $(LIB7TARGET) :	$(LIB7FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES))
+    @-+echo $(LIB7OBJFILES) > $(null,$(LIB7OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB7FILES:+"&\n") \
-    $(LIB7OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB7OBJFILES)
     $(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB7TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB8TARGET)" != ""
@@ -559,9 +503,6 @@ $(LIB7TARGET) :	$(LIB7FILES) \
 $(LIB8ARCHIV) :	$(LIB8TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB8ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -579,7 +520,6 @@ $(LIB8ARCHIV) :	$(LIB8TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB8ARCHIV)" != ""
 
@@ -613,23 +553,19 @@ $(LIB8TARGET) :	$(LIB8FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES))
+    @-+echo $(LIB8OBJFILES) > $(null,$(LIB8OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB8FILES:+"&\n") \
-    $(LIB8OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB8OBJFILES)
     $(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB8TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB9TARGET)" != ""
@@ -638,9 +574,6 @@ $(LIB8TARGET) :	$(LIB8FILES) \
 $(LIB9ARCHIV) :	$(LIB9TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB9ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -658,7 +591,6 @@ $(LIB9ARCHIV) :	$(LIB9TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB9ARCHIV)" != ""
 
@@ -692,23 +624,19 @@ $(LIB9TARGET) :	$(LIB9FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES))
+    @-+echo $(LIB9OBJFILES) > $(null,$(LIB9OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB9FILES:+"&\n") \
-    $(LIB9OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB9OBJFILES)
     $(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB9TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
 # unroll begin
 
 .IF "$(LIB10TARGET)" != ""
@@ -717,9 +645,6 @@ $(LIB9TARGET) :	$(LIB9FILES) \
 $(LIB10ARCHIV) :	$(LIB10TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB10ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -737,7 +662,6 @@ $(LIB10ARCHIV) :	$(LIB10TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB10ARCHIV)" != ""
 
@@ -771,20 +695,16 @@ $(LIB10TARGET) :	$(LIB10FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES))
+    @-+echo $(LIB10OBJFILES) > $(null,$(LIB10OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB10FILES:+"&\n") \
-    $(LIB10OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB10OBJFILES)
     $(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
 .ENDIF          # "$(LIB10TARGET)" != ""
 
 # Anweisungen fuer das LIBTARGETs
-#next Target
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 03f0b18b164e..daf44bba66e4 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -166,8 +166,18 @@ SHL1DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_d
 .IF "$(SHL1TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL1TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL1TARGETN:b)_linkinc.ls
 $(SHL1TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL1TARGETN) : \
@@ -597,8 +607,18 @@ SHL2DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_d
 .IF "$(SHL2TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL2TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL2TARGETN:b)_linkinc.ls
 $(SHL2TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL2TARGETN) : \
@@ -1028,8 +1048,18 @@ SHL3DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_d
 .IF "$(SHL3TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL3TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL3TARGETN:b)_linkinc.ls
 $(SHL3TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL3TARGETN) : \
@@ -1459,8 +1489,18 @@ SHL4DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_d
 .IF "$(SHL4TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL4TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL4TARGETN:b)_linkinc.ls
 $(SHL4TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL4TARGETN) : \
@@ -1890,8 +1930,18 @@ SHL5DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_d
 .IF "$(SHL5TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL5TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL5TARGETN:b)_linkinc.ls
 $(SHL5TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL5TARGETN) : \
@@ -2321,8 +2371,18 @@ SHL6DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_d
 .IF "$(SHL6TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL6TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL6TARGETN:b)_linkinc.ls
 $(SHL6TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL6TARGETN) : \
@@ -2752,8 +2812,18 @@ SHL7DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_d
 .IF "$(SHL7TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL7TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL7TARGETN:b)_linkinc.ls
 $(SHL7TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL7TARGETN) : \
@@ -3183,8 +3253,18 @@ SHL8DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_d
 .IF "$(SHL8TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL8TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL8TARGETN:b)_linkinc.ls
 $(SHL8TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL8TARGETN) : \
@@ -3614,8 +3694,18 @@ SHL9DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_d
 .IF "$(SHL9TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL9TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL9TARGETN:b)_linkinc.ls
 $(SHL9TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL9TARGETN) : \
@@ -4045,8 +4135,18 @@ SHL10DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}
 .IF "$(SHL10TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(SHL10TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(SHL10TARGETN:b)_linkinc.ls
 $(SHL10TARGETN) : $(LINKINCTARGETS)
+
+.ELSE
+$(MISC)$/%linkinc.ls:
+    echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
 $(SHL10TARGETN) : \
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index f48974648d61..8925615bc646 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.78 $
+#   $Revision: 1.79 $
 #
-#   last change: $Author: hjs $ $Date: 2001-10-18 12:58:32 $
+#   last change: $Author: hjs $ $Date: 2001-10-23 15:07:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -2878,28 +2878,10 @@ $(MISC)$/$(PRJNAME).hid : $(RESLIB1SRSFILES)
     @+if exist $(MISC)\*.* $(ENV_TOOLS)$/slothid.bat $(MISC)\*.lst $@ $(INPATH)
     @echo done Making $@
 
-.IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT"
-$(MISC)$/%linkinc.ls .PHONY:
-        +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(MISC)$/*.lin >> $@
-.ENDIF
-.ELSE
-$(MISC)$/%linkinc.ls:
-    echo . > $@
-.ENDIF
-
-
 .IF "$(SOLAR_JAVA)"!=""
 .INCLUDE : tg_java.mk
 .ENDIF          # "$(SOLAR_JAVA)"!=""
 
-$(MISC)\$(TARGET).lck:
-    @vlog -BL *.??v > $(MISC)\$(TARGET).lck
-
-.IF "$(COM)"=="WTC"
-libr:
-.ENDIF
-
 # dependencies from *.lng to par-files, this dependency is too much
 # but better than nothing
 .IF "$(PARFILES)"!=""
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 2edd9988c1d0..b2c2cfe61fd7 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_app.mk,v $
 #
-#   $Revision: 1.29 $
+#   $Revision: 1.30 $
 #
-#   last change: $Author: hjs $ $Date: 2001-09-28 17:11:33 $
+#   last change: $Author: hjs $ $Date: 2001-10-23 15:07:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -138,6 +138,12 @@ APP$(TNR)STDLIBS+=$(STATICLIB)
 .IF "$(APP$(TNR)TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
+.IF "$(GUI)"=="WNT"
+$(MISC)$/$(APP$(TNR)TARGET)_linkinc.ls .PHONY:
+    @+-$(RM) $@ >& $(NULLDEV)
+    +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(foreach,i,$(APP$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
+.ENDIF
+
 LINKINCTARGETS+=$(MISC)$/$(APP$(TNR)TARGETN:b)_linkinc.ls
 $(APP$(TNR)TARGETN) : $(LINKINCTARGETS)
 .ENDIF          # "$(linkinc)"!=""
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index 18006a43509a..c0e68579b3e8 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -40,9 +40,6 @@ LIB1 LIB2 LIB3 LIB4 LIB5 LIB6 LIB7 LIB8 LIB9:
 $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
     @echo Making: $@
     @-+$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="MAC"
-    +$(LIBMGR) $(LIBFLAGS) -o $(shell $(UNIX2MACPATH) $(LIB$(TNR)ARCHIV) `cat /dev/null $@ | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g`)
-.ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="UNX"
     @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
 .IF "$(OS)" =="HPUX_FRAG_HR"
@@ -60,7 +57,6 @@ $(LIB$(TNR)ARCHIV) :	$(LIB$(TNR)TARGET)
 .ELSE			# "$(GUI)"=="UNX"
     @echo just a dummy > $@
 .ENDIF			# "$(GUI)"=="UNX"
-.ENDIF          # "$(GUI)"=="MAC"
 
 .ENDIF			# "$(LIB$(TNR)ARCHIV)" != ""
 
@@ -94,16 +90,13 @@ $(LIB$(TNR)TARGET) :	$(LIB$(TNR)FILES) \
 .ELSE                   # "$(GUI)"=="MAC"
 .IF "$(GUI)"=="WNT"
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES))
+    @-+echo $(LIB$(TNR)OBJFILES) > $(null,$(LIB$(TNR)OBJFILES) $(NULLDEV) $(@:s/.lib/.lib/))
+    @-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/)
     @+echo.
 .ELSE			# "$(GUI)"=="WNT"
     @+-$(RM) $@
-.IF "$(COM)"=="ICC"
-    $(LIBMGR) $(LIBFLAGS) $@ @$(mktmp $(LIB$(TNR)FILES:+"&\n") \
-    $(LIB$(TNR)OBJFILES:+"&\n");)
-.ELSE
     +echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
     $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
-.ENDIF
 .ENDIF          # "$(GUI)"=="WNT"
 .ENDIF          # "$(GUI)"=="MAC"
 .ENDIF          # "$(GUI)"=="UNX"
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
index c6784cd080af..9c09c87e4840 100644
--- a/solenv/inc/tg_obj.mk
+++ b/solenv/inc/tg_obj.mk
@@ -10,6 +10,7 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
     @+$(TYPE) $@ | tr -d �\n\r� > $@
     @+echo. >> $@
 .ELSE			# "$(COM)"=="GCC"
+    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(GUI)"=="WNT"
@@ -28,6 +29,7 @@ $(SVXLIGHTOBJTARGET): $(REAL_SVXLIGHTOBJFILES)
 #     $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)
     +echo. $(foreach,i,$(REAL_SVXLIGHTOBJFILES:f) $(ROBJ)$/$(i)) >> $@
 .ELSE
+    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
 .ENDIF
 .ENDIF			# "$(GUI)"=="WNT"
@@ -46,6 +48,7 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
 #     $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES)
     +echo. $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) > $@
 .ELSE
+    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
 .ENDIF
 .ENDIF			# "$(GUI)"=="WNT"
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
index 4fd621d3854e..7b95e62baebf 100644
--- a/solenv/inc/tg_slo.mk
+++ b/solenv/inc/tg_slo.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_slo.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: hjs $ $Date: 2001-08-08 17:16:25 $
+#   last change: $Author: hjs $ $Date: 2001-10-23 15:07:29 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -73,7 +73,7 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
     @echo Making: $@
 #	@+$(RM) $@
 .IF "$(GUI)"=="WNT"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(MISC)$/$(TARGET).lin
+    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
 .ENDIF			# "$(GUI)"=="WNT"
 .IF "$(GUI)"=="UNX"
@@ -93,7 +93,7 @@ $(SVXLIGHTSLOTARGET): $(REAL_SVXLIGHTSLOFILES)
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="WNT"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(MISC)$/$(TARGET).lin
+    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
 .ENDIF			# "$(GUI)"=="WNT"
 .IF "$(GUI)"=="UNX"
@@ -111,7 +111,7 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="WNT"
-    @-$(TYPE) $(mktmp $(&:+"\n")) > $(MISC)$/$(TARGET).lin
+    @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
     $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
 .ENDIF			# "$(GUI)"=="WNT"
 .IF "$(GUI)"=="UNX"