Corrected linking steps for Mac OS X so that the number of arguments to the linker is reduced. All of the -dylib_file arguments were pushing the number of arguments past the maximum that ld could handle.

5 files changed, 425 insertions, 196 deletions

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 318c533664ce..980cf4b65308 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -48,16 +48,17 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP1OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -68,6 +69,16 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP1OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -215,16 +226,17 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP2OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -235,6 +247,16 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP2OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -382,16 +404,17 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP3OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -402,6 +425,16 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP3OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -549,16 +582,17 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP4OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -569,6 +603,16 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP4OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -716,16 +760,17 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP5OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -736,6 +781,16 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP5OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -883,16 +938,17 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP6OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -903,6 +959,16 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP6OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -1050,16 +1116,17 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP7OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -1070,6 +1137,16 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP7OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -1217,16 +1294,17 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP8OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -1237,6 +1315,16 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP8OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -1384,16 +1472,17 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP9OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -1404,6 +1493,16 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP9OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
@@ -1551,16 +1650,17 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP10OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -1571,6 +1671,16 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP10OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 4a8bce3d3dfc..3ace5a134849 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -333,18 +333,17 @@ $(SHL1TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
-    $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
+    $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -356,14 +355,25 @@ $(SHL1TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL1TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL1TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
+    $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL1TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -707,18 +717,17 @@ $(SHL2TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
-    $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
+    $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -730,14 +739,25 @@ $(SHL2TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL2TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL2TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
+    $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL2TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -1081,18 +1101,17 @@ $(SHL3TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
-    $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
+    $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -1104,14 +1123,25 @@ $(SHL3TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL3TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL3TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
+    $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL3TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -1455,18 +1485,17 @@ $(SHL4TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
-    $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
+    $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -1478,14 +1507,25 @@ $(SHL4TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL4TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL4TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
+    $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL4TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -1829,18 +1869,17 @@ $(SHL5TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
-    $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
+    $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -1852,14 +1891,25 @@ $(SHL5TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL5TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL5TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
+    $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL5TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -2203,18 +2253,17 @@ $(SHL6TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
-    $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
+    $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -2226,14 +2275,25 @@ $(SHL6TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL6TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL6TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
+    $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL6TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -2577,18 +2637,17 @@ $(SHL7TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
-    $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
+    $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -2600,14 +2659,25 @@ $(SHL7TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL7TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL7TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
+    $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL7TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -2951,18 +3021,17 @@ $(SHL8TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
-    $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
+    $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -2974,14 +3043,25 @@ $(SHL8TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL8TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL8TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
+    $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL8TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -3325,18 +3405,17 @@ $(SHL9TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
-    $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
+    $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -3348,14 +3427,25 @@ $(SHL9TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL9TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL9TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
+    $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL9TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
@@ -3699,18 +3789,17 @@ $(SHL10TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
-    $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
+    $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -3722,14 +3811,25 @@ $(SHL10TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL10TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL10TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
+    $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL10TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 82d64ca307ee..f02f9aff1e9d 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -3,8 +3,8 @@
 #*    $Workfile:   tg_app.mk  $
 #*
 #*    Ersterstellung    XX  TT.MM.JJ
-#*    Letzte Aenderung  $Author: pluby $ $Date: 2001-03-03 17:27:42 $
-#*    $Revision: 1.19 $
+#*    Letzte Aenderung  $Author: pluby $ $Date: 2001-03-06 19:20:33 $
+#*    $Revision: 1.20 $
 #*
 #*    $Logfile:   T:/solar/inc/tg_app.mkv  $
 #*
@@ -94,16 +94,17 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="MACOSX"
     @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-    -o $@ $(APP$(TNR)OBJS:s/.obj/.o/)\
-    `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
-    $(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
+    $(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @source $(MISC)$/$(@:b).cmd
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -114,6 +115,16 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @echo "Making: $@.app"
     @create-bundle $@
 .ENDIF		# "$(TARGETTYPE)"=="GUI"
+.ELSE		# "$(OS)"=="MACOSX"
+    @+echo unx
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+    -o $@ $(APP$(TNR)OBJS:s/.obj/.o/) \
+    `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \
+    $(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @source $(MISC)$/$(@:b).cmd
+    @ls -l $@
 .ENDIF		# "$(OS)"=="MACOSX"
 .ENDIF
 .IF "$(GUI)"=="MAC"
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 26155e478460..455c727928a9 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_shl.mk,v $
 #
-#   $Revision: 1.28 $
+#   $Revision: 1.29 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-03 17:27:42 $
+#   last change: $Author: pluby $ $Date: 2001-03-06 19:20:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -238,8 +238,6 @@ $(SHL$(TNR)TARGETN) : \
                     $(USE_SHL$(TNR)VERSIONMAP)\
                     $(SHL$(TNR)RES)\
                     $(SHL$(TNR)VERSIONH)\
-.IF "$(OS)"=="MACOSX"
-.ENDIF
                     $(SHL$(TNR)DEPN)
     @echo ------------------------------
     @echo Making: $(SHL$(TNR)TARGETN)
@@ -435,18 +433,17 @@ $(SHL$(TNR)TARGETN) : \
         @+if ( ! -e $(SOLARLIBDIR)/so_locations ) touch $(SOLARLIBDIR)/so_locations
 .ENDIF			# "$(OS)"=="IRIX"
 .ENDIF
+.IF "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).list
     @+-$(RM) $(MISC)$/$(@:b).cmd
-    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
-    $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
-    `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
-    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @+echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
+    $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) \
+    `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
+    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
     @cat $(MISC)$/$(@:b).cmd
     @+source $(MISC)$/$(@:b).cmd
-.IF "$(OS)"=="S390"
-    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
-.ENDIF
     @ls -l $@
-.IF "$(OS)"=="MACOSX"
 # This is a hack as libstatic and libcppuhelper have a circular dependency
 .IF "$(PRJNAME)"=="cppuhelper"
     @echo "------------------------------"
@@ -458,14 +455,25 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF
     @echo "Making: $@.framework"
     @create-bundle $@
-.ENDIF
 .IF "$(UPDATER)"=="YES"
-.IF "$(OS)"=="MACOSX"
     +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL$(TNR)TARGETN).framework
-.ELSE
-    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL$(TNR)TARGETN)
 .ENDIF
+.ELSE			# "$(OS)"=="MACOSX"
+    @+-$(RM) $(MISC)$/$(@:b).cmd
+    @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \
+    $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) -o $@ \
+    `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+    $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
+    @cat $(MISC)$/$(@:b).cmd
+    @+source $(MISC)$/$(@:b).cmd
+.IF "$(OS)"=="S390"
+    +mv -f ($@:s/$(DLLPOST)/.x/) $(LB)
+.ENDIF
+    @ls -l $@
+.IF "$(UPDATER)"=="YES"
+    +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL$(TNR)TARGETN)
 .ENDIF			# "$(UPDATER)"=="YES"
+.ENDIF			# "$(OS)"=="MACOSX"
 .ENDIF			# "$(GUI)" == "UNX"
 .IF "$(GUI)"=="MAC"
     @+-$(RM) $@ $@.xSYM
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index b0c4cce53f4f..054a4241d5a6 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxmacxp.mk,v $
 #
-#   $Revision: 1.27 $
+#   $Revision: 1.28 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-04 22:12:09 $
+#   last change: $Author: pluby $ $Date: 2001-03-06 19:20:33 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -129,7 +129,7 @@ CFLAGSNOOPT=
 .ENDIF
 CFLAGSOUTOBJ=-o
 
-SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(LB)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST) 2>/dev/null")
+SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(LB)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST) 2>/dev/null | grep -E -v 'lib\w+static'")
 .IF "$(STLPORT4)"!=""
 SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) 2>/dev/null")
 .ENDIF