Lines 7-15
Link Here
|
7 |
.ENDIF |
7 |
.ENDIF |
8 |
|
8 |
|
9 |
# Link in static data members for template classes |
9 |
# Link in static data members for template classes |
10 |
.IF "$(OS)"=="MACOSX" |
10 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
|
|
11 |
SHL1STDLIBS+=$(STATICLIB) |
12 |
# Allow certain libraries to not link to libstatic*.dylib. This is only used |
13 |
# by libraries that cannot be linked to other libraries. |
14 |
.IF "$(NOSHAREDSTATICLIB)"=="" |
11 |
SHL1STDLIBS+=$(STATICLIB) |
15 |
SHL1STDLIBS+=$(STATICLIB) |
12 |
.ENDIF |
16 |
.ENDIF |
|
|
17 |
.ENDIF |
13 |
|
18 |
|
14 |
.IF "$(SHLLINKARCONLY)" != "" |
19 |
.IF "$(SHLLINKARCONLY)" != "" |
15 |
SHL1STDLIBS= |
20 |
SHL1STDLIBS= |
Lines 320-328
Link Here
|
320 |
.ENDIF |
325 |
.ENDIF |
321 |
.IF "$(OS)"=="MACOSX" |
326 |
.IF "$(OS)"=="MACOSX" |
322 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
327 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
328 |
.IF "$(CVER)"=="C295" |
323 |
@echo "------------------------------" |
329 |
@echo "------------------------------" |
324 |
@echo "Updating static data member initializations" |
330 |
@echo "Updating static data member initializations" |
325 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
331 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
332 |
.ENDIF |
326 |
.ENDIF |
333 |
.ENDIF |
327 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
334 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
328 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
335 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 340-354
Link Here
|
340 |
$(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) \ |
347 |
$(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) \ |
341 |
`cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
348 |
`cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
342 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
349 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
350 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL1STDLIBS)` \ |
343 |
$(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(STDSHL1) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
351 |
$(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) $(STDSHL1) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
344 |
@cat $(MISC)$/$(@:b).cmd |
352 |
@cat $(MISC)$/$(@:b).cmd |
345 |
@+source $(MISC)$/$(@:b).cmd |
353 |
@+source $(MISC)$/$(@:b).cmd |
346 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
354 |
.IF "$(CVER)"=="C295" |
347 |
.IF "$(PRJNAME)"=="cppuhelper" |
355 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
348 |
@echo "------------------------------" |
356 |
.IF "$(PRJNAME)"=="cppuhelper" |
349 |
@echo "Rerunning static data member initializations" |
357 |
@echo "------------------------------" |
350 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
358 |
@echo "Rerunning static data member initializations" |
351 |
.ENDIF |
359 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
360 |
.ENDIF |
361 |
.ENDIF |
352 |
.IF "$(SHL1VERSIONMAP)"!="" |
362 |
.IF "$(SHL1VERSIONMAP)"!="" |
353 |
.IF "$(DEBUG)"=="" |
363 |
.IF "$(DEBUG)"=="" |
354 |
@strip -i -r -u -S -s $(SHL1VERSIONMAP) $@ |
364 |
@strip -i -r -u -S -s $(SHL1VERSIONMAP) $@ |
Lines 419-425
Link Here
|
419 |
.ENDIF |
429 |
.ENDIF |
420 |
|
430 |
|
421 |
# Link in static data members for template classes |
431 |
# Link in static data members for template classes |
422 |
.IF "$(OS)"=="MACOSX" |
432 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
423 |
SHL2STDLIBS+=$(STATICLIB) |
433 |
SHL2STDLIBS+=$(STATICLIB) |
424 |
.ENDIF |
434 |
.ENDIF |
425 |
|
435 |
|
Lines 732-740
Link Here
|
732 |
.ENDIF |
742 |
.ENDIF |
733 |
.IF "$(OS)"=="MACOSX" |
743 |
.IF "$(OS)"=="MACOSX" |
734 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
744 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
745 |
.IF "$(CVER)"=="C295" |
735 |
@echo "------------------------------" |
746 |
@echo "------------------------------" |
736 |
@echo "Updating static data member initializations" |
747 |
@echo "Updating static data member initializations" |
737 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
748 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
749 |
.ENDIF |
738 |
.ENDIF |
750 |
.ENDIF |
739 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
751 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
740 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
752 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 752-766
Link Here
|
752 |
$(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) \ |
764 |
$(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) \ |
753 |
`cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
765 |
`cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
754 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
766 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
767 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL2STDLIBS)` \ |
755 |
$(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(STDSHL2) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
768 |
$(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) $(STDSHL2) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
756 |
@cat $(MISC)$/$(@:b).cmd |
769 |
@cat $(MISC)$/$(@:b).cmd |
757 |
@+source $(MISC)$/$(@:b).cmd |
770 |
@+source $(MISC)$/$(@:b).cmd |
758 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
771 |
.IF "$(CVER)"=="C295" |
759 |
.IF "$(PRJNAME)"=="cppuhelper" |
772 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
760 |
@echo "------------------------------" |
773 |
.IF "$(PRJNAME)"=="cppuhelper" |
761 |
@echo "Rerunning static data member initializations" |
774 |
@echo "------------------------------" |
762 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
775 |
@echo "Rerunning static data member initializations" |
763 |
.ENDIF |
776 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
777 |
.ENDIF |
778 |
.ENDIF |
764 |
.IF "$(SHL2VERSIONMAP)"!="" |
779 |
.IF "$(SHL2VERSIONMAP)"!="" |
765 |
.IF "$(DEBUG)"=="" |
780 |
.IF "$(DEBUG)"=="" |
766 |
@strip -i -r -u -S -s $(SHL2VERSIONMAP) $@ |
781 |
@strip -i -r -u -S -s $(SHL2VERSIONMAP) $@ |
Lines 831-837
Link Here
|
831 |
.ENDIF |
846 |
.ENDIF |
832 |
|
847 |
|
833 |
# Link in static data members for template classes |
848 |
# Link in static data members for template classes |
834 |
.IF "$(OS)"=="MACOSX" |
849 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
835 |
SHL3STDLIBS+=$(STATICLIB) |
850 |
SHL3STDLIBS+=$(STATICLIB) |
836 |
.ENDIF |
851 |
.ENDIF |
837 |
|
852 |
|
Lines 1144-1152
Link Here
|
1144 |
.ENDIF |
1159 |
.ENDIF |
1145 |
.IF "$(OS)"=="MACOSX" |
1160 |
.IF "$(OS)"=="MACOSX" |
1146 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
1161 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
1162 |
.IF "$(CVER)"=="C295" |
1147 |
@echo "------------------------------" |
1163 |
@echo "------------------------------" |
1148 |
@echo "Updating static data member initializations" |
1164 |
@echo "Updating static data member initializations" |
1149 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
1165 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
1166 |
.ENDIF |
1150 |
.ENDIF |
1167 |
.ENDIF |
1151 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
1168 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
1152 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
1169 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 1164-1178
Link Here
|
1164 |
$(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) \ |
1181 |
$(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) \ |
1165 |
`cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
1182 |
`cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
1166 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
1183 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
1184 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL3STDLIBS)` \ |
1167 |
$(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(STDSHL3) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
1185 |
$(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) $(STDSHL3) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
1168 |
@cat $(MISC)$/$(@:b).cmd |
1186 |
@cat $(MISC)$/$(@:b).cmd |
1169 |
@+source $(MISC)$/$(@:b).cmd |
1187 |
@+source $(MISC)$/$(@:b).cmd |
1170 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
1188 |
.IF "$(CVER)"=="C295" |
1171 |
.IF "$(PRJNAME)"=="cppuhelper" |
1189 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
1172 |
@echo "------------------------------" |
1190 |
.IF "$(PRJNAME)"=="cppuhelper" |
1173 |
@echo "Rerunning static data member initializations" |
1191 |
@echo "------------------------------" |
1174 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
1192 |
@echo "Rerunning static data member initializations" |
1175 |
.ENDIF |
1193 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
1194 |
.ENDIF |
1195 |
.ENDIF |
1176 |
.IF "$(SHL3VERSIONMAP)"!="" |
1196 |
.IF "$(SHL3VERSIONMAP)"!="" |
1177 |
.IF "$(DEBUG)"=="" |
1197 |
.IF "$(DEBUG)"=="" |
1178 |
@strip -i -r -u -S -s $(SHL3VERSIONMAP) $@ |
1198 |
@strip -i -r -u -S -s $(SHL3VERSIONMAP) $@ |
Lines 1243-1249
Link Here
|
1243 |
.ENDIF |
1263 |
.ENDIF |
1244 |
|
1264 |
|
1245 |
# Link in static data members for template classes |
1265 |
# Link in static data members for template classes |
1246 |
.IF "$(OS)"=="MACOSX" |
1266 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
1247 |
SHL4STDLIBS+=$(STATICLIB) |
1267 |
SHL4STDLIBS+=$(STATICLIB) |
1248 |
.ENDIF |
1268 |
.ENDIF |
1249 |
|
1269 |
|
Lines 1556-1564
Link Here
|
1556 |
.ENDIF |
1576 |
.ENDIF |
1557 |
.IF "$(OS)"=="MACOSX" |
1577 |
.IF "$(OS)"=="MACOSX" |
1558 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
1578 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
1579 |
.IF "$(CVER)"=="C295" |
1559 |
@echo "------------------------------" |
1580 |
@echo "------------------------------" |
1560 |
@echo "Updating static data member initializations" |
1581 |
@echo "Updating static data member initializations" |
1561 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
1582 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
1583 |
.ENDIF |
1562 |
.ENDIF |
1584 |
.ENDIF |
1563 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
1585 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
1564 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
1586 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 1576-1590
Link Here
|
1576 |
$(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) \ |
1598 |
$(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) \ |
1577 |
`cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
1599 |
`cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
1578 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
1600 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
1601 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL4STDLIBS)` \ |
1579 |
$(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(STDSHL4) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
1602 |
$(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) $(STDSHL4) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
1580 |
@cat $(MISC)$/$(@:b).cmd |
1603 |
@cat $(MISC)$/$(@:b).cmd |
1581 |
@+source $(MISC)$/$(@:b).cmd |
1604 |
@+source $(MISC)$/$(@:b).cmd |
1582 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
1605 |
.IF "$(CVER)"=="C295" |
1583 |
.IF "$(PRJNAME)"=="cppuhelper" |
1606 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
1584 |
@echo "------------------------------" |
1607 |
.IF "$(PRJNAME)"=="cppuhelper" |
1585 |
@echo "Rerunning static data member initializations" |
1608 |
@echo "------------------------------" |
1586 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
1609 |
@echo "Rerunning static data member initializations" |
1587 |
.ENDIF |
1610 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
1611 |
.ENDIF |
1612 |
.ENDIF |
1588 |
.IF "$(SHL4VERSIONMAP)"!="" |
1613 |
.IF "$(SHL4VERSIONMAP)"!="" |
1589 |
.IF "$(DEBUG)"=="" |
1614 |
.IF "$(DEBUG)"=="" |
1590 |
@strip -i -r -u -S -s $(SHL4VERSIONMAP) $@ |
1615 |
@strip -i -r -u -S -s $(SHL4VERSIONMAP) $@ |
Lines 1655-1661
Link Here
|
1655 |
.ENDIF |
1680 |
.ENDIF |
1656 |
|
1681 |
|
1657 |
# Link in static data members for template classes |
1682 |
# Link in static data members for template classes |
1658 |
.IF "$(OS)"=="MACOSX" |
1683 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
1659 |
SHL5STDLIBS+=$(STATICLIB) |
1684 |
SHL5STDLIBS+=$(STATICLIB) |
1660 |
.ENDIF |
1685 |
.ENDIF |
1661 |
|
1686 |
|
Lines 1968-1976
Link Here
|
1968 |
.ENDIF |
1993 |
.ENDIF |
1969 |
.IF "$(OS)"=="MACOSX" |
1994 |
.IF "$(OS)"=="MACOSX" |
1970 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
1995 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
1996 |
.IF "$(CVER)"=="C295" |
1971 |
@echo "------------------------------" |
1997 |
@echo "------------------------------" |
1972 |
@echo "Updating static data member initializations" |
1998 |
@echo "Updating static data member initializations" |
1973 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
1999 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
2000 |
.ENDIF |
1974 |
.ENDIF |
2001 |
.ENDIF |
1975 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
2002 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
1976 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
2003 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 1988-2002
Link Here
|
1988 |
$(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) \ |
2015 |
$(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) \ |
1989 |
`cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
2016 |
`cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
1990 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
2017 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
2018 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL5STDLIBS)` \ |
1991 |
$(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(STDSHL5) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
2019 |
$(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) $(STDSHL5) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
1992 |
@cat $(MISC)$/$(@:b).cmd |
2020 |
@cat $(MISC)$/$(@:b).cmd |
1993 |
@+source $(MISC)$/$(@:b).cmd |
2021 |
@+source $(MISC)$/$(@:b).cmd |
1994 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
2022 |
.IF "$(CVER)"=="C295" |
1995 |
.IF "$(PRJNAME)"=="cppuhelper" |
2023 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
1996 |
@echo "------------------------------" |
2024 |
.IF "$(PRJNAME)"=="cppuhelper" |
1997 |
@echo "Rerunning static data member initializations" |
2025 |
@echo "------------------------------" |
1998 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
2026 |
@echo "Rerunning static data member initializations" |
1999 |
.ENDIF |
2027 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
2028 |
.ENDIF |
2029 |
.ENDIF |
2000 |
.IF "$(SHL5VERSIONMAP)"!="" |
2030 |
.IF "$(SHL5VERSIONMAP)"!="" |
2001 |
.IF "$(DEBUG)"=="" |
2031 |
.IF "$(DEBUG)"=="" |
2002 |
@strip -i -r -u -S -s $(SHL5VERSIONMAP) $@ |
2032 |
@strip -i -r -u -S -s $(SHL5VERSIONMAP) $@ |
Lines 2067-2073
Link Here
|
2067 |
.ENDIF |
2097 |
.ENDIF |
2068 |
|
2098 |
|
2069 |
# Link in static data members for template classes |
2099 |
# Link in static data members for template classes |
2070 |
.IF "$(OS)"=="MACOSX" |
2100 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
2071 |
SHL6STDLIBS+=$(STATICLIB) |
2101 |
SHL6STDLIBS+=$(STATICLIB) |
2072 |
.ENDIF |
2102 |
.ENDIF |
2073 |
|
2103 |
|
Lines 2380-2388
Link Here
|
2380 |
.ENDIF |
2410 |
.ENDIF |
2381 |
.IF "$(OS)"=="MACOSX" |
2411 |
.IF "$(OS)"=="MACOSX" |
2382 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
2412 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
2413 |
.IF "$(CVER)"=="C295" |
2383 |
@echo "------------------------------" |
2414 |
@echo "------------------------------" |
2384 |
@echo "Updating static data member initializations" |
2415 |
@echo "Updating static data member initializations" |
2385 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
2416 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
2417 |
.ENDIF |
2386 |
.ENDIF |
2418 |
.ENDIF |
2387 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
2419 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
2388 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
2420 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 2400-2414
Link Here
|
2400 |
$(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) \ |
2432 |
$(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) \ |
2401 |
`cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
2433 |
`cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
2402 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
2434 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
2435 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL6STDLIBS)` \ |
2403 |
$(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(STDSHL6) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
2436 |
$(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) $(STDSHL6) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
2404 |
@cat $(MISC)$/$(@:b).cmd |
2437 |
@cat $(MISC)$/$(@:b).cmd |
2405 |
@+source $(MISC)$/$(@:b).cmd |
2438 |
@+source $(MISC)$/$(@:b).cmd |
2406 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
2439 |
.IF "$(CVER)"=="C295" |
2407 |
.IF "$(PRJNAME)"=="cppuhelper" |
2440 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
2408 |
@echo "------------------------------" |
2441 |
.IF "$(PRJNAME)"=="cppuhelper" |
2409 |
@echo "Rerunning static data member initializations" |
2442 |
@echo "------------------------------" |
2410 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
2443 |
@echo "Rerunning static data member initializations" |
2411 |
.ENDIF |
2444 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
2445 |
.ENDIF |
2446 |
.ENDIF |
2412 |
.IF "$(SHL6VERSIONMAP)"!="" |
2447 |
.IF "$(SHL6VERSIONMAP)"!="" |
2413 |
.IF "$(DEBUG)"=="" |
2448 |
.IF "$(DEBUG)"=="" |
2414 |
@strip -i -r -u -S -s $(SHL6VERSIONMAP) $@ |
2449 |
@strip -i -r -u -S -s $(SHL6VERSIONMAP) $@ |
Lines 2479-2485
Link Here
|
2479 |
.ENDIF |
2514 |
.ENDIF |
2480 |
|
2515 |
|
2481 |
# Link in static data members for template classes |
2516 |
# Link in static data members for template classes |
2482 |
.IF "$(OS)"=="MACOSX" |
2517 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
2483 |
SHL7STDLIBS+=$(STATICLIB) |
2518 |
SHL7STDLIBS+=$(STATICLIB) |
2484 |
.ENDIF |
2519 |
.ENDIF |
2485 |
|
2520 |
|
Lines 2792-2800
Link Here
|
2792 |
.ENDIF |
2827 |
.ENDIF |
2793 |
.IF "$(OS)"=="MACOSX" |
2828 |
.IF "$(OS)"=="MACOSX" |
2794 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
2829 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
2830 |
.IF "$(CVER)"=="C295" |
2795 |
@echo "------------------------------" |
2831 |
@echo "------------------------------" |
2796 |
@echo "Updating static data member initializations" |
2832 |
@echo "Updating static data member initializations" |
2797 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
2833 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
2834 |
.ENDIF |
2798 |
.ENDIF |
2835 |
.ENDIF |
2799 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
2836 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
2800 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
2837 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 2812-2826
Link Here
|
2812 |
$(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) \ |
2849 |
$(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) \ |
2813 |
`cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
2850 |
`cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
2814 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
2851 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
2852 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL7STDLIBS)` \ |
2815 |
$(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(STDSHL7) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
2853 |
$(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) $(STDSHL7) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
2816 |
@cat $(MISC)$/$(@:b).cmd |
2854 |
@cat $(MISC)$/$(@:b).cmd |
2817 |
@+source $(MISC)$/$(@:b).cmd |
2855 |
@+source $(MISC)$/$(@:b).cmd |
2818 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
2856 |
.IF "$(CVER)"=="C295" |
2819 |
.IF "$(PRJNAME)"=="cppuhelper" |
2857 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
2820 |
@echo "------------------------------" |
2858 |
.IF "$(PRJNAME)"=="cppuhelper" |
2821 |
@echo "Rerunning static data member initializations" |
2859 |
@echo "------------------------------" |
2822 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
2860 |
@echo "Rerunning static data member initializations" |
2823 |
.ENDIF |
2861 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
2862 |
.ENDIF |
2863 |
.ENDIF |
2824 |
.IF "$(SHL7VERSIONMAP)"!="" |
2864 |
.IF "$(SHL7VERSIONMAP)"!="" |
2825 |
.IF "$(DEBUG)"=="" |
2865 |
.IF "$(DEBUG)"=="" |
2826 |
@strip -i -r -u -S -s $(SHL7VERSIONMAP) $@ |
2866 |
@strip -i -r -u -S -s $(SHL7VERSIONMAP) $@ |
Lines 2891-2897
Link Here
|
2891 |
.ENDIF |
2931 |
.ENDIF |
2892 |
|
2932 |
|
2893 |
# Link in static data members for template classes |
2933 |
# Link in static data members for template classes |
2894 |
.IF "$(OS)"=="MACOSX" |
2934 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
2895 |
SHL8STDLIBS+=$(STATICLIB) |
2935 |
SHL8STDLIBS+=$(STATICLIB) |
2896 |
.ENDIF |
2936 |
.ENDIF |
2897 |
|
2937 |
|
Lines 3204-3212
Link Here
|
3204 |
.ENDIF |
3244 |
.ENDIF |
3205 |
.IF "$(OS)"=="MACOSX" |
3245 |
.IF "$(OS)"=="MACOSX" |
3206 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
3246 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
3247 |
.IF "$(CVER)"=="C295" |
3207 |
@echo "------------------------------" |
3248 |
@echo "------------------------------" |
3208 |
@echo "Updating static data member initializations" |
3249 |
@echo "Updating static data member initializations" |
3209 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
3250 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
3251 |
.ENDIF |
3210 |
.ENDIF |
3252 |
.ENDIF |
3211 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
3253 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
3212 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
3254 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 3224-3238
Link Here
|
3224 |
$(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) \ |
3266 |
$(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) \ |
3225 |
`cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
3267 |
`cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
3226 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
3268 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
3269 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL8STDLIBS)` \ |
3227 |
$(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(STDSHL8) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
3270 |
$(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) $(STDSHL8) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
3228 |
@cat $(MISC)$/$(@:b).cmd |
3271 |
@cat $(MISC)$/$(@:b).cmd |
3229 |
@+source $(MISC)$/$(@:b).cmd |
3272 |
@+source $(MISC)$/$(@:b).cmd |
3230 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
3273 |
.IF "$(CVER)"=="C295" |
3231 |
.IF "$(PRJNAME)"=="cppuhelper" |
3274 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
3232 |
@echo "------------------------------" |
3275 |
.IF "$(PRJNAME)"=="cppuhelper" |
3233 |
@echo "Rerunning static data member initializations" |
3276 |
@echo "------------------------------" |
3234 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
3277 |
@echo "Rerunning static data member initializations" |
3235 |
.ENDIF |
3278 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
3279 |
.ENDIF |
3280 |
.ENDIF |
3236 |
.IF "$(SHL8VERSIONMAP)"!="" |
3281 |
.IF "$(SHL8VERSIONMAP)"!="" |
3237 |
.IF "$(DEBUG)"=="" |
3282 |
.IF "$(DEBUG)"=="" |
3238 |
@strip -i -r -u -S -s $(SHL8VERSIONMAP) $@ |
3283 |
@strip -i -r -u -S -s $(SHL8VERSIONMAP) $@ |
Lines 3303-3309
Link Here
|
3303 |
.ENDIF |
3348 |
.ENDIF |
3304 |
|
3349 |
|
3305 |
# Link in static data members for template classes |
3350 |
# Link in static data members for template classes |
3306 |
.IF "$(OS)"=="MACOSX" |
3351 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
3307 |
SHL9STDLIBS+=$(STATICLIB) |
3352 |
SHL9STDLIBS+=$(STATICLIB) |
3308 |
.ENDIF |
3353 |
.ENDIF |
3309 |
|
3354 |
|
Lines 3616-3624
Link Here
|
3616 |
.ENDIF |
3661 |
.ENDIF |
3617 |
.IF "$(OS)"=="MACOSX" |
3662 |
.IF "$(OS)"=="MACOSX" |
3618 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
3663 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
3664 |
.IF "$(CVER)"=="C295" |
3619 |
@echo "------------------------------" |
3665 |
@echo "------------------------------" |
3620 |
@echo "Updating static data member initializations" |
3666 |
@echo "Updating static data member initializations" |
3621 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
3667 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
3668 |
.ENDIF |
3622 |
.ENDIF |
3669 |
.ENDIF |
3623 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
3670 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
3624 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
3671 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 3636-3650
Link Here
|
3636 |
$(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) \ |
3683 |
$(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) \ |
3637 |
`cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
3684 |
`cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
3638 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
3685 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
3686 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL9STDLIBS)` \ |
3639 |
$(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(STDSHL9) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
3687 |
$(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) $(STDSHL9) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
3640 |
@cat $(MISC)$/$(@:b).cmd |
3688 |
@cat $(MISC)$/$(@:b).cmd |
3641 |
@+source $(MISC)$/$(@:b).cmd |
3689 |
@+source $(MISC)$/$(@:b).cmd |
3642 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
3690 |
.IF "$(CVER)"=="C295" |
3643 |
.IF "$(PRJNAME)"=="cppuhelper" |
3691 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
3644 |
@echo "------------------------------" |
3692 |
.IF "$(PRJNAME)"=="cppuhelper" |
3645 |
@echo "Rerunning static data member initializations" |
3693 |
@echo "------------------------------" |
3646 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
3694 |
@echo "Rerunning static data member initializations" |
3647 |
.ENDIF |
3695 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
3696 |
.ENDIF |
3697 |
.ENDIF |
3648 |
.IF "$(SHL9VERSIONMAP)"!="" |
3698 |
.IF "$(SHL9VERSIONMAP)"!="" |
3649 |
.IF "$(DEBUG)"=="" |
3699 |
.IF "$(DEBUG)"=="" |
3650 |
@strip -i -r -u -S -s $(SHL9VERSIONMAP) $@ |
3700 |
@strip -i -r -u -S -s $(SHL9VERSIONMAP) $@ |
Lines 3715-3721
Link Here
|
3715 |
.ENDIF |
3765 |
.ENDIF |
3716 |
|
3766 |
|
3717 |
# Link in static data members for template classes |
3767 |
# Link in static data members for template classes |
3718 |
.IF "$(OS)"=="MACOSX" |
3768 |
.IF "$(OS)$(CVER)"=="MACOSXC295" |
3719 |
SHL10STDLIBS+=$(STATICLIB) |
3769 |
SHL10STDLIBS+=$(STATICLIB) |
3720 |
.ENDIF |
3770 |
.ENDIF |
3721 |
|
3771 |
|
Lines 4028-4036
Link Here
|
4028 |
.ENDIF |
4078 |
.ENDIF |
4029 |
.IF "$(OS)"=="MACOSX" |
4079 |
.IF "$(OS)"=="MACOSX" |
4030 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
4080 |
$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
|
|
4081 |
.IF "$(CVER)"=="C295" |
4031 |
@echo "------------------------------" |
4082 |
@echo "------------------------------" |
4032 |
@echo "Updating static data member initializations" |
4083 |
@echo "Updating static data member initializations" |
4033 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
4084 |
@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
4085 |
.ENDIF |
4034 |
.ENDIF |
4086 |
.ENDIF |
4035 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
4087 |
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" |
4036 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
4088 |
$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c |
Lines 4048-4062
Link Here
|
4048 |
$(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) \ |
4100 |
$(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) \ |
4049 |
`cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
4101 |
`cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list |
4050 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
4102 |
@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ |
|
|
4103 |
`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL10STDLIBS)` \ |
4051 |
$(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(STDSHL10) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
4104 |
$(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) $(STDSHL10) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd |
4052 |
@cat $(MISC)$/$(@:b).cmd |
4105 |
@cat $(MISC)$/$(@:b).cmd |
4053 |
@+source $(MISC)$/$(@:b).cmd |
4106 |
@+source $(MISC)$/$(@:b).cmd |
4054 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
4107 |
.IF "$(CVER)"=="C295" |
4055 |
.IF "$(PRJNAME)"=="cppuhelper" |
4108 |
# This is a hack as libstatic and libcppuhelper have a circular dependency |
4056 |
@echo "------------------------------" |
4109 |
.IF "$(PRJNAME)"=="cppuhelper" |
4057 |
@echo "Rerunning static data member initializations" |
4110 |
@echo "------------------------------" |
4058 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
4111 |
@echo "Rerunning static data member initializations" |
4059 |
.ENDIF |
4112 |
@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" |
|
|
4113 |
.ENDIF |
4114 |
.ENDIF |
4060 |
.IF "$(SHL10VERSIONMAP)"!="" |
4115 |
.IF "$(SHL10VERSIONMAP)"!="" |
4061 |
.IF "$(DEBUG)"=="" |
4116 |
.IF "$(DEBUG)"=="" |
4062 |
@strip -i -r -u -S -s $(SHL10VERSIONMAP) $@ |
4117 |
@strip -i -r -u -S -s $(SHL10VERSIONMAP) $@ |