Index: inc/_tg_app.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/_tg_app.mk,v
retrieving revision 1.39
diff -u -r1.39 _tg_app.mk
--- inc/_tg_app.mk	4 Jun 2003 10:39:32 -0000	1.39
+++ inc/_tg_app.mk	7 Jul 2003 18:51:29 -0000
@@ -30,7 +30,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -57,7 +57,7 @@
 $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
 	$(APP1RES) \
 	$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -73,6 +73,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP1STDLIBS)` \
 	$(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -81,12 +82,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -244,7 +247,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -271,7 +274,7 @@
 $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
 	$(APP2RES) \
 	$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -287,6 +290,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP2STDLIBS)` \
 	$(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -295,12 +299,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -458,7 +464,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -485,7 +491,7 @@
 $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
 	$(APP3RES) \
 	$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -501,6 +507,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP3STDLIBS)` \
 	$(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -509,12 +516,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -672,7 +681,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -699,7 +708,7 @@
 $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
 	$(APP4RES) \
 	$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -715,6 +724,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP4STDLIBS)` \
 	$(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -723,12 +733,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -886,7 +898,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -913,7 +925,7 @@
 $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
 	$(APP5RES) \
 	$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -929,6 +941,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP5STDLIBS)` \
 	$(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -937,12 +950,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -1100,7 +1115,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -1127,7 +1142,7 @@
 $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
 	$(APP6RES) \
 	$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -1143,6 +1158,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP6STDLIBS)` \
 	$(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -1151,12 +1167,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -1314,7 +1332,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -1341,7 +1359,7 @@
 $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
 	$(APP7RES) \
 	$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -1357,6 +1375,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP7STDLIBS)` \
 	$(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -1365,12 +1384,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -1528,7 +1549,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -1555,7 +1576,7 @@
 $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
 	$(APP8RES) \
 	$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -1571,6 +1592,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP8STDLIBS)` \
 	$(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -1579,12 +1601,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -1742,7 +1766,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -1769,7 +1793,7 @@
 $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
 	$(APP9RES) \
 	$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -1785,6 +1809,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP9STDLIBS)` \
 	$(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -1793,12 +1818,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
@@ -1956,7 +1983,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -1983,7 +2010,7 @@
 $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
 	$(APP10RES) \
 	$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -1999,6 +2026,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP10STDLIBS)` \
 	$(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -2007,12 +2035,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
Index: inc/_tg_shl.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/_tg_shl.mk,v
retrieving revision 1.72
diff -u -r1.72 _tg_shl.mk
--- inc/_tg_shl.mk	12 Jun 2003 10:00:09 -0000	1.72
+++ inc/_tg_shl.mk	7 Jul 2003 18:51:34 -0000
@@ -7,9 +7,14 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
+SHL1STDLIBS+=$(STATICLIB)
+# Allow certain libraries to not link to libstatic*.dylib. This is only used
+# by libraries that cannot be linked to other libraries.
+.IF "$(NOSHAREDSTATICLIB)"==""
 SHL1STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(SHLLINKARCONLY)" != ""
 SHL1STDLIBS=
@@ -320,9 +325,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -340,15 +347,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL1STDLIBS)` \
 	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(STDSHL1) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL1VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL1VERSIONMAP) $@
@@ -419,7 +429,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL2STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -732,9 +742,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -752,15 +764,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL2STDLIBS)` \
 	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(STDSHL2) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL2VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL2VERSIONMAP) $@
@@ -831,7 +846,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL3STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -1144,9 +1159,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -1164,15 +1181,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL3STDLIBS)` \
 	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(STDSHL3) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL3VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL3VERSIONMAP) $@
@@ -1243,7 +1263,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL4STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -1556,9 +1576,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -1576,15 +1598,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL4STDLIBS)` \
 	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(STDSHL4) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL4VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL4VERSIONMAP) $@
