diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 767a55f44a0a..e2451b5d649e 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -41,6 +41,12 @@ APP1STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP1TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP1TARGETN:b)_linkinc.ls
+$(APP1TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     $(APP1RES) \
     $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
@@ -140,7 +146,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
         $(APP1LIBS) \
         $(APP1STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP1TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP1TARGETN:b)_linkobj.lst >> $(MISC)\$(APP1TARGET).lst
         +if exist $(MISC)\$(APP1TARGET).lst type $(MISC)\$(APP1TARGET).lst  >> $(MISC)\$(APP1TARGET).lnk
         $(LINK) @$(MISC)\$(APP1TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -227,6 +233,12 @@ APP2STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP2TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP2TARGETN:b)_linkinc.ls
+$(APP2TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     $(APP2RES) \
     $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
@@ -326,7 +338,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
         $(APP2LIBS) \
         $(APP2STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP2TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP2TARGETN:b)_linkobj.lst >> $(MISC)\$(APP2TARGET).lst
         +if exist $(MISC)\$(APP2TARGET).lst type $(MISC)\$(APP2TARGET).lst  >> $(MISC)\$(APP2TARGET).lnk
         $(LINK) @$(MISC)\$(APP2TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -413,6 +425,12 @@ APP3STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP3TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP3TARGETN:b)_linkinc.ls
+$(APP3TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     $(APP3RES) \
     $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
@@ -512,7 +530,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
         $(APP3LIBS) \
         $(APP3STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP3TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP3TARGETN:b)_linkobj.lst >> $(MISC)\$(APP3TARGET).lst
         +if exist $(MISC)\$(APP3TARGET).lst type $(MISC)\$(APP3TARGET).lst  >> $(MISC)\$(APP3TARGET).lnk
         $(LINK) @$(MISC)\$(APP3TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -599,6 +617,12 @@ APP4STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP4TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP4TARGETN:b)_linkinc.ls
+$(APP4TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     $(APP4RES) \
     $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
@@ -698,7 +722,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
         $(APP4LIBS) \
         $(APP4STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP4TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP4TARGETN:b)_linkobj.lst >> $(MISC)\$(APP4TARGET).lst
         +if exist $(MISC)\$(APP4TARGET).lst type $(MISC)\$(APP4TARGET).lst  >> $(MISC)\$(APP4TARGET).lnk
         $(LINK) @$(MISC)\$(APP4TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -785,6 +809,12 @@ APP5STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP5TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP5TARGETN:b)_linkinc.ls
+$(APP5TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     $(APP5RES) \
     $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
@@ -884,7 +914,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
         $(APP5LIBS) \
         $(APP5STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP5TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP5TARGETN:b)_linkobj.lst >> $(MISC)\$(APP5TARGET).lst
         +if exist $(MISC)\$(APP5TARGET).lst type $(MISC)\$(APP5TARGET).lst  >> $(MISC)\$(APP5TARGET).lnk
         $(LINK) @$(MISC)\$(APP5TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -971,6 +1001,12 @@ APP6STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP6TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP6TARGETN:b)_linkinc.ls
+$(APP6TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     $(APP6RES) \
     $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
@@ -1070,7 +1106,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
         $(APP6LIBS) \
         $(APP6STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP6TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP6TARGETN:b)_linkobj.lst >> $(MISC)\$(APP6TARGET).lst
         +if exist $(MISC)\$(APP6TARGET).lst type $(MISC)\$(APP6TARGET).lst  >> $(MISC)\$(APP6TARGET).lnk
         $(LINK) @$(MISC)\$(APP6TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -1157,6 +1193,12 @@ APP7STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP7TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP7TARGETN:b)_linkinc.ls
+$(APP7TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     $(APP7RES) \
     $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
@@ -1256,7 +1298,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
         $(APP7LIBS) \
         $(APP7STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP7TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP7TARGETN:b)_linkobj.lst >> $(MISC)\$(APP7TARGET).lst
         +if exist $(MISC)\$(APP7TARGET).lst type $(MISC)\$(APP7TARGET).lst  >> $(MISC)\$(APP7TARGET).lnk
         $(LINK) @$(MISC)\$(APP7TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -1343,6 +1385,12 @@ APP8STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP8TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP8TARGETN:b)_linkinc.ls
+$(APP8TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     $(APP8RES) \
     $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
@@ -1442,7 +1490,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
         $(APP8LIBS) \
         $(APP8STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP8TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP8TARGETN:b)_linkobj.lst >> $(MISC)\$(APP8TARGET).lst
         +if exist $(MISC)\$(APP8TARGET).lst type $(MISC)\$(APP8TARGET).lst  >> $(MISC)\$(APP8TARGET).lnk
         $(LINK) @$(MISC)\$(APP8TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -1529,6 +1577,12 @@ APP9STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP9TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP9TARGETN:b)_linkinc.ls
+$(APP9TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     $(APP9RES) \
     $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
@@ -1628,7 +1682,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
         $(APP9LIBS) \
         $(APP9STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP9TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP9TARGETN:b)_linkobj.lst >> $(MISC)\$(APP9TARGET).lst
         +if exist $(MISC)\$(APP9TARGET).lst type $(MISC)\$(APP9TARGET).lst  >> $(MISC)\$(APP9TARGET).lnk
         $(LINK) @$(MISC)\$(APP9TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
@@ -1715,6 +1769,12 @@ APP10STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP10TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP10TARGETN:b)_linkinc.ls
+$(APP10TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     $(APP10RES) \
     $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
@@ -1814,7 +1874,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
         $(APP10LIBS) \
         $(APP10STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP10TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP10TARGETN:b)_linkobj.lst >> $(MISC)\$(APP10TARGET).lst
         +if exist $(MISC)\$(APP10TARGET).lst type $(MISC)\$(APP10TARGET).lst  >> $(MISC)\$(APP10TARGET).lnk
         $(LINK) @$(MISC)\$(APP10TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 043f04ee86da..03f0b18b164e 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -164,6 +164,12 @@ SHL1DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_d
 .ENDIF			# "$(NO_SHL1DESCRIPTION)"==""
 
 .IF "$(SHL1TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL1TARGETN:b)_linkinc.ls
+$(SHL1TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL1TARGETN) : \
                     $(SHL1OBJS)\
                     $(SHL1DESCRIPTIONOBJ)\
@@ -325,7 +331,6 @@ $(SHL1TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL1TARGET).lnk del $(MISC)$/$(SHL1TARGET).lnk
         +if exist $(MISC)$/$(SHL1TARGET).lst del $(MISC)$/$(SHL1TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL1BASEX) \
@@ -338,9 +343,8 @@ $(SHL1TARGETN) : \
         $(STDSHL) \
         $(SHL1LINKRES) \
         ) >> $(MISC)$/$(SHL1TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL1TARGET).lnk
+        +type $(MISC)$/$(SHL1TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL1TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL1TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -591,6 +595,12 @@ SHL2DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_d
 .ENDIF			# "$(NO_SHL2DESCRIPTION)"==""
 
 .IF "$(SHL2TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL2TARGETN:b)_linkinc.ls
+$(SHL2TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL2TARGETN) : \
                     $(SHL2OBJS)\
                     $(SHL2DESCRIPTIONOBJ)\
@@ -752,7 +762,6 @@ $(SHL2TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL2TARGET).lnk del $(MISC)$/$(SHL2TARGET).lnk
         +if exist $(MISC)$/$(SHL2TARGET).lst del $(MISC)$/$(SHL2TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL2BASEX) \
@@ -765,9 +774,8 @@ $(SHL2TARGETN) : \
         $(STDSHL) \
         $(SHL2LINKRES) \
         ) >> $(MISC)$/$(SHL2TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL2TARGET).lnk
+        +type $(MISC)$/$(SHL2TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL2TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL2TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -1018,6 +1026,12 @@ SHL3DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_d
 .ENDIF			# "$(NO_SHL3DESCRIPTION)"==""
 
 .IF "$(SHL3TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL3TARGETN:b)_linkinc.ls
+$(SHL3TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL3TARGETN) : \
                     $(SHL3OBJS)\
                     $(SHL3DESCRIPTIONOBJ)\
@@ -1179,7 +1193,6 @@ $(SHL3TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL3TARGET).lnk del $(MISC)$/$(SHL3TARGET).lnk
         +if exist $(MISC)$/$(SHL3TARGET).lst del $(MISC)$/$(SHL3TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL3BASEX) \
@@ -1192,9 +1205,8 @@ $(SHL3TARGETN) : \
         $(STDSHL) \
         $(SHL3LINKRES) \
         ) >> $(MISC)$/$(SHL3TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL3TARGET).lnk
+        +type $(MISC)$/$(SHL3TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL3TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL3TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -1445,6 +1457,12 @@ SHL4DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_d
 .ENDIF			# "$(NO_SHL4DESCRIPTION)"==""
 
 .IF "$(SHL4TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL4TARGETN:b)_linkinc.ls
+$(SHL4TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL4TARGETN) : \
                     $(SHL4OBJS)\
                     $(SHL4DESCRIPTIONOBJ)\
@@ -1606,7 +1624,6 @@ $(SHL4TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL4TARGET).lnk del $(MISC)$/$(SHL4TARGET).lnk
         +if exist $(MISC)$/$(SHL4TARGET).lst del $(MISC)$/$(SHL4TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL4BASEX) \
@@ -1619,9 +1636,8 @@ $(SHL4TARGETN) : \
         $(STDSHL) \
         $(SHL4LINKRES) \
         ) >> $(MISC)$/$(SHL4TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL4TARGET).lnk
+        +type $(MISC)$/$(SHL4TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL4TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL4TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -1872,6 +1888,12 @@ SHL5DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_d
 .ENDIF			# "$(NO_SHL5DESCRIPTION)"==""
 
 .IF "$(SHL5TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL5TARGETN:b)_linkinc.ls
+$(SHL5TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL5TARGETN) : \
                     $(SHL5OBJS)\
                     $(SHL5DESCRIPTIONOBJ)\
@@ -2033,7 +2055,6 @@ $(SHL5TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL5TARGET).lnk del $(MISC)$/$(SHL5TARGET).lnk
         +if exist $(MISC)$/$(SHL5TARGET).lst del $(MISC)$/$(SHL5TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL5BASEX) \
@@ -2046,9 +2067,8 @@ $(SHL5TARGETN) : \
         $(STDSHL) \
         $(SHL5LINKRES) \
         ) >> $(MISC)$/$(SHL5TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL5TARGET).lnk
+        +type $(MISC)$/$(SHL5TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL5TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL5TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -2299,6 +2319,12 @@ SHL6DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_d
 .ENDIF			# "$(NO_SHL6DESCRIPTION)"==""
 
 .IF "$(SHL6TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL6TARGETN:b)_linkinc.ls
+$(SHL6TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL6TARGETN) : \
                     $(SHL6OBJS)\
                     $(SHL6DESCRIPTIONOBJ)\
@@ -2460,7 +2486,6 @@ $(SHL6TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL6TARGET).lnk del $(MISC)$/$(SHL6TARGET).lnk
         +if exist $(MISC)$/$(SHL6TARGET).lst del $(MISC)$/$(SHL6TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL6BASEX) \
@@ -2473,9 +2498,8 @@ $(SHL6TARGETN) : \
         $(STDSHL) \
         $(SHL6LINKRES) \
         ) >> $(MISC)$/$(SHL6TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL6TARGET).lnk
+        +type $(MISC)$/$(SHL6TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL6TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL6TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -2726,6 +2750,12 @@ SHL7DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_d
 .ENDIF			# "$(NO_SHL7DESCRIPTION)"==""
 
 .IF "$(SHL7TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL7TARGETN:b)_linkinc.ls
+$(SHL7TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL7TARGETN) : \
                     $(SHL7OBJS)\
                     $(SHL7DESCRIPTIONOBJ)\
@@ -2887,7 +2917,6 @@ $(SHL7TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL7TARGET).lnk del $(MISC)$/$(SHL7TARGET).lnk
         +if exist $(MISC)$/$(SHL7TARGET).lst del $(MISC)$/$(SHL7TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL7BASEX) \
@@ -2900,9 +2929,8 @@ $(SHL7TARGETN) : \
         $(STDSHL) \
         $(SHL7LINKRES) \
         ) >> $(MISC)$/$(SHL7TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL7TARGET).lnk
+        +type $(MISC)$/$(SHL7TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL7TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL7TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -3153,6 +3181,12 @@ SHL8DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_d
 .ENDIF			# "$(NO_SHL8DESCRIPTION)"==""
 
 .IF "$(SHL8TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL8TARGETN:b)_linkinc.ls
+$(SHL8TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL8TARGETN) : \
                     $(SHL8OBJS)\
                     $(SHL8DESCRIPTIONOBJ)\
@@ -3314,7 +3348,6 @@ $(SHL8TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL8TARGET).lnk del $(MISC)$/$(SHL8TARGET).lnk
         +if exist $(MISC)$/$(SHL8TARGET).lst del $(MISC)$/$(SHL8TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL8BASEX) \
@@ -3327,9 +3360,8 @@ $(SHL8TARGETN) : \
         $(STDSHL) \
         $(SHL8LINKRES) \
         ) >> $(MISC)$/$(SHL8TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL8TARGET).lnk
+        +type $(MISC)$/$(SHL8TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL8TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL8TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -3580,6 +3612,12 @@ SHL9DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_d
 .ENDIF			# "$(NO_SHL9DESCRIPTION)"==""
 
 .IF "$(SHL9TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL9TARGETN:b)_linkinc.ls
+$(SHL9TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL9TARGETN) : \
                     $(SHL9OBJS)\
                     $(SHL9DESCRIPTIONOBJ)\
@@ -3741,7 +3779,6 @@ $(SHL9TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL9TARGET).lnk del $(MISC)$/$(SHL9TARGET).lnk
         +if exist $(MISC)$/$(SHL9TARGET).lst del $(MISC)$/$(SHL9TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL9BASEX) \
@@ -3754,9 +3791,8 @@ $(SHL9TARGETN) : \
         $(STDSHL) \
         $(SHL9LINKRES) \
         ) >> $(MISC)$/$(SHL9TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL9TARGET).lnk
+        +type $(MISC)$/$(SHL9TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL9TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL9TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
@@ -4007,6 +4043,12 @@ SHL10DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}
 .ENDIF			# "$(NO_SHL10DESCRIPTION)"==""
 
 .IF "$(SHL10TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL10TARGETN:b)_linkinc.ls
+$(SHL10TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL10TARGETN) : \
                     $(SHL10OBJS)\
                     $(SHL10DESCRIPTIONOBJ)\
@@ -4168,7 +4210,6 @@ $(SHL10TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL10TARGET).lnk del $(MISC)$/$(SHL10TARGET).lnk
         +if exist $(MISC)$/$(SHL10TARGET).lst del $(MISC)$/$(SHL10TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL10BASEX) \
@@ -4181,9 +4222,8 @@ $(SHL10TARGETN) : \
         $(STDSHL) \
         $(SHL10LINKRES) \
         ) >> $(MISC)$/$(SHL10TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL10TARGET).lnk
+        +type $(MISC)$/$(SHL10TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL10TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL10TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index d53ed76ec41e..3802b0369e98 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.70 $
+#   $Revision: 1.71 $
 #
-#   last change: $Author: hjs $ $Date: 2001-09-26 12:24:57 $
+#   last change: $Author: hjs $ $Date: 2001-09-28 17:11:32 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -1847,10 +1847,6 @@ PRJHIDTARGET=$(MISC)$/$(PRJNAME).hid
 .ENDIF
 .ENDIF
 
-.IF "$(linkinc)"!=""
-LINKINCTARGETS+=$(MISC)$/linkinc.ls
-.ENDIF
-
 .IF "$(OS2_SOLENV_INC)"!=""
 OS2_COPY_MK=do_copy_mk
 .ENDIF
@@ -2872,11 +2868,11 @@ $(MISC)$/$(PRJNAME).hid : $(RESLIB1SRSFILES)
 
 .IF "$(linkinc)"!=""
 .IF "$(GUI)"=="WNT"
-$(MISC)$/linkinc.ls:
+$(MISC)$/%linkinc.ls .PHONY:
         +sed -f $(COMMON_ENV_TOOLS)\chrel.sed $(MISC)$/*.lin >> $@
 .ENDIF
 .ELSE
-$(MISC)$/linkinc.ls:
+$(MISC)$/%linkinc.ls:
     echo . > $@
 .ENDIF
 
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index e36edc8d4b25..2edd9988c1d0 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_app.mk,v $
 #
-#   $Revision: 1.28 $
+#   $Revision: 1.29 $
 #
-#   last change: $Author: hjs $ $Date: 2001-09-05 10:24:46 $
+#   last change: $Author: hjs $ $Date: 2001-09-28 17:11:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -136,6 +136,12 @@ APP$(TNR)STDLIBS+=$(STATICLIB)
 .ENDIF
 
 .IF "$(APP$(TNR)TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(APP$(TNR)TARGETN:b)_linkinc.ls
+$(APP$(TNR)TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     $(APP$(TNR)RES) \
     $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
@@ -235,7 +241,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
         $(APP$(TNR)LIBS) \
         $(APP$(TNR)STDLIBS) \
         $(STDLIB))
-        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\linkobj.lst >> $(MISC)\$(APP$(TNR)TARGET).lst
+        sed -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP$(TNR)TARGETN:b)_linkobj.lst >> $(MISC)\$(APP$(TNR)TARGET).lst
         +if exist $(MISC)\$(APP$(TNR)TARGET).lst type $(MISC)\$(APP$(TNR)TARGET).lst  >> $(MISC)\$(APP$(TNR)TARGET).lnk
         $(LINK) @$(MISC)\$(APP$(TNR)TARGET).lnk
 .ENDIF		# "$(linkinc)" == ""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 668d22bb3570..3b2de9b1d256 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_shl.mk,v $
 #
-#   $Revision: 1.43 $
+#   $Revision: 1.44 $
 #
-#   last change: $Author: hjs $ $Date: 2001-09-11 10:16:02 $
+#   last change: $Author: hjs $ $Date: 2001-09-28 17:11:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -264,6 +264,12 @@ SHL$(TNR)DESCRIPTIONOBJ*=$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)T
 .ENDIF			# "$(NO_SHL$(TNR)DESCRIPTION)"==""
 
 .IF "$(SHL$(TNR)TARGETN)"!=""
+
+.IF "$(linkinc)"!=""
+LINKINCTARGETS+=$(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls
+$(SHL$(TNR)TARGETN) : $(LINKINCTARGETS)
+.ENDIF          # "$(linkinc)"!=""
+
 $(SHL$(TNR)TARGETN) : \
                     $(SHL$(TNR)OBJS)\
                     $(SHL$(TNR)DESCRIPTIONOBJ)\
@@ -425,7 +431,6 @@ $(SHL$(TNR)TARGETN) : \
 .ELSE			# "$(linkinc)"==""
         +if exist $(MISC)$/$(SHL$(TNR)TARGET).lnk del $(MISC)$/$(SHL$(TNR)TARGET).lnk
         +if exist $(MISC)$/$(SHL$(TNR)TARGET).lst del $(MISC)$/$(SHL$(TNR)TARGET).lst
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
         +type $(mktmp \
         $(LINKFLAGS) \
         $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
@@ -438,9 +443,8 @@ $(SHL$(TNR)TARGETN) : \
         $(STDSHL) \
         $(SHL$(TNR)LINKRES) \
         ) >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
-        +type $(MISC)$/linkinc.ls  >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
+        +type $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls  >> $(MISC)$/$(SHL$(TNR)TARGET).lnk
         $(LINK) @$(MISC)$/$(SHL$(TNR)TARGET).lnk
-#		+if exist $(MISC)$/linkinc.ls del $(MISC)$/linkinc.ls
 .ENDIF			# "$(linkinc)"==""
 .ENDIF			# "$(GUI)" == "WNT"
 .IF "$(GUI)"=="UNX"