Added hack for Mac OS X to avoid circular dependency between libstatic and libcppuhelper

4 files changed, 136 insertions, 4 deletions

diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 522261abeebb..79914faad5a6 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -58,6 +58,12 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -219,6 +225,12 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -380,6 +392,12 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -541,6 +559,12 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -702,6 +726,12 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -863,6 +893,12 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -1024,6 +1060,12 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -1185,6 +1227,12 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -1346,6 +1394,12 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
@@ -1507,6 +1561,12 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 6d45bbdc13af..7f1129f4c5a5 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -345,6 +345,12 @@ $(SHL1TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL1VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL1VERSIONMAP) $@
 .ENDIF
@@ -713,6 +719,12 @@ $(SHL2TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL2VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL2VERSIONMAP) $@
 .ENDIF
@@ -1081,6 +1093,12 @@ $(SHL3TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL3VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL3VERSIONMAP) $@
 .ENDIF
@@ -1449,6 +1467,12 @@ $(SHL4TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL4VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL4VERSIONMAP) $@
 .ENDIF
@@ -1817,6 +1841,12 @@ $(SHL5TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL5VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL5VERSIONMAP) $@
 .ENDIF
@@ -2185,6 +2215,12 @@ $(SHL6TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL6VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL6VERSIONMAP) $@
 .ENDIF
@@ -2553,6 +2589,12 @@ $(SHL7TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL7VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL7VERSIONMAP) $@
 .ENDIF
@@ -2921,6 +2963,12 @@ $(SHL8TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL8VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL8VERSIONMAP) $@
 .ENDIF
@@ -3289,6 +3337,12 @@ $(SHL9TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL9VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL9VERSIONMAP) $@
 .ENDIF
@@ -3657,6 +3711,12 @@ $(SHL10TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL10VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL10VERSIONMAP) $@
 .ENDIF
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 0d6077772c2f..644b3cd0267a 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-02-26 21:51:20 $
-#*    $Revision: 1.13 $
+#*    Letzte Aenderung  $Author: pluby $ $Date: 2001-02-28 03:14:09 $
+#*    $Revision: 1.14 $
 #*
 #*    $Logfile:   T:/solar/inc/tg_app.mkv  $
 #*
@@ -104,6 +104,12 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
     @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 "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(TARGETTYPE)"=="GUI"
     @echo "Making: $@.app"
     @create-bundle $@
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index fb3e2c08d7dc..ff51dad1e85b 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_shl.mk,v $
 #
-#   $Revision: 1.22 $
+#   $Revision: 1.23 $
 #
-#   last change: $Author: pluby $ $Date: 2001-02-26 21:51:20 $
+#   last change: $Author: pluby $ $Date: 2001-02-28 03:14:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -445,6 +445,12 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF
     @ls -l $@
 .IF "$(OS)"=="MACOSX"
+# This is a hack as libstatic and libcppuhelper have a circular dependency
+.IF "$(PRJNAME)"=="cppuhelper"
+    @echo "------------------------------"
+    @echo "Rerunning static data member initializations"
+    @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)"
+.ENDIF
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
     @strip -i -r -u -s $(SHL$(TNR)VERSIONMAP) $@
 .ENDIF