View | Details | Raw Unified | Return to issue 11000
Collapse All | Expand All

(-)inc/_tg_app.mk (-20 / +30 lines)
Lines 57-63 Link Here
57 
.IF "$(OS)"=="MACOSX"
 57 
.IF "$(OS)"=="MACOSX"
58 
	@echo "------------------------------"
 58 
	@echo "------------------------------"
59 
	@echo "Updating static data member initializations"
 59 
	@echo "Updating static data member initializations"
60 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 60 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)"
61 
.ENDIF
 61 
.ENDIF
62 
	@echo ------------------------------
 62 
	@echo ------------------------------
63 
	@echo Making: $@
 63 
	@echo Making: $@
Lines 70-75 Link Here
70 
	@+echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
 70 
	@+echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
71 
	`cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 71 
	`cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
72 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 72 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
73 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP1STDLIBS)` \
73 
	$(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 74 
	$(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
74 
	@cat $(MISC)$/$(@:b).cmd
 75 
	@cat $(MISC)$/$(@:b).cmd
75 
	@source $(MISC)$/$(@:b).cmd
 76 
	@source $(MISC)$/$(@:b).cmd
Lines 82-88 Link Here
82 
.IF "$(PRJNAME)"=="cppuhelper"
 83 
.IF "$(PRJNAME)"=="cppuhelper"
83 
	@echo "------------------------------"
 84 
	@echo "------------------------------"
84 
	@echo "Rerunning static data member initializations"
 85 
	@echo "Rerunning static data member initializations"
85 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 86 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)"
86 
.ENDIF
 87 
.ENDIF
87 
.ELSE		# "$(OS)"=="MACOSX"
 88 
.ELSE		# "$(OS)"=="MACOSX"
88 
	@+echo unx
 89 
	@+echo unx
Lines 249-255 Link Here
249 
.IF "$(OS)"=="MACOSX"
 250 
.IF "$(OS)"=="MACOSX"
250 
	@echo "------------------------------"
 251 
	@echo "------------------------------"
251 
	@echo "Updating static data member initializations"
 252 
	@echo "Updating static data member initializations"
252 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 253 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)"
253 
.ENDIF
 254 
.ENDIF
254 
	@echo ------------------------------
 255 
	@echo ------------------------------
255 
	@echo Making: $@
 256 
	@echo Making: $@
Lines 262-267 Link Here
262 
	@+echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
 263 
	@+echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
263 
	`cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 264 
	`cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
264 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 265 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
266 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP2STDLIBS)` \
265 
	$(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 267 
	$(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
266 
	@cat $(MISC)$/$(@:b).cmd
 268 
	@cat $(MISC)$/$(@:b).cmd
267 
	@source $(MISC)$/$(@:b).cmd
 269 
	@source $(MISC)$/$(@:b).cmd
Lines 274-280 Link Here
274 
.IF "$(PRJNAME)"=="cppuhelper"
 276 
.IF "$(PRJNAME)"=="cppuhelper"
275 
	@echo "------------------------------"
 277 
	@echo "------------------------------"
276 
	@echo "Rerunning static data member initializations"
 278 
	@echo "Rerunning static data member initializations"
277 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 279 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)"
278 
.ENDIF
 280 
.ENDIF
279 
.ELSE		# "$(OS)"=="MACOSX"
 281 
.ELSE		# "$(OS)"=="MACOSX"
280 
	@+echo unx
 282 
	@+echo unx
Lines 441-447 Link Here
441 
.IF "$(OS)"=="MACOSX"
 443 
.IF "$(OS)"=="MACOSX"
442 
	@echo "------------------------------"
 444 
	@echo "------------------------------"
443 
	@echo "Updating static data member initializations"
 445 
	@echo "Updating static data member initializations"
444 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 446 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)"
445 
.ENDIF
 447 
.ENDIF
446 
	@echo ------------------------------
 448 
	@echo ------------------------------
447 
	@echo Making: $@
 449 
	@echo Making: $@
Lines 454-459 Link Here
454 
	@+echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
 456 
	@+echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
455 
	`cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 457 
	`cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
