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

(-)inc/_tg_app.mk (-80 / +110 lines)
Lines 30-36 Link Here
30
.ENDIF
30
.ENDIF
31
31
32
# Link in static data members for template classes
32
# Link in static data members for template classes
33
.IF "$(OS)"=="MACOSX"
33
.IF "$(OS)$(CVER)"=="MACOSXC295"
34
# Allow certain executables to not link to libstatic*.dylib. This is only used
34
# Allow certain executables to not link to libstatic*.dylib. This is only used
35
# by build tools that are built in the bootstrap process.
35
# by build tools that are built in the bootstrap process.
36
.IF "$(NOSHAREDSTATICLIB)"==""
36
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 57-63 Link Here
57
$(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
57
$(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
58
	$(APP1RES) \
58
	$(APP1RES) \
59
	$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
59
	$(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
60
.IF "$(OS)"=="MACOSX"
60
.IF "$(OS)$(CVER)"=="MACOSXC295"
61
	@echo "------------------------------"
61
	@echo "------------------------------"
62
	@echo "Updating static data member initializations"
62
	@echo "Updating static data member initializations"
63
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
63
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 73-78 Link Here
73
	@+echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
73
	@+echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
74
	`cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
74
	`cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
75
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
75
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
76
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP1STDLIBS)` \
76
	$(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
77
	$(APP_LINKTYPE) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
77
	@cat $(MISC)$/$(@:b).cmd
78
	@cat $(MISC)$/$(@:b).cmd
78
	@source $(MISC)$/$(@:b).cmd
79
	@source $(MISC)$/$(@:b).cmd
Lines 81-92 Link Here
81
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
82
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
82
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
83
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
83
	@ls -l $@
84
	@ls -l $@
84
# This is a hack as libstatic and libcppuhelper have a circular dependency
85
   .IF "$(CVER)"=="C295"
85
.IF "$(PRJNAME)"=="cppuhelper"
86
     # This is a hack as libstatic and libcppuhelper have a circular dependency
86
	@echo "------------------------------"
87
     .IF "$(PRJNAME)"=="cppuhelper"
87
	@echo "Rerunning static data member initializations"
88
     	@echo "------------------------------"
88
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
89
     	@echo "Rerunning static data member initializations"
89
.ENDIF
90
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
91
     .ENDIF
92
   .ENDIF
90
.IF "$(TARGETTYPE)"=="GUI"
93
.IF "$(TARGETTYPE)"=="GUI"
91
	@echo "Making: $@.app"
94
	@echo "Making: $@.app"
92
.IF "$(STLPORT4)"!=""
95
.IF "$(STLPORT4)"!=""
Lines 244-250 Link Here
244
.ENDIF
247
.ENDIF
245
248
246
# Link in static data members for template classes
249
# Link in static data members for template classes
247
.IF "$(OS)"=="MACOSX"
250
.IF "$(OS)$(CVER)"=="MACOSXC295"
248
# Allow certain executables to not link to libstatic*.dylib. This is only used
251
# Allow certain executables to not link to libstatic*.dylib. This is only used
249
# by build tools that are built in the bootstrap process.
252
# by build tools that are built in the bootstrap process.
250
.IF "$(NOSHAREDSTATICLIB)"==""
253
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 271-277 Link Here
271
$(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
274
$(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
272
	$(APP2RES) \
275
	$(APP2RES) \
273
	$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
276
	$(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
274
.IF "$(OS)"=="MACOSX"
277
.IF "$(OS)$(CVER)"=="MACOSXC295"
275
	@echo "------------------------------"
278
	@echo "------------------------------"
276
	@echo "Updating static data member initializations"
279
	@echo "Updating static data member initializations"
277
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
280
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 287-292 Link Here
287
	@+echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
290
	@+echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
288
	`cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
291
	`cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
289
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
292
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
293
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP2STDLIBS)` \
290
	$(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
294
	$(APP_LINKTYPE) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
291
	@cat $(MISC)$/$(@:b).cmd
295
	@cat $(MISC)$/$(@:b).cmd
292
	@source $(MISC)$/$(@:b).cmd
296
	@source $(MISC)$/$(@:b).cmd
Lines 295-306 Link Here
295
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
299
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
296
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
300
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
297
	@ls -l $@
301
	@ls -l $@
298
# This is a hack as libstatic and libcppuhelper have a circular dependency
302
   .IF "$(CVER)"=="C295"
299
.IF "$(PRJNAME)"=="cppuhelper"
303
     # This is a hack as libstatic and libcppuhelper have a circular dependency
300
	@echo "------------------------------"
304
     .IF "$(PRJNAME)"=="cppuhelper"
301
	@echo "Rerunning static data member initializations"
305
     	@echo "------------------------------"
302
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
306
     	@echo "Rerunning static data member initializations"
303
.ENDIF
307
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
308
     .ENDIF
309
   .ENDIF
304
.IF "$(TARGETTYPE)"=="GUI"
310
.IF "$(TARGETTYPE)"=="GUI"
305
	@echo "Making: $@.app"
311
	@echo "Making: $@.app"
306
.IF "$(STLPORT4)"!=""
312
.IF "$(STLPORT4)"!=""
Lines 458-464 Link Here
458
.ENDIF
464
.ENDIF
459
465
460
# Link in static data members for template classes
466
# Link in static data members for template classes
461
.IF "$(OS)"=="MACOSX"
467
.IF "$(OS)$(CVER)"=="MACOSXC295"
462
# Allow certain executables to not link to libstatic*.dylib. This is only used
468
# Allow certain executables to not link to libstatic*.dylib. This is only used
463
# by build tools that are built in the bootstrap process.
469
# by build tools that are built in the bootstrap process.
464
.IF "$(NOSHAREDSTATICLIB)"==""
470
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 485-491 Link Here
485
$(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
491
$(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
486
	$(APP3RES) \
492
	$(APP3RES) \
487
	$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
493
	$(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
488
.IF "$(OS)"=="MACOSX"
494
.IF "$(OS)$(CVER)"=="MACOSXC295"
489
	@echo "------------------------------"
495
	@echo "------------------------------"
490
	@echo "Updating static data member initializations"
496
	@echo "Updating static data member initializations"
491
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
497
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 501-506 Link Here
501
	@+echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
507
	@+echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
502
	`cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
508
	`cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
503
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
509
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
510
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP3STDLIBS)` \
504
	$(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
511
	$(APP_LINKTYPE) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
505
	@cat $(MISC)$/$(@:b).cmd
512
	@cat $(MISC)$/$(@:b).cmd
506
	@source $(MISC)$/$(@:b).cmd
513
	@source $(MISC)$/$(@:b).cmd
Lines 509-520 Link Here
509
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
516
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
510
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
517
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
511
	@ls -l $@
518
	@ls -l $@
512
# This is a hack as libstatic and libcppuhelper have a circular dependency
519
   .IF "$(CVER)"=="C295"
513
.IF "$(PRJNAME)"=="cppuhelper"
520
     # This is a hack as libstatic and libcppuhelper have a circular dependency
514
	@echo "------------------------------"
521
     .IF "$(PRJNAME)"=="cppuhelper"
515
	@echo "Rerunning static data member initializations"
522
     	@echo "------------------------------"
516
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
523
     	@echo "Rerunning static data member initializations"
517
.ENDIF
524
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
525
     .ENDIF
526
   .ENDIF
518
.IF "$(TARGETTYPE)"=="GUI"
527
.IF "$(TARGETTYPE)"=="GUI"
519
	@echo "Making: $@.app"
528
	@echo "Making: $@.app"
520
.IF "$(STLPORT4)"!=""
529
.IF "$(STLPORT4)"!=""
Lines 672-678 Link Here
672
.ENDIF
681
.ENDIF
673
682
674
# Link in static data members for template classes
683
# Link in static data members for template classes
675
.IF "$(OS)"=="MACOSX"
684
.IF "$(OS)$(CVER)"=="MACOSXC295"
676
# Allow certain executables to not link to libstatic*.dylib. This is only used
685
# Allow certain executables to not link to libstatic*.dylib. This is only used
677
# by build tools that are built in the bootstrap process.
686
# by build tools that are built in the bootstrap process.
678
.IF "$(NOSHAREDSTATICLIB)"==""
687
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 699-705 Link Here
699
$(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
708
$(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
700
	$(APP4RES) \
709
	$(APP4RES) \
701
	$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
710
	$(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
702
.IF "$(OS)"=="MACOSX"
711
.IF "$(OS)$(CVER)"=="MACOSXC295"
703
	@echo "------------------------------"
712
	@echo "------------------------------"
704
	@echo "Updating static data member initializations"
713
	@echo "Updating static data member initializations"
705
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
714
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 715-720 Link Here
715
	@+echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
724
	@+echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
716
	`cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
725
	`cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
717
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
726
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
727
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP4STDLIBS)` \
718
	$(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
728
	$(APP_LINKTYPE) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
719
	@cat $(MISC)$/$(@:b).cmd
729
	@cat $(MISC)$/$(@:b).cmd
720
	@source $(MISC)$/$(@:b).cmd
730
	@source $(MISC)$/$(@:b).cmd
Lines 723-734 Link Here
723
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
733
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
724
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
734
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
725
	@ls -l $@
735
	@ls -l $@
726
# This is a hack as libstatic and libcppuhelper have a circular dependency
736
   .IF "$(CVER)"=="C295"
727
.IF "$(PRJNAME)"=="cppuhelper"
737
     # This is a hack as libstatic and libcppuhelper have a circular dependency
728
	@echo "------------------------------"
738
     .IF "$(PRJNAME)"=="cppuhelper"
729
	@echo "Rerunning static data member initializations"
739
     	@echo "------------------------------"
730
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
740
     	@echo "Rerunning static data member initializations"
731
.ENDIF
741
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
742
     .ENDIF
743
   .ENDIF
732
.IF "$(TARGETTYPE)"=="GUI"
744
.IF "$(TARGETTYPE)"=="GUI"
733
	@echo "Making: $@.app"
745
	@echo "Making: $@.app"
734
.IF "$(STLPORT4)"!=""
746
.IF "$(STLPORT4)"!=""
Lines 886-892 Link Here
886
.ENDIF
898
.ENDIF
887
899
888
# Link in static data members for template classes
900
# Link in static data members for template classes
889
.IF "$(OS)"=="MACOSX"
901
.IF "$(OS)$(CVER)"=="MACOSXC295"
890
# Allow certain executables to not link to libstatic*.dylib. This is only used
902
# Allow certain executables to not link to libstatic*.dylib. This is only used
891
# by build tools that are built in the bootstrap process.
903
# by build tools that are built in the bootstrap process.
892
.IF "$(NOSHAREDSTATICLIB)"==""
904
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 913-919 Link Here
913
$(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
925
$(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
914
	$(APP5RES) \
926
	$(APP5RES) \
915
	$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
927
	$(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
916
.IF "$(OS)"=="MACOSX"
928
.IF "$(OS)$(CVER)"=="MACOSXC295"
917
	@echo "------------------------------"
929
	@echo "------------------------------"
918
	@echo "Updating static data member initializations"
930
	@echo "Updating static data member initializations"
919
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
931
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 929-934 Link Here
929
	@+echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
941
	@+echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
930
	`cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
942
	`cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
931
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
943
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
944
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP5STDLIBS)` \
932
	$(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
945
	$(APP_LINKTYPE) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
933
	@cat $(MISC)$/$(@:b).cmd
946
	@cat $(MISC)$/$(@:b).cmd
934
	@source $(MISC)$/$(@:b).cmd
947
	@source $(MISC)$/$(@:b).cmd
Lines 937-948 Link Here
937
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
950
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
938
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
951
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
939
	@ls -l $@
952
	@ls -l $@
940
# This is a hack as libstatic and libcppuhelper have a circular dependency
953
   .IF "$(CVER)"=="C295"
941
.IF "$(PRJNAME)"=="cppuhelper"
954
     # This is a hack as libstatic and libcppuhelper have a circular dependency
942
	@echo "------------------------------"
955
     .IF "$(PRJNAME)"=="cppuhelper"
943
	@echo "Rerunning static data member initializations"
956
     	@echo "------------------------------"
944
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
957
     	@echo "Rerunning static data member initializations"
945
.ENDIF
958
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
959
     .ENDIF
960
   .ENDIF
946
.IF "$(TARGETTYPE)"=="GUI"
961
.IF "$(TARGETTYPE)"=="GUI"
947
	@echo "Making: $@.app"
962
	@echo "Making: $@.app"
948
.IF "$(STLPORT4)"!=""
963
.IF "$(STLPORT4)"!=""
Lines 1100-1106 Link Here
1100
.ENDIF
1115
.ENDIF
1101
1116
1102
# Link in static data members for template classes
1117
# Link in static data members for template classes
1103
.IF "$(OS)"=="MACOSX"
1118
.IF "$(OS)$(CVER)"=="MACOSXC295"
1104
# Allow certain executables to not link to libstatic*.dylib. This is only used
1119
# Allow certain executables to not link to libstatic*.dylib. This is only used
1105
# by build tools that are built in the bootstrap process.
1120
# by build tools that are built in the bootstrap process.
1106
.IF "$(NOSHAREDSTATICLIB)"==""
1121
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 1127-1133 Link Here
1127
$(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
1142
$(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
1128
	$(APP6RES) \
1143
	$(APP6RES) \
1129
	$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
1144
	$(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
1130
.IF "$(OS)"=="MACOSX"
1145
.IF "$(OS)$(CVER)"=="MACOSXC295"
1131
	@echo "------------------------------"
1146
	@echo "------------------------------"
1132
	@echo "Updating static data member initializations"
1147
	@echo "Updating static data member initializations"
1133
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1148
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 1143-1148 Link Here
1143
	@+echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
1158
	@+echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
1144
	`cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1159
	`cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1145
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1160
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1161
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP6STDLIBS)` \
1146
	$(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1162
	$(APP_LINKTYPE) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1147
	@cat $(MISC)$/$(@:b).cmd
1163
	@cat $(MISC)$/$(@:b).cmd
1148
	@source $(MISC)$/$(@:b).cmd
1164
	@source $(MISC)$/$(@:b).cmd
Lines 1151-1162 Link Here
1151
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1167
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1152
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1168
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1153
	@ls -l $@
1169
	@ls -l $@
1154
# This is a hack as libstatic and libcppuhelper have a circular dependency
1170
   .IF "$(CVER)"=="C295"
1155
.IF "$(PRJNAME)"=="cppuhelper"
1171
     # This is a hack as libstatic and libcppuhelper have a circular dependency
1156
	@echo "------------------------------"
1172
     .IF "$(PRJNAME)"=="cppuhelper"
1157
	@echo "Rerunning static data member initializations"
1173
     	@echo "------------------------------"
1158
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1174
     	@echo "Rerunning static data member initializations"
1159
.ENDIF
1175
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1176
     .ENDIF
1177
   .ENDIF
1160
.IF "$(TARGETTYPE)"=="GUI"
1178
.IF "$(TARGETTYPE)"=="GUI"
1161
	@echo "Making: $@.app"
1179
	@echo "Making: $@.app"
1162
.IF "$(STLPORT4)"!=""
1180
.IF "$(STLPORT4)"!=""
Lines 1314-1320 Link Here
1314
.ENDIF
1332
.ENDIF
1315
1333
1316
# Link in static data members for template classes
1334
# Link in static data members for template classes
1317
.IF "$(OS)"=="MACOSX"
1335
.IF "$(OS)$(CVER)"=="MACOSXC295"
1318
# Allow certain executables to not link to libstatic*.dylib. This is only used
1336
# Allow certain executables to not link to libstatic*.dylib. This is only used
1319
# by build tools that are built in the bootstrap process.
1337
# by build tools that are built in the bootstrap process.
1320
.IF "$(NOSHAREDSTATICLIB)"==""
1338
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 1341-1347 Link Here
1341
$(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
1359
$(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
1342
	$(APP7RES) \
1360
	$(APP7RES) \
1343
	$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
1361
	$(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
1344
.IF "$(OS)"=="MACOSX"
1362
.IF "$(OS)$(CVER)"=="MACOSXC295"
1345
	@echo "------------------------------"
1363
	@echo "------------------------------"
1346
	@echo "Updating static data member initializations"
1364
	@echo "Updating static data member initializations"
1347
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1365
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 1357-1362 Link Here
1357
	@+echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
1375
	@+echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
1358
	`cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1376
	`cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1359
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1377
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1378
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP7STDLIBS)` \
1360
	$(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1379
	$(APP_LINKTYPE) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1361
	@cat $(MISC)$/$(@:b).cmd
1380
	@cat $(MISC)$/$(@:b).cmd
1362
	@source $(MISC)$/$(@:b).cmd
1381
	@source $(MISC)$/$(@:b).cmd
Lines 1365-1376 Link Here
1365
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1384
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1366
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1385
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1367
	@ls -l $@
1386
	@ls -l $@
1368
# This is a hack as libstatic and libcppuhelper have a circular dependency
1387
   .IF "$(CVER)"=="C295"
1369
.IF "$(PRJNAME)"=="cppuhelper"
1388
     # This is a hack as libstatic and libcppuhelper have a circular dependency
1370
	@echo "------------------------------"
1389
     .IF "$(PRJNAME)"=="cppuhelper"
1371
	@echo "Rerunning static data member initializations"
1390
     	@echo "------------------------------"
1372
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1391
     	@echo "Rerunning static data member initializations"
1373
.ENDIF
1392
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1393
     .ENDIF
1394
   .ENDIF
1374
.IF "$(TARGETTYPE)"=="GUI"
1395
.IF "$(TARGETTYPE)"=="GUI"
1375
	@echo "Making: $@.app"
1396
	@echo "Making: $@.app"
1376
.IF "$(STLPORT4)"!=""
1397
.IF "$(STLPORT4)"!=""
Lines 1528-1534 Link Here
1528
.ENDIF
1549
.ENDIF
1529
1550
1530
# Link in static data members for template classes
1551
# Link in static data members for template classes
1531
.IF "$(OS)"=="MACOSX"
1552
.IF "$(OS)$(CVER)"=="MACOSXC295"
1532
# Allow certain executables to not link to libstatic*.dylib. This is only used
1553
# Allow certain executables to not link to libstatic*.dylib. This is only used
1533
# by build tools that are built in the bootstrap process.
1554
# by build tools that are built in the bootstrap process.
1534
.IF "$(NOSHAREDSTATICLIB)"==""
1555
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 1555-1561 Link Here
1555
$(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
1576
$(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
1556
	$(APP8RES) \
1577
	$(APP8RES) \
1557
	$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
1578
	$(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
1558
.IF "$(OS)"=="MACOSX"
1579
.IF "$(OS)$(CVER)"=="MACOSXC295"
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)"
Lines 1571-1576 Link Here
1571
	@+echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
1592
	@+echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
1572
	`cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1593
	`cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1573
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1594
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1595
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP8STDLIBS)` \
1574
	$(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1596
	$(APP_LINKTYPE) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1575
	@cat $(MISC)$/$(@:b).cmd
1597
	@cat $(MISC)$/$(@:b).cmd
1576
	@source $(MISC)$/$(@:b).cmd
1598
	@source $(MISC)$/$(@:b).cmd
Lines 1579-1590 Link Here
1579
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1601
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1580
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1602
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1581
	@ls -l $@
1603
	@ls -l $@
1582
# This is a hack as libstatic and libcppuhelper have a circular dependency
1604
   .IF "$(CVER)"=="C295"
1583
.IF "$(PRJNAME)"=="cppuhelper"
1605
     # This is a hack as libstatic and libcppuhelper have a circular dependency
1584
	@echo "------------------------------"
1606
     .IF "$(PRJNAME)"=="cppuhelper"
1585
	@echo "Rerunning static data member initializations"
1607
     	@echo "------------------------------"
1586
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1608
     	@echo "Rerunning static data member initializations"
1587
.ENDIF
1609
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1610
     .ENDIF
1611
   .ENDIF
1588
.IF "$(TARGETTYPE)"=="GUI"
1612
.IF "$(TARGETTYPE)"=="GUI"
1589
	@echo "Making: $@.app"
1613
	@echo "Making: $@.app"
1590
.IF "$(STLPORT4)"!=""
1614
.IF "$(STLPORT4)"!=""
Lines 1742-1748 Link Here
1742
.ENDIF
1766
.ENDIF
1743
1767
1744
# Link in static data members for template classes
1768
# Link in static data members for template classes
1745
.IF "$(OS)"=="MACOSX"
1769
.IF "$(OS)$(CVER)"=="MACOSXC295"
1746
# Allow certain executables to not link to libstatic*.dylib. This is only used
1770
# Allow certain executables to not link to libstatic*.dylib. This is only used
1747
# by build tools that are built in the bootstrap process.
1771
# by build tools that are built in the bootstrap process.
1748
.IF "$(NOSHAREDSTATICLIB)"==""
1772
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 1769-1775 Link Here
1769
$(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
1793
$(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
1770
	$(APP9RES) \
1794
	$(APP9RES) \
1771
	$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
1795
	$(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
1772
.IF "$(OS)"=="MACOSX"
1796
.IF "$(OS)$(CVER)"=="MACOSXC295"
1773
	@echo "------------------------------"
1797
	@echo "------------------------------"
1774
	@echo "Updating static data member initializations"
1798
	@echo "Updating static data member initializations"
1775
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1799
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 1785-1790 Link Here
1785
	@+echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
1809
	@+echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
1786
	`cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1810
	`cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
1787
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1811
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
1812
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP9STDLIBS)` \
1788
	$(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1813
	$(APP_LINKTYPE) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
1789
	@cat $(MISC)$/$(@:b).cmd
1814
	@cat $(MISC)$/$(@:b).cmd
1790
	@source $(MISC)$/$(@:b).cmd
1815
	@source $(MISC)$/$(@:b).cmd
Lines 1793-1804 Link Here
1793
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1818
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
1794
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1819
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
1795
	@ls -l $@
1820
	@ls -l $@
1796
# This is a hack as libstatic and libcppuhelper have a circular dependency
1821
   .IF "$(CVER)"=="C295"
1797
.IF "$(PRJNAME)"=="cppuhelper"
1822
     # This is a hack as libstatic and libcppuhelper have a circular dependency
1798
	@echo "------------------------------"
1823
     .IF "$(PRJNAME)"=="cppuhelper"
1799
	@echo "Rerunning static data member initializations"
1824
     	@echo "------------------------------"
1800
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1825
     	@echo "Rerunning static data member initializations"
1801
.ENDIF
1826
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
1827
     .ENDIF
1828
   .ENDIF
1802
.IF "$(TARGETTYPE)"=="GUI"
1829
.IF "$(TARGETTYPE)"=="GUI"
1803
	@echo "Making: $@.app"
1830
	@echo "Making: $@.app"
1804
.IF "$(STLPORT4)"!=""
1831
.IF "$(STLPORT4)"!=""
Lines 1956-1962 Link Here
1956
.ENDIF
1983
.ENDIF
1957
1984
1958
# Link in static data members for template classes
1985
# Link in static data members for template classes
1959
.IF "$(OS)"=="MACOSX"
1986
.IF "$(OS)$(CVER)"=="MACOSXC295"
1960
# Allow certain executables to not link to libstatic*.dylib. This is only used
1987
# Allow certain executables to not link to libstatic*.dylib. This is only used
1961
# by build tools that are built in the bootstrap process.
1988
# by build tools that are built in the bootstrap process.
1962
.IF "$(NOSHAREDSTATICLIB)"==""
1989
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 1983-1989 Link Here
1983
$(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2010
$(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
1984
	$(APP10RES) \
2011
	$(APP10RES) \
1985
	$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
2012
	$(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
1986
.IF "$(OS)"=="MACOSX"
2013
.IF "$(OS)$(CVER)"=="MACOSXC295"
1987
	@echo "------------------------------"
2014
	@echo "------------------------------"
1988
	@echo "Updating static data member initializations"
2015
	@echo "Updating static data member initializations"
1989
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
2016
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 1999-2004 Link Here
1999
	@+echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
2026
	@+echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \
2000
	`cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
2027
	`cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
2001
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
2028
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
2029
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP10STDLIBS)` \
2002
	$(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
2030
	$(APP_LINKTYPE) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
2003
	@cat $(MISC)$/$(@:b).cmd
2031
	@cat $(MISC)$/$(@:b).cmd
2004
	@source $(MISC)$/$(@:b).cmd
2032
	@source $(MISC)$/$(@:b).cmd
Lines 2007-2018 Link Here
2007
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
2035
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
2008
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
2036
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
2009
	@ls -l $@
2037
	@ls -l $@
2010
# This is a hack as libstatic and libcppuhelper have a circular dependency
2038
   .IF "$(CVER)"=="C295"
2011
.IF "$(PRJNAME)"=="cppuhelper"
2039
     # This is a hack as libstatic and libcppuhelper have a circular dependency
2012
	@echo "------------------------------"
2040
     .IF "$(PRJNAME)"=="cppuhelper"
2013
	@echo "Rerunning static data member initializations"
2041
     	@echo "------------------------------"
2014
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
2042
     	@echo "Rerunning static data member initializations"
2015
.ENDIF
2043
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
2044
     .ENDIF
2045
   .ENDIF
2016
.IF "$(TARGETTYPE)"=="GUI"
2046
.IF "$(TARGETTYPE)"=="GUI"
2017
	@echo "Making: $@.app"
2047
	@echo "Making: $@.app"
2018
.IF "$(STLPORT4)"!=""
2048
.IF "$(STLPORT4)"!=""
(-)inc/_tg_shl.mk (-70 / +125 lines)
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) $@
(-)inc/tg_app.mk (-8 / +11 lines)
Lines 125-131 Link Here
125
.ENDIF
125
.ENDIF
126
126
127
# Link in static data members for template classes
127
# Link in static data members for template classes
128
.IF "$(OS)"=="MACOSX"
128
.IF "$(OS)$(CVER)"=="MACOSXC295"
129
# Allow certain executables to not link to libstatic*.dylib. This is only used
129
# Allow certain executables to not link to libstatic*.dylib. This is only used
130
# by build tools that are built in the bootstrap process.
130
# by build tools that are built in the bootstrap process.
131
.IF "$(NOSHAREDSTATICLIB)"==""
131
.IF "$(NOSHAREDSTATICLIB)"==""
Lines 152-158 Link Here
152
$(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
152
$(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
153
	$(APP$(TNR)RES) \
153
	$(APP$(TNR)RES) \
154
	$(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
154
	$(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
155
.IF "$(OS)"=="MACOSX"
155
.IF "$(OS)$(CVER)"=="MACOSXC295"
156
	@echo "------------------------------"
156
	@echo "------------------------------"
157
	@echo "Updating static data member initializations"
157
	@echo "Updating static data member initializations"
158
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
158
	@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
Lines 168-173 Link Here
168
	@+echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
168
	@+echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \
169
	`cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
169
	`cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
170
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
170
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \
171
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(APP$(TNR)STDLIBS)` \
171
	$(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
172
	$(APP_LINKTYPE) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(@:b).cmd
172
	@cat $(MISC)$/$(@:b).cmd
173
	@cat $(MISC)$/$(@:b).cmd
173
	@source $(MISC)$/$(@:b).cmd
174
	@source $(MISC)$/$(@:b).cmd
Lines 176-187 Link Here
176
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
177
	@+-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip
177
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
178
	@strip -i -R $(MISC)$/$(@:b).strip -X $@
178
	@ls -l $@
179
	@ls -l $@
179
# This is a hack as libstatic and libcppuhelper have a circular dependency
180
   .IF "$(CVER)"=="C295"
180
.IF "$(PRJNAME)"=="cppuhelper"
181
     # This is a hack as libstatic and libcppuhelper have a circular dependency
181
	@echo "------------------------------"
182
     .IF "$(PRJNAME)"=="cppuhelper"
182
	@echo "Rerunning static data member initializations"
183
     	@echo "------------------------------"
183
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
184
     	@echo "Rerunning static data member initializations"
184
.ENDIF
185
     	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
186
     .ENDIF
187
   .ENDIF
185
.IF "$(TARGETTYPE)"=="GUI"
188
.IF "$(TARGETTYPE)"=="GUI"
186
	@echo "Making: $@.app"
189
	@echo "Making: $@.app"
187
.IF "$(STLPORT4)"!=""
190
.IF "$(STLPORT4)"!=""
(-)inc/tg_shl.mk (-7 / +17 lines)
Lines 107-115 Link Here
107
.ENDIF
107
.ENDIF
108
108
109
# Link in static data members for template classes
109
# Link in static data members for template classes
110
.IF "$(OS)"=="MACOSX"
110
.IF "$(OS)$(CVER)"=="MACOSXC295"
111
SHL$(TNR)STDLIBS+=$(STATICLIB)
112
# Allow certain libraries to not link to libstatic*.dylib. This is only used
113
# by libraries that cannot be linked to other libraries.
114
.IF "$(NOSHAREDSTATICLIB)"==""
111
SHL$(TNR)STDLIBS+=$(STATICLIB)
115
SHL$(TNR)STDLIBS+=$(STATICLIB)
112
.ENDIF
116
.ENDIF
117
.ENDIF
113
118
114
.IF "$(SHLLINKARCONLY)" != ""
119
.IF "$(SHLLINKARCONLY)" != ""
115
SHL$(TNR)STDLIBS=
120
SHL$(TNR)STDLIBS=
Lines 420-428 Link Here
420
.ENDIF
425
.ENDIF
421
.IF "$(OS)"=="MACOSX"
426
.IF "$(OS)"=="MACOSX"
422
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
427
		$(CC) -c -dynamic -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
428
    .IF "$(CVER)"=="C295"
423
		@echo "------------------------------"
429
		@echo "------------------------------"
424
		@echo "Updating static data member initializations"
430
		@echo "Updating static data member initializations"
425
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
431
		@+dmake -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
432
    .ENDIF
426
.ENDIF
433
.ENDIF
427
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
434
.IF "$(OS)"=="LINUX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
428
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
435
		$(CC) -c -fPIC -o $(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.o -DUNX $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c
Lines 440-454 Link Here
440
	$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) \
447
	$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) \
441
	`cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
448
	`cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list
442
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
449
	@+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \
450
	`dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \
443
	$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
451
	$(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd
444
	@cat $(MISC)$/$(@:b).cmd
452
	@cat $(MISC)$/$(@:b).cmd
445
	@+source $(MISC)$/$(@:b).cmd
453
	@+source $(MISC)$/$(@:b).cmd
446
# This is a hack as libstatic and libcppuhelper have a circular dependency
454
    .IF "$(CVER)"=="C295"
447
.IF "$(PRJNAME)"=="cppuhelper"
455
        # This is a hack as libstatic and libcppuhelper have a circular dependency
448
	@echo "------------------------------"
456
        .IF "$(PRJNAME)"=="cppuhelper"
449
	@echo "Rerunning static data member initializations"
457
	        @echo "------------------------------"
450
	@+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
458
	        @echo "Rerunning static data member initializations"
451
.ENDIF
459
	        @+dmake -u -f $(SOLARENV)$/$(OUTPATH)$/inc/makefile.mk $(MFLAGS) $(CALLMACROS) "PRJ=$(PRJ)" "PRJNAME=$(PRJNAME)" "TARGET=$(TARGET)"
460
        .ENDIF
461
    .ENDIF
452
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
462
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
453
.IF "$(DEBUG)"==""
463
.IF "$(DEBUG)"==""
454
	@strip -i -r -u -S -s $(SHL$(TNR)VERSIONMAP) $@
464
	@strip -i -r -u -S -s $(SHL$(TNR)VERSIONMAP) $@
(-)inc/unxmacxp.mk (-68 / +124 lines)
Lines 2-10 Link Here
2
#
2
#
3
#   $RCSfile: unxmacxp.mk,v $
3
#   $RCSfile: unxmacxp.mk,v $
4
#
4
#
5
#   $Revision: 1.42 $
5
#   $Revision: 1.40.4.7 $
6
#
6
#
7
#   last change: $Author: hr $ $Date: 2003/03/27 11:48:19 $
7
#   last change: $Author: fa $ $Date: 2003/04/15 21:46:47 $
8
#
8
#
9
#   The Contents of this file are made available subject to the terms of
9
#   The Contents of this file are made available subject to the terms of
10
#   either of the following licenses
10
#   either of the following licenses
Lines 60-90 Link Here
60
#
60
#
61
#*************************************************************************
61
#*************************************************************************
62
62
63
##########################################################################
64
# Platform MAKEFILE for Mac OS X and Darwin
65
##########################################################################
66
63
# DARWIN_VERSION holds the Darwin version in the format: 000000. For example,
67
# DARWIN_VERSION holds the Darwin version in the format: 000000. For example,
64
# if the Darwin version is 1.3.7, DARWIN_VERSION will be set to 010307.
68
# if the Darwin version is 1.3.7, DARWIN_VERSION will be set to 010307.
65
DARWIN_VERSION=$(shell -/bin/sh -c "uname -r | sed 's/\./ /g' | xargs printf %2.2i%2.2i%2.2i")  
69
DARWIN_VERSION=$(shell -/bin/sh -c "uname -r | sed 's/\./ /g' | xargs printf %2.2i%2.2i%2.2i")  
66
70
67
# mk file for unxmacxp
68
ASM=
71
ASM=
69
AFLAGS=
72
AFLAGS=
70
71
LINKOUTPUT_FILTER=
73
LINKOUTPUT_FILTER=
72
74
73
# _PTHREADS is needed for the stl
75
# Definitions that we may need on the compile line.
76
# -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when
77
#  compiling STLport sources too, either internally or externally.
74
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1
78
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1
75
79
76
# Name of library where static data members are initialized
80
# Name of library where static data members are initialized
77
STATICLIBNAME=static$(DLLPOSTFIX)
81
STATICLIBNAME=static$(DLLPOSTFIX)
78
STATICLIB=-l$(STATICLIBNAME)
82
STATICLIB=-l$(STATICLIBNAME)
79
83
84
# MacOS X specific Java compilation/link flags
80
.IF "$(SOLAR_JAVA)"!=""
85
.IF "$(SOLAR_JAVA)"!=""
81
JAVADEF=-DSOLAR_JAVA
86
	JAVADEF=-DSOLAR_JAVA
82
JAVAFLAGSDEBUG=-g
87
	JAVAFLAGSDEBUG=-g
83
JAVA_RUNTIME=-framework JavaVM
88
	JAVA_RUNTIME=-framework JavaVM
84
.ENDIF
89
.ENDIF
85
90
86
CXX*=cc
91
# Specify the compiler to use.  NOTE:  MacOS X should always specify
87
CC*=cc
92
# c++ for C++ compilation as it does certain C++ specific things
93
# behind the scenes for us.
94
# CC = C++ compiler to use
95
# cc = C compiler to use
96
# objc = Objective C compiler to use
97
#CC=c++
98
#cc=cc
88
objc=cc
99
objc=cc
89
100
90
# [ed] 6/15/02 Some .. bleep .. decided to make a directory within a module that has the same
101
# [ed] 6/15/02 Some .. bleep .. decided to make a directory within a module that has the same
Lines 93-130 Link Here
93
# an error and not search for a file with that name in a following -I directive on the
104
# an error and not search for a file with that name in a following -I directive on the
94
# command line.  Therefore...this ugly hack...put STL as the first include on the linkline.
105
# command line.  Therefore...this ugly hack...put STL as the first include on the linkline.
95
106
96
.IF "$(STLPORT4)"!=""
107
# Remeber:  STLPORT4=="NO_STLPORT4" generally indicates that we are using the _INTERNAL_ stlport
97
.IF "$(STLPORT4)"=="NO_STLPORT4"
108
# in OOo and not an external one.
98
109
99
# [ed] We need to add in the STLport include directory included with the standard OOo sources,
110
.IF "$(STLPORT4)"!=""
100
# currently STLPORT 4.5.
111
	.IF "$(STLPORT4)"=="NO_STLPORT4"
101
112
		# [ed] We need to add in the STLport include directory included with the standard OOo sources,
102
CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
113
		# currently STLPORT 4.5.
103
.ELSE
114
		CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
104
115
	.ELSE
105
# [ed] We've got stlport4!
116
		# [ed] Add in external STLport includes directory if not using internal stlport
106
117
		CFLAGS=-c -I$(STLPORT4)$/stlport $(INCLUDE)
107
CFLAGS=-c -I$(STLPORT4)$/stlport $(INCLUDE)
118
	.ENDIF
108
109
.ENDIF
110
.ELSE
119
.ELSE
111
120
	# Otherwise, some indeterminiate STLport...
112
# [ed] We need to add in the STLport include directory included with the standrad OOo sources,
121
	CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
113
# currently STLPORT 4.5
114
115
CFLAGS=-c -I$(SOLARVERSION)$/$(GVERDIR)$/inc/stl $(INCLUDE)
116
117
.ENDIF
122
.ENDIF
118
123
119
CFLAGSCC=-pipe -traditional-cpp -fno-common
124
# ---------------------------------
125
#  Compilation flags
126
# ---------------------------------
127
# Normal C compilation flags
128
CFLAGSCC=-pipe -fno-common
120
129
130
# Normal Objective C compilation flags
121
OBJCFLAGS=-no-precomp
131
OBJCFLAGS=-no-precomp
122
132
133
# Comp Flags for files that need exceptions enabled (C and C++)
123
CFLAGSEXCEPTIONS=-fexceptions
134
CFLAGSEXCEPTIONS=-fexceptions
135
# Comp Flags for files that do not need exceptions enabled (C and C++)
124
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
136
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
125
137
126
CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-operator-names -fno-coalesce -fno-common
138
# Normal C++ compilation flags
139
CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-operator-names -fno-coalesce -fno-common -Wno-long-double -fno-strict-aliasing
127
140
141
# Other flags
128
CFLAGSOBJGUIST=-fPIC
142
CFLAGSOBJGUIST=-fPIC
129
CFLAGSOBJCUIST=-fPIC
143
CFLAGSOBJCUIST=-fPIC
130
CFLAGSOBJGUIMT=-fPIC
144
CFLAGSOBJGUIMT=-fPIC
Lines 132-202 Link Here
132
CFLAGSSLOGUIMT=-fPIC
146
CFLAGSSLOGUIMT=-fPIC
133
CFLAGSSLOCUIMT=-fPIC
147
CFLAGSSLOCUIMT=-fPIC
134
CFLAGSPROF=
148
CFLAGSPROF=
149
# Flag for including debugging information in object files
135
CFLAGSDEBUG=-g
150
CFLAGSDEBUG=-g
136
CFLAGSDBGUTIL=
151
CFLAGSDBGUTIL=
152
# Flag to specify output file to compiler/linker
153
CFLAGSOUTOBJ=-o
137
154
155
# ---------------------------------
156
#  Optimization flags
157
# ---------------------------------
138
# Workaround for the compiler's buggy opitmizer when exceptions are turned on.
158
# Workaround for the compiler's buggy opitmizer when exceptions are turned on.
139
# Note that we have to define NO_OPTIMIZE for all files as once you turn off
159
# Note that we have to define NO_OPTIMIZE for all files as once you turn off
140
# optimizing for one file, we need to adjust our compiling of the remaining
160
# optimizing for one file, we need to adjust our compiling of the remaining
141
# optimized files.
161
# optimized files.
142
CDEFS+=-DNO_OPTIMIZE
162
CDEFS+=-DNO_OPTIMIZE
143
.IF "$(ENABLE_EXCEPTIONS)"==""
163
.IF "$(ENABLE_EXCEPTIONS)"==""
144
CFLAGSOPT=-O2
164
	# Opt flags when exceptions are _dis_abled
145
CFLAGSNOOPT=-O
165
	CFLAGSOPT=-O2
166
	CFLAGSNOOPT=-O
146
.ELSE
167
.ELSE
147
CFLAGSOPT=
168
	# Opt flags when exceptions are enabled
148
CFLAGSNOOPT=
169
	CFLAGSOPT=
170
	CFLAGSNOOPT=
149
.ENDIF
171
.ENDIF
150
CFLAGSOUTOBJ=-o
151
172
152
# Currently, there is no nas support for OS X...
173
# Currently, there is no nas support for OS X...
153
CDEFS+=           -DNO_AUDIO
174
CDEFS+= -DNO_AUDIO
154
175
155
SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep -v cppuhelper")
176
# ---------------------------------
156
.IF "$(STLPORT4)"!=""
177
#  Shared Library names
157
.IF "$(STLPORT4)"=="NO_STLPORT4"
178
# ---------------------------------
158
  # Look for STLport 4.5 libraries in SOLARLIBDIR
179
# Add all libraries to the shared lib list that ARE NOT lib*static or cppuhelper (to prevent multiply defined errors)
159
  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST).[0-9].[0-9] 2>/dev/null")
180
SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).*[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).*[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).*[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep -v cppuhelper")
181
182
# ---------------------------------
183
#  STLport library names
184
# ---------------------------------
185
# Option for adding STLport _dynamic_ library to the link line
186
LIBSTLPORT=-lstlport_gcc
187
188
# Get the name of the static STLport library
189
.IF "$(STLPORT4)"=="" || "$(STLPORT4)"=="NO_STLPORT4"
190
	LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib/libstlport_gcc.a
160
.ELSE
191
.ELSE
161
  # Look for STLport 4.0 libraries in the STLport4 home directory
192
	LIBSTLPORTST=$(STLPORT4)$/lib/libstlport_gcc.a
162
  SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) $(STLPORT4)$/lib$/*$(DLLPOST).[0-9] 2>/dev/null")
163
.ENDIF
193
.ENDIF
194
195
# Get the name of the dynamic STLport library and add it to the shared lib list
196
.IF "$(STLPORT4)"!=""
197
	.IF "$(STLPORT4)"=="NO_STLPORT4"
198
		# Look for STLport 4.5 libraries in SOLARLIBDIR
199
		SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/$(DLLPRE)$(LIBSTLPORT:s/-l//)$(DLLPOST) 2>/dev/null")
200
	.ELSE
201
		# Look for STLport 4.0 libraries in the STLport4 home directory
202
		SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) $(STLPORT4)$/lib$/*$(DLLPOST).*[0-9] 2>/dev/null")
203
	.ENDIF
164
.ENDIF
204
.ENDIF
165
205
166
# GrP mega-hack! no cppuhelper for cppuhelper
206
# ---------------------------------
207
#  Module specific shared lib requirements
208
# ---------------------------------
167
.IF "$(PRJNAME)"!="cppuhelper"
209
.IF "$(PRJNAME)"!="cppuhelper"
168
SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep cppuhelper")
210
	# For all projects _except_ cppuhelper, add cppuhelper's library to the shared lib list.
211
	# Note this only adds cppuhelper and no other libraries.
212
	# Attempting to link cppuhelper to itself results in multiple defines errors
213
	SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(SOLARLIBDIR)$/*$(DLLPOST).*[0-9] $(LB)$/*$(DLLPOST) $(LB)$/*$(DLLPOST).*[0-9] $(MISC)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST).*[0-9] 2>/dev/null | grep -E -v 'lib\w+static' | grep cppuhelper")
169
.ENDIF
214
.ENDIF
170
215
171
# GrP remove -U options (can't use for two-level)
216
# ---------------------------------
172
LINK=cc
217
#  Link stage flags
173
LINKFLAGS=-dynamic -framework System -framework CoreFoundation -lcc_dynamic -lstdc++ \
218
# ---------------------------------
174
  $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) \
219
# For MacOS X, always use C++ compiler for linking because it does some library
175
  -L$(MISC)
220
# order magic behind the scenes
221
LINK=c++
222
LINKFLAGS=-dynamic -Wl,-multiply_defined,suppress -lcc_dynamic -lstdc++ -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)
176
225
177
# [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
178
.IF "$(GUIBASE)" == "aqua"
227
.IF "$(GUIBASE)" == "aqua"
179
LINKFLAGS+=-lobjc
228
	LINKFLAGS+=-lobjc
180
INCGUI+= -I$(PRJ)$/unx/inc
229
	# Sometimes we still use files that would be in a GUIBASE="unx" specific directory
230
	# because they really aren't GUIBASE specific, so we've got to account for that here.
231
	INCGUI+= -I$(PRJ)$/unx/inc
181
.ENDIF
232
.ENDIF
182
233
234
# Random link flags dealing with different cases of linking
235
# UNIXVERSIONNAMES specifies whether or not to use library versioning
236
#   (ie libstlport.dylib.4.5) rather than no versioning.  We currently
237
#   use this on MacOS X.
183
LINKFLAGSAPPGUI=
238
LINKFLAGSAPPGUI=
184
.IF "$(UNIXVERSIONNAMES)"!=""
239
.IF "$(UNIXVERSIONNAMES)"!=""
185
LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
240
	LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
186
.ELSE
241
.ELSE
187
LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
242
	LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
188
.ENDIF
243
.ENDIF
189
LINKFLAGSAPPCUI=-Wl,-u,__objcInit
244
LINKFLAGSAPPCUI=-Wl,-u,__objcInit
190
.IF "$(UNIXVERSIONNAMES)"!=""
245
.IF "$(UNIXVERSIONNAMES)"!=""
191
LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
246
	LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f:b:b)'
192
.ELSE
247
.ELSE
193
LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
248
	LINKFLAGSSHLCUI=-dynamiclib -install_name '@executable_path$/$(@:f)'
194
.ENDIF
249
.ENDIF
195
LINKFLAGSTACK=
250
LINKFLAGSTACK=
196
LINKFLAGSPROF=
251
LINKFLAGSPROF=
252
# Flag to add debugging information to final products
197
LINKFLAGSDEBUG=-g
253
LINKFLAGSDEBUG=-g
198
LINKFLAGSOPT=
254
LINKFLAGSOPT=
199
255
256
# ---------------------------------
257
#  MacOS X shared library specifics
258
# ---------------------------------
259
# Tag to identify an output file as a MacOS X output file
260
DLLPOSTFIX=mxp
261
# Tag to identify an output file as a library
262
DLLPRE=lib
263
# File extension to identify dynamic shared libraries on MacOS X
264
DLLPOST=.dylib
265
266
# We don't use mapping on MacOS X
200
LINKVERSIONMAPFLAG=
267
LINKVERSIONMAPFLAG=
201
268
202
# Reihenfolge der libs NICHT egal!
269
# Reihenfolge der libs NICHT egal!
Lines 213-225 Link Here
213
STDSHLGUIMT=
280
STDSHLGUIMT=
214
STDSHLCUIMT=
281
STDSHLCUIMT=
215
282
216
LIBSTLPORT=-lstlport_gcc
217
.IF "$(STLPORT4)"!=""
218
LIBSTLPORTST=$(STLPORT4)$/lib/libstlport_gcc.a
219
.ELSE
220
LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib/libstlport_gcc.a
221
.ENDIF
222
223
LIBMGR=libtool
283
LIBMGR=libtool
224
LIBFLAGS=-o
284
LIBFLAGS=-o
225
285
Lines 234-240 Link Here
234
RCLINK=
294
RCLINK=
235
RCLINKFLAGS=
295
RCLINKFLAGS=
236
RCSETVERSION=
296
RCSETVERSION=
237
238
DLLPOSTFIX=mxp
239
DLLPRE=lib
240
DLLPOST=.dylib
(-)unxmacxp/bin/dylib-link-list (-2 / +2 lines)
Lines 3-11 Link Here
3
#
3
#
4
#   $RCSfile: dylib-link-list,v $
4
#   $RCSfile: dylib-link-list,v $
5
#
5
#
6
#   $Revision: 1.3 $
6
#   $Revision: 1.1.2.3 $
7
#
7
#
8
#   last change: $Author: vg $ $Date: 2003/06/02 09:42:56 $
8
#   last change: $Author: fa $ $Date: 2003/02/20 04:36:37 $
9
#
9
#
10
#   The Contents of this file are made available subject to the terms of
10
#   The Contents of this file are made available subject to the terms of
11
#   either of the following licenses
11
#   either of the following licenses

Return to issue 16414