@@ -1655,7 +1680,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL5STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -1968,9 +1993,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -1988,15 +2015,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL5STDLIBS)` \
 	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(STDSHL5) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL5VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL5VERSIONMAP) $@
@@ -2067,7 +2097,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL6STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -2380,9 +2410,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -2400,15 +2432,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL6STDLIBS)` \
 	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(STDSHL6) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL6VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL6VERSIONMAP) $@
@@ -2479,7 +2514,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL7STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -2792,9 +2827,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -2812,15 +2849,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL7STDLIBS)` \
 	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(STDSHL7) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL7VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL7VERSIONMAP) $@
@@ -2891,7 +2931,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL8STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -3204,9 +3244,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -3224,15 +3266,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL8STDLIBS)` \
 	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(STDSHL8) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL8VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL8VERSIONMAP) $@
@@ -3303,7 +3348,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL9STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -3616,9 +3661,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -3636,15 +3683,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL9STDLIBS)` \
 	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(STDSHL9) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL9VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL9VERSIONMAP) $@
@@ -3715,7 +3765,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 SHL10STDLIBS+=$(STATICLIB)
 .ENDIF
 
@@ -4028,9 +4078,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -4048,15 +4100,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL10STDLIBS)` \
 	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(STDSHL10) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	    @echo "------------------------------"
+	    @echo "Rerunning static data member initializations"
+	    @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL10VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL10VERSIONMAP) $@
Index: inc/_tg_zip.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/_tg_zip.mk,v
retrieving revision 1.14.38.1
diff -u -r1.14.38.1 _tg_zip.mk
--- inc/_tg_zip.mk	27 Jun 2003 10:44:12 -0000	1.14.38.1
+++ inc/_tg_zip.mk	7 Jul 2003 18:51:34 -0000
@@ -13,7 +13,7 @@
 ZIP1DIR*=$(ZIPDIR)
 ZIP1FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip1langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip1langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip1langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -108,7 +108,7 @@
 ZIP2DIR*=$(ZIPDIR)
 ZIP2FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip2langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip2langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip2langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -203,7 +203,7 @@
 ZIP3DIR*=$(ZIPDIR)
 ZIP3FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip3langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip3langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip3langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -298,7 +298,7 @@
 ZIP4DIR*=$(ZIPDIR)
 ZIP4FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip4langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip4langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip4langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -393,7 +393,7 @@
 ZIP5DIR*=$(ZIPDIR)
 ZIP5FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip5langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip5langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip5langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -488,7 +488,7 @@
 ZIP6DIR*=$(ZIPDIR)
 ZIP6FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip6langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip6langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip6langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -583,7 +583,7 @@
 ZIP7DIR*=$(ZIPDIR)
 ZIP7FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip7langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip7langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip7langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -678,7 +678,7 @@
 ZIP8DIR*=$(ZIPDIR)
 ZIP8FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip8langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip8langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip8langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -773,7 +773,7 @@
 ZIP9DIR*=$(ZIPDIR)
 ZIP9FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip9langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip9langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip9langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
@@ -868,7 +868,7 @@
 ZIP10DIR*=$(ZIPDIR)
 ZIP10FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip10langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip10langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip10langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
Index: inc/tg_app.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_app.mk,v
retrieving revision 1.40
diff -u -r1.40 tg_app.mk
--- inc/tg_app.mk	4 Jun 2003 10:39:52 -0000	1.40
+++ inc/tg_app.mk	7 Jul 2003 18:51:40 -0000
@@ -125,7 +125,7 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 # Allow certain executables to not link to libstatic*.dylib. This is only used
 # by build tools that are built in the bootstrap process.
 .IF "$(NOSHAREDSTATICLIB)"==""