456 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 458 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
459 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP3STDLIBS)` \
457 
	$(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 460 
	$(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
458 
	@cat $(MISC)$/$(@:b).cmd
 461 
	@cat $(MISC)$/$(@:b).cmd
459 
	@source $(MISC)$/$(@:b).cmd
 462 
	@source $(MISC)$/$(@:b).cmd
Lines 466-472 Link Here
466 
.IF "$(PRJNAME)"=="cppuhelper"
 469 
.IF "$(PRJNAME)"=="cppuhelper"
467 
	@echo "------------------------------"
 470 
	@echo "------------------------------"
468 
	@echo "Rerunning static data member initializations"
 471 
	@echo "Rerunning static data member initializations"
469 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 472 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)"
470 
.ENDIF
 473 
.ENDIF
471 
.ELSE		# "$(OS)"=="MACOSX"
 474 
.ELSE		# "$(OS)"=="MACOSX"
472 
	@+echo unx
 475 
	@+echo unx
Lines 633-639 Link Here
633 
.IF "$(OS)"=="MACOSX"
 636 
.IF "$(OS)"=="MACOSX"
634 
	@echo "------------------------------"
 637 
	@echo "------------------------------"
635 
	@echo "Updating static data member initializations"
 638 
	@echo "Updating static data member initializations"
636 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 639 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)"
637 
.ENDIF
 640 
.ENDIF
638 
	@echo ------------------------------
 641 
	@echo ------------------------------
639 
	@echo Making: $@
 642 
	@echo Making: $@
Lines 646-651 Link Here
646 
	@+echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
 649 
	@+echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
647 
	`cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 650 
	`cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
648 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 651 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
652 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP4STDLIBS)` \
649 
	$(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 653 
	$(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
650 
	@cat $(MISC)$/$(@:b).cmd
 654 
	@cat $(MISC)$/$(@:b).cmd
651 
	@source $(MISC)$/$(@:b).cmd
 655 
	@source $(MISC)$/$(@:b).cmd
Lines 658-664 Link Here
658 
.IF "$(PRJNAME)"=="cppuhelper"
 662 
.IF "$(PRJNAME)"=="cppuhelper"
659 
	@echo "------------------------------"
 663 
	@echo "------------------------------"
660 
	@echo "Rerunning static data member initializations"
 664 
	@echo "Rerunning static data member initializations"
661 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 665 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)"
662 
.ENDIF
 666 
.ENDIF
663 
.ELSE		# "$(OS)"=="MACOSX"
 667 
.ELSE		# "$(OS)"=="MACOSX"
664 
	@+echo unx
 668 
	@+echo unx
Lines 825-831 Link Here
825 
.IF "$(OS)"=="MACOSX"
 829 
.IF "$(OS)"=="MACOSX"
826 
	@echo "------------------------------"
 830 
	@echo "------------------------------"
827 
	@echo "Updating static data member initializations"
 831 
	@echo "Updating static data member initializations"
828 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 832 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)"
829 
.ENDIF
 833 
.ENDIF
830 
	@echo ------------------------------
 834 
	@echo ------------------------------
831 
	@echo Making: $@
 835 
	@echo Making: $@
Lines 838-843 Link Here
838 
	@+echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
 842 
	@+echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
839 
	`cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 843 
	`cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
840 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 844 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
845 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP5STDLIBS)` \
841 
	$(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 846 
	$(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
842 
	@cat $(MISC)$/$(@:b).cmd
 847 
	@cat $(MISC)$/$(@:b).cmd
843 
	@source $(MISC)$/$(@:b).cmd
 848 
	@source $(MISC)$/$(@:b).cmd
Lines 850-856 Link Here
850 
.IF "$(PRJNAME)"=="cppuhelper"
 855 
.IF "$(PRJNAME)"=="cppuhelper"
851 
	@echo "------------------------------"
 856 
	@echo "------------------------------"
852 
	@echo "Rerunning static data member initializations"
 857 
	@echo "Rerunning static data member initializations"
853 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 858 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)"
854 
.ENDIF
 859 
.ENDIF
855 
.ELSE		# "$(OS)"=="MACOSX"
 860 
.ELSE		# "$(OS)"=="MACOSX"
856 
	@+echo unx
 861 
	@+echo unx
Lines 1017-1023 Link Here
1017 
.IF "$(OS)"=="MACOSX"
 1022 
.IF "$(OS)"=="MACOSX"
1018 
	@echo "------------------------------"
 1023 
	@echo "------------------------------"
1019 
	@echo "Updating static data member initializations"
 1024 
	@echo "Updating static data member initializations"
1020 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1025 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)"
1021 
.ENDIF
 1026 
.ENDIF
1022 
	@echo ------------------------------
 1027 
	@echo ------------------------------
1023 
	@echo Making: $@
 1028 
	@echo Making: $@
Lines 1030-1035 Link Here
1030 
	@+echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
 1035 
	@+echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
1031 
	`cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 1036 
	`cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1032 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 1037 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1038 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP6STDLIBS)` \
1033 
	$(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 1039 
	$(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1034 
	@cat $(MISC)$/$(@:b).cmd
 1040 
	@cat $(MISC)$/$(@:b).cmd
1035 
	@source $(MISC)$/$(@:b).cmd
 1041 
	@source $(MISC)$/$(@:b).cmd
Lines 1042-1048 Link Here
1042 
.IF "$(PRJNAME)"=="cppuhelper"
 1048 
.IF "$(PRJNAME)"=="cppuhelper"
1043 
	@echo "------------------------------"
 1049 
	@echo "------------------------------"
1044 
	@echo "Rerunning static data member initializations"
 1050 
	@echo "Rerunning static data member initializations"
1045 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1051 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)"
1046 
.ENDIF
 1052 
.ENDIF
1047 
.ELSE		# "$(OS)"=="MACOSX"
 1053 
.ELSE		# "$(OS)"=="MACOSX"
1048 
	@+echo unx
 1054 
	@+echo unx
Lines 1209-1215 Link Here
1209 
.IF "$(OS)"=="MACOSX"
 1215 
.IF "$(OS)"=="MACOSX"
1210 
	@echo "------------------------------"
 1216 
	@echo "------------------------------"
1211 
	@echo "Updating static data member initializations"
 1217 
	@echo "Updating static data member initializations"
1212 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1218 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)"
1213 
.ENDIF
 1219 
.ENDIF
1214 
	@echo ------------------------------
 1220 
	@echo ------------------------------
1215 
	@echo Making: $@
 1221 
	@echo Making: $@
Lines 1222-1227 Link Here
1222 
	@+echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
 1228 
	@+echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
1223 
	`cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 1229 
	`cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1224 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 1230 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1231 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP7STDLIBS)` \
1225 
	$(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 1232 
	$(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1226 
	@cat $(MISC)$/$(@:b).cmd
 1233 
	@cat $(MISC)$/$(@:b).cmd
1227 
	@source $(MISC)$/$(@:b).cmd
 1234 
	@source $(MISC)$/$(@:b).cmd
Lines 1234-1240 Link Here
1234 
.IF "$(PRJNAME)"=="cppuhelper"
 1241 
.IF "$(PRJNAME)"=="cppuhelper"
1235 
	@echo "------------------------------"
 1242 
	@echo "------------------------------"
1236 
	@echo "Rerunning static data member initializations"
 1243 
	@echo "Rerunning static data member initializations"
1237 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1244 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)"
1238 
.ENDIF
 1245 
.ENDIF
1239 
.ELSE		# "$(OS)"=="MACOSX"
 1246 
.ELSE		# "$(OS)"=="MACOSX"
1240 
	@+echo unx
 1247 
	@+echo unx
Lines 1401-1407 Link Here
1401 
.IF "$(OS)"=="MACOSX"
 1408 
.IF "$(OS)"=="MACOSX"
1402 
	@echo "------------------------------"
 1409 
	@echo "------------------------------"
1403 
	@echo "Updating static data member initializations"
 1410 
	@echo "Updating static data member initializations"
1404 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1411 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)"
1405 
.ENDIF
 1412 
.ENDIF
1406 
	@echo ------------------------------
 1413 
	@echo ------------------------------
1407 
	@echo Making: $@
 1414 
	@echo Making: $@
Lines 1414-1419 Link Here
1414 
	@+echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
 1421 
	@+echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
1415 
	`cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 1422 
	`cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1416 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 1423 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1424 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP8STDLIBS)` \
1417 
	$(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 1425 
	$(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1418 
	@cat $(MISC)$/$(@:b).cmd
 1426 
	@cat $(MISC)$/$(@:b).cmd
1419 
	@source $(MISC)$/$(@:b).cmd
 1427 
	@source $(MISC)$/$(@:b).cmd
Lines 1426-1432 Link Here
1426 
.IF "$(PRJNAME)"=="cppuhelper"
 1434 
.IF "$(PRJNAME)"=="cppuhelper"
1427 
	@echo "------------------------------"
 1435 
	@echo "------------------------------"
1428 
	@echo "Rerunning static data member initializations"
 1436 
	@echo "Rerunning static data member initializations"
1429 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1437 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)"
1430 
.ENDIF
 1438 
.ENDIF
1431 
.ELSE		# "$(OS)"=="MACOSX"
 1439 
.ELSE		# "$(OS)"=="MACOSX"
1432 
	@+echo unx
 1440 
	@+echo unx
Lines 1593-1599 Link Here
1593 
.IF "$(OS)"=="MACOSX"
 1601 
.IF "$(OS)"=="MACOSX"
1594 
	@echo "------------------------------"
 1602 
	@echo "------------------------------"
1595 
	@echo "Updating static data member initializations"
 1603 
	@echo "Updating static data member initializations"
1596 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1604 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)"
1597 
.ENDIF
 1605 
.ENDIF
1598 
	@echo ------------------------------
 1606 
	@echo ------------------------------
1599 
	@echo Making: $@
 1607 
	@echo Making: $@
Lines 1606-1611 Link Here
1606 
	@+echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
 1614 
	@+echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
1607 
	`cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 1615 
	`cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1608 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 1616 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1617 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP9STDLIBS)` \
1609 
	$(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 1618 
	$(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1610 
	@cat $(MISC)$/$(@:b).cmd
 1619 
	@cat $(MISC)$/$(@:b).cmd
1611 
	@source $(MISC)$/$(@:b).cmd
 1620 
	@source $(MISC)$/$(@:b).cmd
Lines 1618-1624 Link Here
1618 
.IF "$(PRJNAME)"=="cppuhelper"
 1627 
.IF "$(PRJNAME)"=="cppuhelper"
1619 
	@echo "------------------------------"
 1628 
	@echo "------------------------------"
1620 
	@echo "Rerunning static data member initializations"
 1629 
	@echo "Rerunning static data member initializations"
1621 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1630 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)"
1622 
.ENDIF
 1631 
.ENDIF
1623 
.ELSE		# "$(OS)"=="MACOSX"
 1632 
.ELSE		# "$(OS)"=="MACOSX"
1624 
	@+echo unx
 1633 
	@+echo unx
Lines 1785-1791 Link Here
1785 
.IF "$(OS)"=="MACOSX"
 1794 
.IF "$(OS)"=="MACOSX"
1786 
	@echo "------------------------------"
 1795 
	@echo "------------------------------"
1787 
	@echo "Updating static data member initializations"
 1796 
	@echo "Updating static data member initializations"
1788 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1797 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)"
1789 
.ENDIF
 1798 
.ENDIF
1790 
	@echo ------------------------------
 1799 
	@echo ------------------------------
1791 
	@echo Making: $@
 1800 
	@echo Making: $@
Lines 1798-1803 Link Here
1798 
	@+echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
 1807 
	@+echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
1799 
	`cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 1808 
	`cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1800 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 1809 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1810 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP10STDLIBS)` \
1801 
	$(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 1811 
	$(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1802 
	@cat $(MISC)$/$(@:b).cmd
 1812 
	@cat $(MISC)$/$(@:b).cmd
1803 
	@source $(MISC)$/$(@:b).cmd
 1813 
	@source $(MISC)$/$(@:b).cmd
Lines 1810-1816 Link Here
1810 
.IF "$(PRJNAME)"=="cppuhelper"
 1820 
.IF "$(PRJNAME)"=="cppuhelper"
1811 
	@echo "------------------------------"
 1821 
	@echo "------------------------------"
1812 
	@echo "Rerunning static data member initializations"
 1822 
	@echo "Rerunning static data member initializations"
1813 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1823 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)"
1814 
.ENDIF
 1824 
.ENDIF
1815 
.ELSE		# "$(OS)"=="MACOSX"
 1825 
.ELSE		# "$(OS)"=="MACOSX"
1816 
	@+echo unx
 1826 
	@+echo unx
(-)inc/_tg_shl.mk (-20 / +30 lines)
Lines 354-360 Link Here
354 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 354 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
355 
		@echo "------------------------------"
 355 
		@echo "------------------------------"
356 
		@echo "Updating static data member initializations"
 356 
		@echo "Updating static data member initializations"
357 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 357 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)"
358 
.ENDIF
 358 
.ENDIF
359 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 359 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
360 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 360 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 372-377 Link Here
372 
	$(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) \
 372 
	$(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ:s/.obj/.o/) \
373 
	`cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 373 
	`cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
374 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 374 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
375 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL1STDLIBS)` \
375 
	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 376 
	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
376 
	@cat $(MISC)$/$(@:b).cmd
 377 
	@cat $(MISC)$/$(@:b).cmd
377 
	@+source $(MISC)$/$(@:b).cmd
 378 
	@+source $(MISC)$/$(@:b).cmd
Lines 379-385 Link Here
379 
.IF "$(PRJNAME)"=="cppuhelper"
 380 
.IF "$(PRJNAME)"=="cppuhelper"
380 
	@echo "------------------------------"
 381 
	@echo "------------------------------"
381 
	@echo "Rerunning static data member initializations"
 382 
	@echo "Rerunning static data member initializations"
382 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 383 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL1STDLIBS)"
383 
.ENDIF
 384 
.ENDIF
384 
.IF "$(SHL1VERSIONMAP)"!=""
 385 
.IF "$(SHL1VERSIONMAP)"!=""
385 
.IF "$(DEBUG)"==""
 386 
.IF "$(DEBUG)"==""
Lines 781-787 Link Here
781 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 782 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
782 
		@echo "------------------------------"
 783 
		@echo "------------------------------"
783 
		@echo "Updating static data member initializations"
 784 
		@echo "Updating static data member initializations"
784 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 785 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)"
785 
.ENDIF
 786 
.ENDIF
786 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 787 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
787 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 788 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 799-804 Link Here
799 
	$(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) \
 800 
	$(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ:s/.obj/.o/) \
800 
	`cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 801 
	`cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
801 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 802 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
803 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL2STDLIBS)` \
802 
	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 804 
	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
803 
	@cat $(MISC)$/$(@:b).cmd
 805 
	@cat $(MISC)$/$(@:b).cmd
804 
	@+source $(MISC)$/$(@:b).cmd
 806 
	@+source $(MISC)$/$(@:b).cmd
Lines 806-812 Link Here
806 
.IF "$(PRJNAME)"=="cppuhelper"
 808 
.IF "$(PRJNAME)"=="cppuhelper"
807 
	@echo "------------------------------"
 809 
	@echo "------------------------------"
808 
	@echo "Rerunning static data member initializations"
 810 
	@echo "Rerunning static data member initializations"
809 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 811 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL2STDLIBS)"
810 
.ENDIF
 812 
.ENDIF
811 
.IF "$(SHL2VERSIONMAP)"!=""
 813 
.IF "$(SHL2VERSIONMAP)"!=""
812 
.IF "$(DEBUG)"==""
 814 
.IF "$(DEBUG)"==""
Lines 1208-1214 Link Here
1208 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 1210 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
1209 
		@echo "------------------------------"
 1211 
		@echo "------------------------------"
1210 
		@echo "Updating static data member initializations"
 1212 
		@echo "Updating static data member initializations"
1211 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1213 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)"
1212 
.ENDIF
 1214 
.ENDIF
1213 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 1215 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
1214 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 1216 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 1226-1231 Link Here
1226 
	$(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) \
 1228 
	$(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ:s/.obj/.o/) \
1227 
	`cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 1229 
	`cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1228 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 1230 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
1231 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL3STDLIBS)` \
1229 
	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 1232 
	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
1230 
	@cat $(MISC)$/$(@:b).cmd
 1233 
	@cat $(MISC)$/$(@:b).cmd
1231 
	@+source $(MISC)$/$(@:b).cmd
 1234 
	@+source $(MISC)$/$(@:b).cmd
Lines 1233-1239 Link Here
1233 
.IF "$(PRJNAME)"=="cppuhelper"
 1236 
.IF "$(PRJNAME)"=="cppuhelper"
1234 
	@echo "------------------------------"
 1237 
	@echo "------------------------------"
1235 
	@echo "Rerunning static data member initializations"
 1238 
	@echo "Rerunning static data member initializations"
1236 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1239 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL3STDLIBS)"
1237 
.ENDIF
 1240 
.ENDIF
1238 
.IF "$(SHL3VERSIONMAP)"!=""
 1241 
.IF "$(SHL3VERSIONMAP)"!=""
1239 
.IF "$(DEBUG)"==""
 1242 
.IF "$(DEBUG)"==""
Lines 1635-1641 Link Here
1635 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 1638 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
1636 
		@echo "------------------------------"
 1639 
		@echo "------------------------------"
1637 
		@echo "Updating static data member initializations"
 1640 
		@echo "Updating static data member initializations"
1638 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1641 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)"
1639 
.ENDIF
 1642 
.ENDIF
1640 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 1643 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
1641 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 1644 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 1653-1658 Link Here
1653 
	$(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) \
 1656 
	$(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ:s/.obj/.o/) \
1654 
	`cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 1657 
	`cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1655 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 1658 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
1659 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL4STDLIBS)` \
1656 
	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 1660 
	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
1657 
	@cat $(MISC)$/$(@:b).cmd
 1661 
	@cat $(MISC)$/$(@:b).cmd
1658 
	@+source $(MISC)$/$(@:b).cmd
 1662 
	@+source $(MISC)$/$(@:b).cmd
Lines 1660-1666 Link Here
1660 
.IF "$(PRJNAME)"=="cppuhelper"
 1664 
.IF "$(PRJNAME)"=="cppuhelper"
1661 
	@echo "------------------------------"
 1665 
	@echo "------------------------------"
1662 
	@echo "Rerunning static data member initializations"
 1666 
	@echo "Rerunning static data member initializations"
1663 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 1667 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL4STDLIBS)"
1664 
.ENDIF
 1668 
.ENDIF
1665 
.IF "$(SHL4VERSIONMAP)"!=""
 1669 
.IF "$(SHL4VERSIONMAP)"!=""
1666 
.IF "$(DEBUG)"==""
 1670 
.IF "$(DEBUG)"==""
Lines 2062-2068 Link Here
2062 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 2066 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
2063 
		@echo "------------------------------"
 2067 
		@echo "------------------------------"
2064 
		@echo "Updating static data member initializations"
 2068 
		@echo "Updating static data member initializations"
2065 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 2069 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)"
2066 
.ENDIF
 2070 
.ENDIF
2067 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 2071 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
2068 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 2072 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 2080-2085 Link Here
2080 
	$(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) \
 2084 
	$(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ:s/.obj/.o/) \
2081 
	`cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 2085 
	`cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
2082 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 2086 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
2087 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL5STDLIBS)` \
2083 
	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 2088 
	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
2084 
	@cat $(MISC)$/$(@:b).cmd
 2089 
	@cat $(MISC)$/$(@:b).cmd
2085 
	@+source $(MISC)$/$(@:b).cmd
 2090 
	@+source $(MISC)$/$(@:b).cmd
Lines 2087-2093 Link Here
2087 
.IF "$(PRJNAME)"=="cppuhelper"
 2092 
.IF "$(PRJNAME)"=="cppuhelper"
2088 
	@echo "------------------------------"
 2093 
	@echo "------------------------------"
2089 
	@echo "Rerunning static data member initializations"
 2094 
	@echo "Rerunning static data member initializations"
2090 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 2095 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL5STDLIBS)"
2091 
.ENDIF
 2096 
.ENDIF
2092 
.IF "$(SHL5VERSIONMAP)"!=""
 2097 
.IF "$(SHL5VERSIONMAP)"!=""
2093 
.IF "$(DEBUG)"==""
 2098 
.IF "$(DEBUG)"==""
Lines 2489-2495 Link Here
2489 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 2494 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
2490 
		@echo "------------------------------"
 2495 
		@echo "------------------------------"
2491 
		@echo "Updating static data member initializations"
 2496 
		@echo "Updating static data member initializations"
2492 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 2497 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)"
2493 
.ENDIF
 2498 
.ENDIF
2494 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 2499 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
2495 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 2500 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 2507-2512 Link Here
2507 
	$(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) \
 2512 
	$(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ:s/.obj/.o/) \
2508 
	`cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 2513 
	`cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
2509 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 2514 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
2515 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL6STDLIBS)` \
2510 
	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 2516 
	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
2511 
	@cat $(MISC)$/$(@:b).cmd
 2517 
	@cat $(MISC)$/$(@:b).cmd
2512 
	@+source $(MISC)$/$(@:b).cmd
 2518 
	@+source $(MISC)$/$(@:b).cmd
Lines 2514-2520 Link Here
2514 
.IF "$(PRJNAME)"=="cppuhelper"
 2520 
.IF "$(PRJNAME)"=="cppuhelper"
2515 
	@echo "------------------------------"
 2521 
	@echo "------------------------------"
2516 
	@echo "Rerunning static data member initializations"
 2522 
	@echo "Rerunning static data member initializations"
2517 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 2523 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL6STDLIBS)"
2518 
.ENDIF
 2524 
.ENDIF
2519 
.IF "$(SHL6VERSIONMAP)"!=""
 2525 
.IF "$(SHL6VERSIONMAP)"!=""
2520 
.IF "$(DEBUG)"==""
 2526 
.IF "$(DEBUG)"==""
Lines 2916-2922 Link Here
2916 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 2922 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
2917 
		@echo "------------------------------"
 2923 
		@echo "------------------------------"
2918 
		@echo "Updating static data member initializations"
 2924 
		@echo "Updating static data member initializations"
2919 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 2925 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)"
2920 
.ENDIF
 2926 
.ENDIF
2921 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 2927 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
2922 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 2928 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 2934-2939 Link Here
2934 
	$(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) \
 2940 
	$(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ:s/.obj/.o/) \
2935 
	`cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 2941 
	`cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
2936 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 2942 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
2943 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL7STDLIBS)` \
2937 
	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 2944 
	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
2938 
	@cat $(MISC)$/$(@:b).cmd
 2945 
	@cat $(MISC)$/$(@:b).cmd
2939 
	@+source $(MISC)$/$(@:b).cmd
 2946 
	@+source $(MISC)$/$(@:b).cmd
Lines 2941-2947 Link Here
2941 
.IF "$(PRJNAME)"=="cppuhelper"
 2948 
.IF "$(PRJNAME)"=="cppuhelper"
2942 
	@echo "------------------------------"
 2949 
	@echo "------------------------------"
2943 
	@echo "Rerunning static data member initializations"
 2950 
	@echo "Rerunning static data member initializations"
2944 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 2951 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL7STDLIBS)"
2945 
.ENDIF
 2952 
.ENDIF
2946 
.IF "$(SHL7VERSIONMAP)"!=""
 2953 
.IF "$(SHL7VERSIONMAP)"!=""
2947 
.IF "$(DEBUG)"==""
 2954 
.IF "$(DEBUG)"==""
Lines 3343-3349 Link Here
3343 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 3350 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
3344 
		@echo "------------------------------"
 3351 
		@echo "------------------------------"
3345 
		@echo "Updating static data member initializations"
 3352 
		@echo "Updating static data member initializations"
3346 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 3353 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)"
3347 
.ENDIF
 3354 
.ENDIF
3348 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 3355 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
3349 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 3356 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 3361-3366 Link Here
3361 
	$(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) \
 3368 
	$(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ:s/.obj/.o/) \
3362 
	`cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 3369 
	`cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
3363 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 3370 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
3371 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL8STDLIBS)` \
3364 
	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 3372 
	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
3365 
	@cat $(MISC)$/$(@:b).cmd
 3373 
	@cat $(MISC)$/$(@:b).cmd
3366 
	@+source $(MISC)$/$(@:b).cmd
 3374 
	@+source $(MISC)$/$(@:b).cmd
Lines 3368-3374 Link Here
3368 
.IF "$(PRJNAME)"=="cppuhelper"
 3376 
.IF "$(PRJNAME)"=="cppuhelper"
3369 
	@echo "------------------------------"
 3377 
	@echo "------------------------------"
3370 
	@echo "Rerunning static data member initializations"
 3378 
	@echo "Rerunning static data member initializations"
3371 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 3379 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL8STDLIBS)"
3372 
.ENDIF
 3380 
.ENDIF
3373 
.IF "$(SHL8VERSIONMAP)"!=""
 3381 
.IF "$(SHL8VERSIONMAP)"!=""
3374 
.IF "$(DEBUG)"==""
 3382 
.IF "$(DEBUG)"==""
Lines 3770-3776 Link Here
3770 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 3778 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
3771 
		@echo "------------------------------"
 3779 
		@echo "------------------------------"
3772 
		@echo "Updating static data member initializations"
 3780 
		@echo "Updating static data member initializations"
3773 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 3781 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)"
3774 
.ENDIF
 3782 
.ENDIF
3775 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 3783 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
3776 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 3784 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 3788-3793 Link Here
3788 
	$(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) \
 3796 
	$(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ:s/.obj/.o/) \
3789 
	`cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 3797 
	`cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
3790 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 3798 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
3799 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL9STDLIBS)` \
3791 
	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 3800 
	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
3792 
	@cat $(MISC)$/$(@:b).cmd
 3801 
	@cat $(MISC)$/$(@:b).cmd
3793 
	@+source $(MISC)$/$(@:b).cmd
 3802 
	@+source $(MISC)$/$(@:b).cmd
Lines 3795-3801 Link Here
3795 
.IF "$(PRJNAME)"=="cppuhelper"
 3804 
.IF "$(PRJNAME)"=="cppuhelper"
3796 
	@echo "------------------------------"
 3805 
	@echo "------------------------------"
3797 
	@echo "Rerunning static data member initializations"
 3806 
	@echo "Rerunning static data member initializations"
3798 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 3807 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL9STDLIBS)"
3799 
.ENDIF
 3808 
.ENDIF
3800 
.IF "$(SHL9VERSIONMAP)"!=""
 3809 
.IF "$(SHL9VERSIONMAP)"!=""
3801 
.IF "$(DEBUG)"==""
 3810 
.IF "$(DEBUG)"==""
Lines 4197-4203 Link Here
4197 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 4206 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
4198 
		@echo "------------------------------"
 4207 
		@echo "------------------------------"
4199 
		@echo "Updating static data member initializations"
 4208 
		@echo "Updating static data member initializations"
4200 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 4209 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)"
4201 
.ENDIF
 4210 
.ENDIF
4202 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 4211 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
4203 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 4212 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 4215-4220 Link Here
4215 
	$(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) \
 4224 
	$(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ:s/.obj/.o/) \
4216 
	`cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 4225 
	`cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
4217 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 4226 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
4227 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL10STDLIBS)` \
4218 
	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 4228 
	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
4219 
	@cat $(MISC)$/$(@:b).cmd
 4229 
	@cat $(MISC)$/$(@:b).cmd
4220 
	@+source $(MISC)$/$(@:b).cmd
 4230 
	@+source $(MISC)$/$(@:b).cmd
Lines 4222-4228 Link Here
4222 
.IF "$(PRJNAME)"=="cppuhelper"
 4232 
.IF "$(PRJNAME)"=="cppuhelper"
4223 
	@echo "------------------------------"
 4233 
	@echo "------------------------------"
4224 
	@echo "Rerunning static data member initializations"
 4234 
	@echo "Rerunning static data member initializations"
4225 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 4235 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL10STDLIBS)"
4226 
.ENDIF
 4236 
.ENDIF
4227 
.IF "$(SHL10VERSIONMAP)"!=""
 4237 
.IF "$(SHL10VERSIONMAP)"!=""
4228 
.IF "$(DEBUG)"==""
 4238 
.IF "$(DEBUG)"==""
(-)inc/tg_app.mk (-2 / +3 lines)
Lines 152-158 Link Here
152 
.IF "$(OS)"=="MACOSX"
 152 
.IF "$(OS)"=="MACOSX"
153 
	@echo "------------------------------"
 153 
	@echo "------------------------------"
154 
	@echo "Updating static data member initializations"
 154 
	@echo "Updating static data member initializations"
155 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 155 
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)"
156 
.ENDIF
 156 
.ENDIF
157 
	@echo ------------------------------
 157 
	@echo ------------------------------
158 
	@echo Making: $@
 158 
	@echo Making: $@
Lines 165-170 Link Here
165 
	@+echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
 165 
	@+echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
166 
	`cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 166 
	`cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
167 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
 167 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
168 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP$(TNR)STDLIBS)` \
168 
	$(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
 169 
	$(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
169 
	@cat $(MISC)$/$(@:b).cmd
 170 
	@cat $(MISC)$/$(@:b).cmd
170 
	@source $(MISC)$/$(@:b).cmd
 171 
	@source $(MISC)$/$(@:b).cmd
Lines 177-183 Link Here
177 
.IF "$(PRJNAME)"=="cppuhelper"
 178 
.IF "$(PRJNAME)"=="cppuhelper"
178 
	@echo "------------------------------"
 179 
	@echo "------------------------------"
179 
	@echo "Rerunning static data member initializations"
 180 
	@echo "Rerunning static data member initializations"
180 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 181 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)"
181 
.ENDIF
 182 
.ENDIF
182 
.ELSE		# "$(OS)"=="MACOSX"
 183 
.ELSE		# "$(OS)"=="MACOSX"
183 
	@+echo unx
 184 
	@+echo unx
(-)inc/tg_shl.mk (-2 / +3 lines)
Lines 454-460 Link Here
454 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 454 
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
455 
		@echo "------------------------------"
 455 
		@echo "------------------------------"
456 
		@echo "Updating static data member initializations"
 456 
		@echo "Updating static data member initializations"
457 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 457 
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)"
458 
.ENDIF
 458 
.ENDIF
459 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
 459 
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
460 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
 460 
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.cxx
Lines 472-477 Link Here
472 
	$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) \
 472 
	$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) \
473 
	`cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
 473 
	`cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
474 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
 474 
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
475 
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \
475 
	$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
 476 
	$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
476 
	@cat $(MISC)$/$(@:b).cmd
 477 
	@cat $(MISC)$/$(@:b).cmd
477 
	@+source $(MISC)$/$(@:b).cmd
 478 
	@+source $(MISC)$/$(@:b).cmd
Lines 479-485 Link Here
479 
.IF "$(PRJNAME)"=="cppuhelper"
 480 
.IF "$(PRJNAME)"=="cppuhelper"
480 
	@echo "------------------------------"
 481 
	@echo "------------------------------"
481 
	@echo "Rerunning static data member initializations"
 482 
	@echo "Rerunning static data member initializations"
482 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
 483 
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)" "DYLIBLINKLIBS=$(SHL$(TNR)STDLIBS)"
483 
.ENDIF
 484 
.ENDIF
484 
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
 485 
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
485 
.IF "$(DEBUG)"==""
 486 
.IF "$(DEBUG)"==""
(-)inc/unxmacxp.mk (-3 / +4 lines)
Lines 218-226 Link Here
218 
# ---------------------------------
 218 
# ---------------------------------
219 
# For MacOS X, always use C++ compiler for linking because it does some library
 219 
# For MacOS X, always use C++ compiler for linking because it does some library
220 
# order magic behind the scenes
 220 
# order magic behind the scenes
221 
LINK=cc
 221 
LINK=g++
222 
LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \
 222 
LINKFLAGS=-dynamic -framework System -framework CoreFoundation -Wl,-multiply_defined,suppress -lcc_dynamic -lstdc++ -L$(MISC)
223 
	$(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) -L$(MISC)
 223 
#LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \
224 
#	$(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) -L$(MISC)
224 

          225
          

        

        

          225
          
# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line

          226
          
# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line

        

        

          226
          
.IF "$(GUIBASE)" == "aqua"

          227
          
.IF "$(GUIBASE)" == "aqua"

        



(-)unxmacxp/inc/makefile.mk
      (-3 / +12 lines)




  

    
      
            Lines 71-89
          
      
      
        Link Here
      
    
  

        

          71
          

          71
          

        

        

          72
          
# --- Targets ---

          72
          
# --- Targets ---

        

        

          73
          

          73
          

        

            

              
              
              74
              
FURTHERLINKLIBS=

            

            

              75
              

            

        

          74
          
# This is a hack to allow linking when we instantiated cppu::*ImplHelper static

          76
          
# This is a hack to allow linking when we instantiated cppu::*ImplHelper static

        

        

          75
          
# data members. Ideally, we need to link to libcppuhelper, but sometimes it

          77
          
# data members. Ideally, we need to link to libcppuhelper, but sometimes it

        

        

          76
          
# may not yet be built so we need to leave them undefined until a later run.

          78
          
# may not yet be built so we need to leave them undefined until a later run.

        

        

          77
          

          79
          

        

        

          78
          
CPPUHELPERLIBNAME=$(DLLPRE)$(CPPUHELPERLIB:s/-l//)$(DLLPOST)

          80
          
CPPUHELPERLIBNAME=$(DLLPRE)$(CPPUHELPERLIB:s/-l//)$(DLLPOST)

        

        

          79
          
.IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(CPPUHELPERLIBNAME) $(LB)$/$(CPPUHELPERLIBNAME) 2>/dev/null")"!=""

          81
          
.IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(CPPUHELPERLIBNAME) $(LB)$/$(CPPUHELPERLIBNAME) 2>/dev/null")"!=""

        

          
            

              80
              
	LINKFLAGSSHL+=$(CPPUHELPERLIB)


              82
              
	FURTHERLINKLIBS+=$(CPPUHELPERLIB)

            

        

          81
          
.ENDIF

          83
          
.ENDIF

        

        

          82
          

          84
          

        

        

          83
          
# sal needs to be on the static data link list after is it created.

          85
          
# sal needs to be on the static data link list after is it created.

        

        

          84
          
SALLIBNAME=$(DLLPRE)$(SALLIB:s/-l//)$(DLLPOST)

          86
          
SALLIBNAME=$(DLLPRE)$(SALLIB:s/-l//)$(DLLPOST)

        

        

          85
          
.IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(SALLIBNAME) $(LB)$/$(SALLIBNAME) 2>/dev/null")"!=""

          87
          
.IF "$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(SALLIBNAME) $(LB)$/$(SALLIBNAME) 2>/dev/null")"!=""

        

          
            

              86
              
	LINKFLAGSSHL+=$(SALLIB)


              88
              
	FURTHERLINKLIBS+=$(SALLIB)

            

            

              
              

              89
              
.ENDIF

            

            


              90
              

            

            


              91
              
.IF "$(FURTHERLINKLIBS)"!=""

            

            


              92
              
	LINKFLAGSSHL+=$(FURTHERLINKLIBS)

            

        

          87
          
.ENDIF

          93
          
.ENDIF

        

        

          88
          

          94
          

        

        

          89
          
# get the name of the stlport .dylib for the init-static-data-template script.

          95
          
# get the name of the stlport .dylib for the init-static-data-template script.

        

  

    
      
            Lines 99-104
          
      
      
        Link Here
      
    
  

        

          99
          
	.ENDIF

          105
          
	.ENDIF

        

        

          100
          
.ENDIF

          106
          
.ENDIF

        

        

          101
          

          107
          

        

            

              
              
              108
              
# Get the list of dylibs to link against in @executable_path/dylib:/path/to/dylib format

            

            

              109
              
DYLIBLINKLIST=$(shell -/bin/sh -c "dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(DYLIBLINKLIBS) $(FURTHERLINKLIBS) -l$(LIBSTLPORT)")

            

            

              110
              

            

        

          102
          
# Update, compile and link static data member library. Note that we do all of

          111
          
# Update, compile and link static data member library. Note that we do all of

        

        

          103
          
# these steps in our custom recipes. This avoids dependency and recursion

          112
          
# these steps in our custom recipes. This avoids dependency and recursion

        

        

          104
          
# problems associated with using the standard rules.

          113
          
# problems associated with using the standard rules.

        

  

    
      
            Lines 110-116
          
      
      
        Link Here
      
    
  

        

          110
          
LINKFLAGSSTATICSHL=$(shell echo $(LINKFLAGSSHL) | sed 's/$(PRJNAME)$(TARGET)$(STATICLIBNAME)/$(STATICLIBNAME)/g')

          119
          
LINKFLAGSSTATICSHL=$(shell echo $(LINKFLAGSSHL) | sed 's/$(PRJNAME)$(TARGET)$(STATICLIBNAME)/$(STATICLIBNAME)/g')

        

        

          111
          

          120
          

        

        

          112
          
$(LB)$/$(DLLPRE)$(PRJNAME)$(TARGET)$(STATICLIBNAME)$(DLLPOST): $(MISC)$/$(PRJNAME)$(TARGET)staticdatamembers.o

          121
          
$(LB)$/$(DLLPRE)$(PRJNAME)$(TARGET)$(STATICLIBNAME)$(DLLPOST): $(MISC)$/$(PRJNAME)$(TARGET)staticdatamembers.o

        

          
            

              113
              
	+$(LINK) $(LINKFLAGS) $(LINKFLAGSSTATICSHL) $(SOLARLIB) -L$(PRJ)$/$(ROUT)$/lib -o $@ $<


              122
              
	+$(LINK) $(LINKFLAGS) $(LINKFLAGSSTATICSHL) $(DYLIBLINKLIST) $(SOLARLIB) -L$(PRJ)$/$(ROUT)$/lib -o $@ $<

            

        

          114
          
	+ln -sf ..$/lib$/$(@:f) $(MISC)$/$(DLLPRE)$(STATICLIBNAME)$(DLLPOST)

          123
          
	+ln -sf ..$/lib$/$(@:f) $(MISC)$/$(DLLPRE)$(STATICLIBNAME)$(DLLPOST)

        

        

          115
          

          124
          

        

        

          116
          
# Merge all of the *staticdatamembers.cxx, *staticdatamembers.hxx, and

          125
          
# Merge all of the *staticdatamembers.cxx, *staticdatamembers.hxx, and

        






  

  Return to issue 11000