strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Patrick Luby 2001-02-28 02:14:09 +00:00
parent c8f72a5c78
commit 083ad300b4
4 changed files with 136 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
solenv/inc/_tg_app.mk
View file

@ -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 $@

60
solenv/inc/_tg_shl.mk
View file

@ -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

10
solenv/inc/tg_app.mk
View file

@ -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 $@

10
solenv/inc/tg_shl.mk
View file

@ -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