@@ -152,7 +152,7 @@
 $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
 	$(APP$(TNR)RES) \
 	$(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
 	@echo "------------------------------"
 	@echo "Updating static data member initializations"
 	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
@@ -168,6 +168,7 @@
 	@+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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP$(TNR)STDLIBS)` \
 	$(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@source $(MISC)$/$(@:b).cmd
@@ -176,12 +177,14 @@
 	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
 	@strip -i -R $(MISC)$/$(@:b).strip -X $@
 	@ls -l $@
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+   .IF "$(CVER)"=="C295"
+     # This is a hack as libstatic and libcppuhelper have a circular dependency
+     .IF "$(PRJNAME)"=="cppuhelper"
+     	@echo "------------------------------"
+     	@echo "Rerunning static data member initializations"
+     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+     .ENDIF
+   .ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
 	@echo "Making: $@.app"
 .IF "$(STLPORT4)"!=""
Index: inc/tg_shl.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_shl.mk,v
retrieving revision 1.74
diff -u -r1.74 tg_shl.mk
--- inc/tg_shl.mk	12 Jun 2003 10:01:22 -0000	1.74
+++ inc/tg_shl.mk	7 Jul 2003 18:51:40 -0000
@@ -107,9 +107,14 @@
 .ENDIF
 
 # Link in static data members for template classes
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)$(CVER)"=="MACOSXC295"
+SHL$(TNR)STDLIBS+=$(STATICLIB)
+# Allow certain libraries to not link to libstatic*.dylib. This is only used
+# by libraries that cannot be linked to other libraries.
+.IF "$(NOSHAREDSTATICLIB)"==""
 SHL$(TNR)STDLIBS+=$(STATICLIB)
 .ENDIF
+.ENDIF
 
 .IF "$(SHLLINKARCONLY)" != ""
 SHL$(TNR)STDLIBS=
@@ -420,9 +425,11 @@
 .ENDIF
 .IF "$(OS)"=="MACOSX"
 		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
+    .IF "$(CVER)"=="C295"
 		@echo "------------------------------"
 		@echo "Updating static data member initializations"
 		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+    .ENDIF
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
@@ -440,15 +447,18 @@
 	$(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 $@ \
+	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \
 	$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 	@cat $(MISC)$/$(@:b).cmd
 	@+source $(MISC)$/$(@:b).cmd
-# This is a hack as libstatic and libcppuhelper have a circular dependency
-.IF "$(PRJNAME)"=="cppuhelper"
-	@echo "------------------------------"
-	@echo "Rerunning static data member initializations"
-	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
-.ENDIF
+    .IF "$(CVER)"=="C295"
+        # This is a hack as libstatic and libcppuhelper have a circular dependency
+        .IF "$(PRJNAME)"=="cppuhelper"
+	        @echo "------------------------------"
+	        @echo "Rerunning static data member initializations"
+	        @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
+        .ENDIF
+    .ENDIF
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
 .IF "$(DEBUG)"==""
 	@strip -i -r -u -S -s $(SHL$(TNR)VERSIONMAP) $@
Index: inc/tg_zip.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_zip.mk,v
retrieving revision 1.15.38.1
diff -u -r1.15.38.1 tg_zip.mk
--- inc/tg_zip.mk	27 Jun 2003 10:44:12 -0000	1.15.38.1
+++ inc/tg_zip.mk	7 Jul 2003 18:51:40 -0000
@@ -104,7 +104,7 @@
 ZIP$(TNR)DIR*=$(ZIPDIR)
 ZIP$(TNR)FLAGS*=$(ZIPFLAGS)
 .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-zip$(TNR)langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\///" )
+zip$(TNR)langdirs:=$(shell +find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" )
 .ELSE			# "$(GUI)"=="UNX"
 zip$(TNR)langdirs:=$(subst,CVS, $(shell +-dir {$(subst,$/$(LANGDIR), $(ZIP$(TNR)DIR))} /ba:d ))
 .ENDIF			# "$(GUI)"=="UNX"
Index: inc/unxmacxp.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxmacxp.mk,v
retrieving revision 1.42
diff -u -r1.42 unxmacxp.mk
--- inc/unxmacxp.mk	27 Mar 2003 11:48:19 -0000	1.42
+++ inc/unxmacxp.mk	7 Jul 2003 18:51:50 -0000
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxmacxp.mk,v $
 #
-#   $Revision: 1.42 $
+#   $Revision: 1.40.4.7 $
 #
-#   last change: $Author: hr $ $Date: 2003/03/27 11:48:19 $
+#   last change: $Author: fa $ $Date: 2003/04/15 21:46:47 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,31 +60,42 @@
 #
 #*************************************************************************
 
+##########################################################################
+# Platform MAKEFILE for Mac OS X and Darwin
+##########################################################################
+
 # DARWIN_VERSION holds the Darwin version in the format: 000000. For example,
 # if the Darwin version is 1.3.7, DARWIN_VERSION will be set to 010307.
 DARWIN_VERSION=$(shell -/bin/sh -c "uname -r | sed 's/\./ /g' | xargs printf %2.2i%2.2i%2.2i")  
 
-# mk file for unxmacxp
 ASM=
 AFLAGS=
-
 LINKOUTPUT_FILTER=
 
-# _PTHREADS is needed for the stl
+# Definitions that we may need on the compile line.
+# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
+#  compiling STLport sources too, either internally or externally.
 CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1
 
 # Name of library where static data members are initialized
 STATICLIBNAME=static$(DLLPOSTFIX)
 STATICLIB=-l$(STATICLIBNAME)
 
+# MacOS X specific Java compilation/link flags
 .IF "$(SOLAR_JAVA)"!=""
-JAVADEF=-DSOLAR_JAVA
-JAVAFLAGSDEBUG=-g
-JAVA_RUNTIME=-framework JavaVM
+	JAVADEF=-DSOLAR_JAVA
+	JAVAFLAGSDEBUG=-g
+	JAVA_RUNTIME=-framework JavaVM
 .ENDIF
 
-CXX*=cc
-CC*=cc
+# Specify the compiler to use.  NOTE:  MacOS X should always specify
+# c++ for C++ compilation as it does certain C++ specific things
+# behind the scenes for us.
+# CC = C++ compiler to use
+# cc = C compiler to use
+# objc = Objective C compiler to use
+#CC=c++
+#cc=cc
 objc=cc
 
 # [ed] 6/15/02 Some .. bleep .. decided to make a directory within a module that has the same
@@ -93,38 +104,41 @@
 # an error and not search for a file with that name in a following -I directive on the
 # command line.  Therefore...this ugly hack...put STL as the first include on the linkline.
 
-.IF "$(STLPORT4)"!=""
-.IF "$(STLPORT4)"=="NO_STLPORT4"
+# Remeber:  STLPORT4=="NO_STLPORT4" generally indicates that we are using the _INTERNAL_ stlport
+# in OOo and not an external one.
 
-# [ed] We need to add in the STLport include directory included with the standard OOo sources,
-# currently STLPORT 4.5.
-
-CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
-.ELSE
-
-# [ed] We've got stlport4!
-
-CFLAGS=-c -I$(STLPORT4)$/stlport $(INCLUDE)
-
-.ENDIF
+.IF "$(STLPORT4)"!=""
+	.IF "$(STLPORT4)"=="NO_STLPORT4"
+		# [ed] We need to add in the STLport include directory included with the standard OOo sources,
+		# currently STLPORT 4.5.
+		CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
+	.ELSE
+		# [ed] Add in external STLport includes directory if not using internal stlport
+		CFLAGS=-c -I$(STLPORT4)$/stlport $(INCLUDE)
+	.ENDIF
 .ELSE
-
-# [ed] We need to add in the STLport include directory included with the standrad OOo sources,
-# currently STLPORT 4.5
-
-CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
-
+	# Otherwise, some indeterminiate STLport...
+	CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
 .ENDIF
 
-CFLAGSCC=-pipe -traditional-cpp -fno-common
+# ---------------------------------
+#  Compilation flags
+# ---------------------------------
+# Normal C compilation flags
+CFLAGSCC=-pipe -fno-common
 
+# Normal Objective C compilation flags
 OBJCFLAGS=-no-precomp
 
+# Comp Flags for files that need exceptions enabled (C and C++)
 CFLAGSEXCEPTIONS=-fexceptions
+# Comp Flags for files that do not need exceptions enabled (C and C++)
 CFLAGS_NO_EXCEPTIONS=-fno-exceptions
 
-CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-operator-names -fno-coalesce -fno-common
+# Normal C++ compilation flags
+CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-operator-names -fno-coalesce -fno-common -Wno-long-double -fno-strict-aliasing
 
+# Other flags
 CFLAGSOBJGUIST=-fPIC
 CFLAGSOBJCUIST=-fPIC
 CFLAGSOBJGUIMT=-fPIC
@@ -132,71 +146,124 @@
 CFLAGSSLOGUIMT=-fPIC
 CFLAGSSLOCUIMT=-fPIC
 CFLAGSPROF=
+# Flag for including debugging information in object files
 CFLAGSDEBUG=-g
 CFLAGSDBGUTIL=
+# Flag to specify output file to compiler/linker
+CFLAGSOUTOBJ=-o
 
+# ---------------------------------
+#  Optimization flags
+# ---------------------------------
 # Workaround for the compiler's buggy opitmizer when exceptions are turned on.
 # Note that we have to define NO_OPTIMIZE for all files as once you turn off
 # optimizing for one file, we need to adjust our compiling of the remaining
 # optimized files.
 CDEFS+=-DNO_OPTIMIZE
 .IF "$(ENABLE_EXCEPTIONS)"==""
-CFLAGSOPT=-O2
-CFLAGSNOOPT=-O
+	# Opt flags when exceptions are _dis_abled
+	CFLAGSOPT=-O2
+	CFLAGSNOOPT=-O
 .ELSE
-CFLAGSOPT=
-CFLAGSNOOPT=
+	# Opt flags when exceptions are enabled
+	CFLAGSOPT=
+	CFLAGSNOOPT=
 .ENDIF
-CFLAGSOUTOBJ=-o
 
 # Currently, there is no nas support for OS X...
-CDEFS+=           -DNO_AUDIO
+CDEFS+= -DNO_AUDIO
 
-SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep -v cppuhelper")
-.IF "$(STLPORT4)"!=""
-.IF "$(STLPORT4)"=="NO_STLPORT4"
-  # Look for STLport 4.5 libraries in SOLARLIBDIR
-  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).[0-9].[0-9] 2>/dev/null")
+# ---------------------------------
+#  Shared Library names
+# ---------------------------------
+# Add all libraries to the shared lib list that ARE NOT lib*static or cppuhelper (to prevent multiply defined errors)
+SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).*[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).*[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).*[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep -v cppuhelper")
+
+# ---------------------------------
+#  STLport library names
+# ---------------------------------
+# Option for adding STLport _dynamic_ library to the link line
+LIBSTLPORT=-lstlport_gcc
+
+# Get the name of the static STLport library
+.IF "$(STLPORT4)"=="" || "$(STLPORT4)"=="NO_STLPORT4"
+	LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib/libstlport_gcc.a
 .ELSE
-  # Look for STLport 4.0 libraries in the STLport4 home directory
-  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) $(STLPORT4)$/lib$/*$(DLLPOST).[0-9] 2>/dev/null")
+	LIBSTLPORTST=$(STLPORT4)$/lib/libstlport_gcc.a
 .ENDIF
+
+# Get the name of the dynamic STLport library and add it to the shared lib list
+.IF "$(STLPORT4)"!=""
+	.IF "$(STLPORT4)"=="NO_STLPORT4"
+		# Look for STLport 4.5 libraries in SOLARLIBDIR
+		SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST) 2>/dev/null")
+	.ELSE
+		# Look for STLport 4.0 libraries in the STLport4 home directory
+		SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) $(STLPORT4)$/lib$/*$(DLLPOST).*[0-9] 2>/dev/null")
+	.ENDIF
 .ENDIF
 
-# GrP mega-hack! no cppuhelper for cppuhelper
+# ---------------------------------
+#  Module specific shared lib requirements
+# ---------------------------------
 .IF "$(PRJNAME)"!="cppuhelper"
-SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep cppuhelper")
+	# For all projects _except_ cppuhelper, add cppuhelper's library to the shared lib list.
+	# Note this only adds cppuhelper and no other libraries.
+	# Attempting to link cppuhelper to itself results in multiple defines errors
+	SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).*[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).*[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).*[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep cppuhelper")
 .ENDIF
 
-# GrP remove -U options (can't use for two-level)
-LINK=cc
-LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \
-  $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) \
-  -L$(MISC)
+# ---------------------------------
+#  Link stage flags
+# ---------------------------------
+# For MacOS X, always use C++ compiler for linking because it does some library
+# order magic behind the scenes
+LINK=c++
+LINKFLAGS=-dynamic -Wl,-multiply_defined,suppress -lcc_dynamic -lstdc++ -L$(MISC)
+#LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \
+#	$(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) -L$(MISC)
 
 # [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
 .IF "$(GUIBASE)" == "aqua"
-LINKFLAGS+=-lobjc
-INCGUI+= -I$(PRJ)$/unx/inc
+	LINKFLAGS+=-lobjc
+	# Sometimes we still use files that would be in a GUIBASE="unx" specific directory
+	# because they really aren't GUIBASE specific, so we've got to account for that here.
+	INCGUI+= -I$(PRJ)$/unx/inc
 .ENDIF
 
+# Random link flags dealing with different cases of linking
+# UNIXVERSIONNAMES specifies whether or not to use library versioning
+#   (ie libstlport.dylib.4.5) rather than no versioning.  We currently
+#   use this on MacOS X.
 LINKFLAGSAPPGUI=
 .IF "$(UNIXVERSIONNAMES)"!=""
-LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
+	LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
 .ELSE
-LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
+	LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
 .ENDIF
 LINKFLAGSAPPCUI=-Wl,-u,__objcInit
 .IF "$(UNIXVERSIONNAMES)"!=""
-LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
+	LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
 .ELSE
-LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
+	LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
 .ENDIF
 LINKFLAGSTACK=
 LINKFLAGSPROF=
+# Flag to add debugging information to final products
 LINKFLAGSDEBUG=-g
 LINKFLAGSOPT=
 
+# ---------------------------------
+#  MacOS X shared library specifics
+# ---------------------------------
+# Tag to identify an output file as a MacOS X output file
+DLLPOSTFIX=mxp
+# Tag to identify an output file as a library
+DLLPRE=lib
+# File extension to identify dynamic shared libraries on MacOS X
+DLLPOST=.dylib
+
+# We don't use mapping on MacOS X
 LINKVERSIONMAPFLAG=
 
 # Reihenfolge der libs NICHT egal!
@@ -213,13 +280,6 @@
 STDSHLGUIMT=
 STDSHLCUIMT=
 
-LIBSTLPORT=-lstlport_gcc
-.IF "$(STLPORT4)"!=""
-LIBSTLPORTST=$(STLPORT4)$/lib/libstlport_gcc.a
-.ELSE
-LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib/libstlport_gcc.a
-.ENDIF
-
 LIBMGR=libtool
 LIBFLAGS=-o
 
@@ -234,7 +294,3 @@
 RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
-
-DLLPOSTFIX=mxp
-DLLPRE=lib
-DLLPOST=.dylib
Index: unxmacxp/bin/dmake
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/dmake,v
retrieving revision 1.6
diff -u -r1.6 dmake
Binary files /tmp/cvswlayGz and dmake differ
Index: unxmacxp/bin/dylib-link-list
===================================================================
RCS file: /cvs/tools/solenv/unxmacxp/bin/dylib-link-list,v
retrieving revision 1.3
diff -u -r1.3 dylib-link-list
--- unxmacxp/bin/dylib-link-list	2 Jun 2003 09:42:56 -0000	1.3
+++ unxmacxp/bin/dylib-link-list	7 Jul 2003 18:51:56 -0000
@@ -3,9 +3,9 @@
 #
 #   $RCSfile: dylib-link-list,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.1.2.3 $
 #
-#   last change: $Author: vg $ $Date: 2003/06/02 09:42:56 $
+#   last change: $Author: fa $ $Date: 2003/02/20 04:36:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses