INTEGRATION: CWS geordi2q14 (1.44.14); FILE MERGED

2004/01/30 11:36:36 hr 1.44.14.1: #111934#: merge CWS ooo111fix2

solenv/inc/tg_app.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_app.mk,v $
 #
-#   $Revision: 1.44 $
+#   $Revision: 1.45 $
 #
-#   last change: $Author: vg $ $Date: 2003-12-16 11:38:23 $
+#   last change: $Author: hr $ $Date: 2004-02-02 19:04:57 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -118,15 +118,6 @@ APP$(TNR)DEPN+:=$(APP$(TNR)DEPNU)
 USE_APP$(TNR)DEF=
 .ENDIF
 
-# Link in static data members for template classes
-.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)"==""
-APP$(TNR)STDLIBS+=$(STATICLIB)
-.ENDIF
-.ENDIF
-
 .IF "$(APP$(TNR)TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
@@ -146,11 +137,6 @@ APP$(TNR)LIBSALCPPRT*=$(LIBSALCPPRT)
 $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     $(APP$(TNR)RES) \
     $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
-.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)"
-.ENDIF
     @echo ------------------------------
     @echo Making: $@
 .IF "$(GUI)"=="UNX"
@@ -171,14 +157,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
     @strip -i -R $(MISC)$/$(@:b).strip -X $@
     @ls -l $@
-   .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"
     @create-bundle $@