Index: inc/_tg_app.mk =================================================================== RCS file: /cvs/tools/solenv/inc/_tg_app.mk,v retrieving revision 1.30.6.1 diff -u -r1.30.6.1 _tg_app.mk --- inc/_tg_app.mk 21 Nov 2002 21:46:54 -0000 1.30.6.1 +++ inc/_tg_app.mk 28 Jan 2003 23:02:34 -0000 @@ -57,7 +57,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -70,6 +70,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -82,7 +83,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -249,7 +250,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -262,6 +263,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -274,7 +276,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -441,7 +443,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -454,6 +456,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -466,7 +469,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -633,7 +636,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -646,6 +649,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -658,7 +662,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -825,7 +829,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -838,6 +842,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -850,7 +855,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -1017,7 +1022,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -1030,6 +1035,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -1042,7 +1048,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -1209,7 +1215,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -1222,6 +1228,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -1234,7 +1241,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -1401,7 +1408,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -1414,6 +1421,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -1426,7 +1434,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -1593,7 +1601,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -1606,6 +1614,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -1618,7 +1627,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx @@ -1785,7 +1794,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -1798,6 +1807,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -1810,7 +1820,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx Index: inc/_tg_shl.mk =================================================================== RCS file: /cvs/tools/solenv/inc/_tg_shl.mk,v retrieving revision 1.52.6.1 diff -u -r1.52.6.1 _tg_shl.mk --- inc/_tg_shl.mk 7 Aug 2002 07:15:21 -0000 1.52.6.1 +++ inc/_tg_shl.mk 28 Jan 2003 23:02:49 -0000 @@ -354,7 +354,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)" .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.cxx @@ -372,6 +372,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -379,7 +380,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)" .ENDIF .IF "$(SHL1VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -781,7 +782,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)" .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.cxx @@ -799,6 +800,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -806,7 +808,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)" .ENDIF .IF "$(SHL2VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -1208,7 +1210,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)" .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.cxx @@ -1226,6 +1228,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -1233,7 +1236,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)" .ENDIF .IF "$(SHL3VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -1635,7 +1638,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)" .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.cxx @@ -1653,6 +1656,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -1660,7 +1664,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)" .ENDIF .IF "$(SHL4VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -2062,7 +2066,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)" .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.cxx @@ -2080,6 +2084,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -2087,7 +2092,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)" .ENDIF .IF "$(SHL5VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -2489,7 +2494,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)" .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.cxx @@ -2507,6 +2512,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -2514,7 +2520,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)" .ENDIF .IF "$(SHL6VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -2916,7 +2922,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)" .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.cxx @@ -2934,6 +2940,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -2941,7 +2948,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)" .ENDIF .IF "$(SHL7VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -3343,7 +3350,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)" .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.cxx @@ -3361,6 +3368,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -3368,7 +3376,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)" .ENDIF .IF "$(SHL8VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -3770,7 +3778,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)" .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.cxx @@ -3788,6 +3796,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -3795,7 +3804,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)" .ENDIF .IF "$(SHL9VERSIONMAP)"!="" .IF "$(DEBUG)"=="" @@ -4197,7 +4206,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)" .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.cxx @@ -4215,6 +4224,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -4222,7 +4232,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)" .ENDIF .IF "$(SHL10VERSIONMAP)"!="" .IF "$(DEBUG)"=="" Index: inc/tg_app.mk =================================================================== RCS file: /cvs/tools/solenv/inc/tg_app.mk,v retrieving revision 1.31.6.1 diff -u -r1.31.6.1 tg_app.mk --- inc/tg_app.mk 21 Nov 2002 21:46:55 -0000 1.31.6.1 +++ inc/tg_app.mk 28 Jan 2003 23:02:49 -0000 @@ -152,7 +152,7 @@ .IF "$(OS)"=="MACOSX" @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)" .ENDIF @echo ------------------------------ @echo Making: $@ @@ -165,6 +165,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) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @source $(MISC)$/$(@:b).cmd @@ -177,7 +178,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)" .ENDIF .ELSE # "$(OS)"=="MACOSX" @+echo unx Index: inc/tg_shl.mk =================================================================== RCS file: /cvs/tools/solenv/inc/tg_shl.mk,v retrieving revision 1.54.6.1 diff -u -r1.54.6.1 tg_shl.mk --- inc/tg_shl.mk 7 Aug 2002 07:15:23 -0000 1.54.6.1 +++ inc/tg_shl.mk 28 Jan 2003 23:02:51 -0000 @@ -454,7 +454,7 @@ $(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx @echo "------------------------------" @echo "Updating static data member initializations" - @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" + @+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)" .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.cxx @@ -472,6 +472,7 @@ $(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) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -479,7 +480,7 @@ .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)" + @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)" .ENDIF .IF "$(SHL$(TNR)VERSIONMAP)"!="" .IF "$(DEBUG)"=="" Index: inc/unxmacxp.mk =================================================================== RCS file: /cvs/tools/solenv/inc/unxmacxp.mk,v retrieving revision 1.40.4.4 diff -u -r1.40.4.4 unxmacxp.mk --- inc/unxmacxp.mk 21 Nov 2002 21:46:55 -0000 1.40.4.4 +++ inc/unxmacxp.mk 28 Jan 2003 23:02:51 -0000 @@ -218,9 +218,10 @@ # --------------------------------- # For MacOS X, always use C++ compiler for linking because it does some library # order magic behind the scenes -LINK=cc -LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \ - $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) -L$(MISC) +LINK=g++ +LINKFLAGS=-dynamic -framework System -framework CoreFoundation -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" Index: unxmacxp/inc/makefile.mk =================================================================== RCS file: /cvs/tools/solenv/unxmacxp/inc/makefile.mk,v retrieving revision 1.27.4.2 diff -u -r1.27.4.2 makefile.mk --- unxmacxp/inc/makefile.mk 21 Nov 2002 21:46:58 -0000 1.27.4.2 +++ unxmacxp/inc/makefile.mk 28 Jan 2003 23:03:01 -0000 @@ -71,19 +71,25 @@ # --- Targets --- +FURTHERLINKLIBS= + # This is a hack to allow linking when we instantiated cppu::*ImplHelper static # data members. Ideally, we need to link to libcppuhelper, but sometimes it # may not yet be built so we need to leave them undefined until a later run. CPPUHELPERLIBNAME=$(DLLPRE)$(CPPUHELPERLIB:s/-l//)$(DLLPOST) .IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(CPPUHELPERLIBNAME) $(LB)$/$(CPPUHELPERLIBNAME) 2>/dev/null")"!="" - LINKFLAGSSHL+=$(CPPUHELPERLIB) + FURTHERLINKLIBS+=$(CPPUHELPERLIB) .ENDIF # sal needs to be on the static data link list after is it created. SALLIBNAME=$(DLLPRE)$(SALLIB:s/-l//)$(DLLPOST) .IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(SALLIBNAME) $(LB)$/$(SALLIBNAME) 2>/dev/null")"!="" - LINKFLAGSSHL+=$(SALLIB) + FURTHERLINKLIBS+=$(SALLIB) +.ENDIF + +.IF "$(FURTHERLINKLIBS)"!="" + LINKFLAGSSHL+=$(FURTHERLINKLIBS) .ENDIF # get the name of the stlport .dylib for the init-static-data-template script. @@ -99,6 +105,9 @@ .ENDIF .ENDIF +# Get the list of dylibs to link against in @executable_path/dylib:/path/to/dylib format +DYLIBLINKLIST=$(shell -/bin/sh -c "dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(DYLIBLINKLIBS) $(FURTHERLINKLIBS) -l$(LIBSTLPORT)") + # Update, compile and link static data member library. Note that we do all of # these steps in our custom recipes. This avoids dependency and recursion # problems associated with using the standard rules. @@ -110,7 +119,7 @@ LINKFLAGSSTATICSHL=$(shell echo $(LINKFLAGSSHL) | sed 's/$(PRJNAME)$(TARGET)$(STATICLIBNAME)/$(STATICLIBNAME)/g') $(LB)$/$(DLLPRE)$(PRJNAME)$(TARGET)$(STATICLIBNAME)$(DLLPOST): $(MISC)$/$(PRJNAME)$(TARGET)staticdatamembers.o - +$(LINK) $(LINKFLAGS) $(LINKFLAGSSTATICSHL) $(SOLARLIB) -L$(PRJ)$/$(ROUT)$/lib -o $@ $< + +$(LINK) $(LINKFLAGS) $(LINKFLAGSSTATICSHL) $(DYLIBLINKLIST) $(SOLARLIB) -L$(PRJ)$/$(ROUT)$/lib -o $@ $< +ln -sf ..$/lib$/$(@:f) $(MISC)$/$(DLLPRE)$(STATICLIBNAME)$(DLLPOST) # Merge all of the *staticdatamembers.cxx, *staticdatamembers.hxx, and