diff options
Diffstat (limited to 'solenv/inc')
29 files changed, 1968 insertions, 612 deletions
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk index 960c8d229b76..bf7e87417243 100644 --- a/solenv/inc/_tg_app.mk +++ b/solenv/inc/_tg_app.mk @@ -1,6 +1,6 @@ # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP1DEF = $(MISC)/$(APP1TARGET).def .ENDIF @@ -64,7 +64,7 @@ APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\" $(MISC)/$(APP1TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP1LIBS)"!="" +.ENDIF #"$(APP1LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP1TARGETN:b)_linkinc.ls @@ -75,10 +75,10 @@ $(APP1TARGETN) : $(LINKINCTARGETS) APP1LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") +_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") APP1IMP_ORD = $(foreach,i,$(_APP1IMP_ORD) $(shell @-ls $i)) .ELSE -APP1IMP_ORD = +APP1IMP_ORD = .ENDIF $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ @@ -94,7 +94,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \ `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_1.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \ @@ -232,7 +232,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc .ENDIF # "$(APP1LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def .ENDIF @@ -250,7 +250,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1OBJS) \ $(APP1LIBS) \ $(APP1STDLIBS:^"-l") \ - $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") + $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") .ENDIF $(COMMAND_ECHO)$(APP1LINKER) -v \ $(APP1LINKFLAGS) \ @@ -266,7 +266,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1OBJS) \ $(APP1LIBS) \ $(APP1STDLIBS:^"-l") \ - $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") + $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") .IF "$(APP1TARGET)" == "loader" @@ -284,7 +284,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP2DEF = $(MISC)/$(APP2TARGET).def .ENDIF @@ -348,7 +348,7 @@ APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\" $(MISC)/$(APP2TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP2LIBS)"!="" +.ENDIF #"$(APP2LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP2TARGETN:b)_linkinc.ls @@ -359,10 +359,10 @@ $(APP2TARGETN) : $(LINKINCTARGETS) APP2LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") +_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") APP2IMP_ORD = $(foreach,i,$(_APP2IMP_ORD) $(shell @-ls $i)) .ELSE -APP2IMP_ORD = +APP2IMP_ORD = .ENDIF $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ @@ -378,7 +378,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \ `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_2.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \ @@ -516,7 +516,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc .ENDIF # "$(APP2LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def .ENDIF @@ -534,7 +534,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2OBJS) \ $(APP2LIBS) \ $(APP2STDLIBS:^"-l") \ - $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") + $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") .ENDIF $(COMMAND_ECHO)$(APP2LINKER) -v \ $(APP2LINKFLAGS) \ @@ -550,7 +550,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2OBJS) \ $(APP2LIBS) \ $(APP2STDLIBS:^"-l") \ - $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") + $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") .IF "$(APP2TARGET)" == "loader" @@ -568,7 +568,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP3DEF = $(MISC)/$(APP3TARGET).def .ENDIF @@ -632,7 +632,7 @@ APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\" $(MISC)/$(APP3TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP3LIBS)"!="" +.ENDIF #"$(APP3LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP3TARGETN:b)_linkinc.ls @@ -643,10 +643,10 @@ $(APP3TARGETN) : $(LINKINCTARGETS) APP3LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") +_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") APP3IMP_ORD = $(foreach,i,$(_APP3IMP_ORD) $(shell @-ls $i)) .ELSE -APP3IMP_ORD = +APP3IMP_ORD = .ENDIF $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ @@ -662,7 +662,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \ `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_3.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \ @@ -800,7 +800,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc .ENDIF # "$(APP3LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def .ENDIF @@ -818,7 +818,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3OBJS) \ $(APP3LIBS) \ $(APP3STDLIBS:^"-l") \ - $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") + $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") .ENDIF $(COMMAND_ECHO)$(APP3LINKER) -v \ $(APP3LINKFLAGS) \ @@ -834,7 +834,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3OBJS) \ $(APP3LIBS) \ $(APP3STDLIBS:^"-l") \ - $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") + $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") .IF "$(APP3TARGET)" == "loader" @@ -852,7 +852,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP4DEF = $(MISC)/$(APP4TARGET).def .ENDIF @@ -916,7 +916,7 @@ APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\" $(MISC)/$(APP4TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP4LIBS)"!="" +.ENDIF #"$(APP4LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP4TARGETN:b)_linkinc.ls @@ -927,10 +927,10 @@ $(APP4TARGETN) : $(LINKINCTARGETS) APP4LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") +_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") APP4IMP_ORD = $(foreach,i,$(_APP4IMP_ORD) $(shell @-ls $i)) .ELSE -APP4IMP_ORD = +APP4IMP_ORD = .ENDIF $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ @@ -946,7 +946,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \ `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_4.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \ @@ -1084,7 +1084,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc .ENDIF # "$(APP4LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def .ENDIF @@ -1102,7 +1102,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4OBJS) \ $(APP4LIBS) \ $(APP4STDLIBS:^"-l") \ - $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") + $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") .ENDIF $(COMMAND_ECHO)$(APP4LINKER) -v \ $(APP4LINKFLAGS) \ @@ -1118,7 +1118,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4OBJS) \ $(APP4LIBS) \ $(APP4STDLIBS:^"-l") \ - $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") + $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") .IF "$(APP4TARGET)" == "loader" @@ -1136,7 +1136,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP5DEF = $(MISC)/$(APP5TARGET).def .ENDIF @@ -1200,7 +1200,7 @@ APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\" $(MISC)/$(APP5TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP5LIBS)"!="" +.ENDIF #"$(APP5LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP5TARGETN:b)_linkinc.ls @@ -1211,10 +1211,10 @@ $(APP5TARGETN) : $(LINKINCTARGETS) APP5LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") +_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") APP5IMP_ORD = $(foreach,i,$(_APP5IMP_ORD) $(shell @-ls $i)) .ELSE -APP5IMP_ORD = +APP5IMP_ORD = .ENDIF $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ @@ -1230,7 +1230,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \ `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_5.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \ @@ -1368,7 +1368,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc .ENDIF # "$(APP5LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def .ENDIF @@ -1386,7 +1386,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5OBJS) \ $(APP5LIBS) \ $(APP5STDLIBS:^"-l") \ - $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") + $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") .ENDIF $(COMMAND_ECHO)$(APP5LINKER) -v \ $(APP5LINKFLAGS) \ @@ -1402,7 +1402,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5OBJS) \ $(APP5LIBS) \ $(APP5STDLIBS:^"-l") \ - $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") + $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") .IF "$(APP5TARGET)" == "loader" @@ -1420,7 +1420,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP6DEF = $(MISC)/$(APP6TARGET).def .ENDIF @@ -1484,7 +1484,7 @@ APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\" $(MISC)/$(APP6TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP6LIBS)"!="" +.ENDIF #"$(APP6LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP6TARGETN:b)_linkinc.ls @@ -1495,10 +1495,10 @@ $(APP6TARGETN) : $(LINKINCTARGETS) APP6LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") +_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") APP6IMP_ORD = $(foreach,i,$(_APP6IMP_ORD) $(shell @-ls $i)) .ELSE -APP6IMP_ORD = +APP6IMP_ORD = .ENDIF $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ @@ -1514,7 +1514,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \ `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_6.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \ @@ -1652,7 +1652,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc .ENDIF # "$(APP6LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def .ENDIF @@ -1670,7 +1670,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6OBJS) \ $(APP6LIBS) \ $(APP6STDLIBS:^"-l") \ - $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") + $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") .ENDIF $(COMMAND_ECHO)$(APP6LINKER) -v \ $(APP6LINKFLAGS) \ @@ -1686,7 +1686,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6OBJS) \ $(APP6LIBS) \ $(APP6STDLIBS:^"-l") \ - $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") + $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") .IF "$(APP6TARGET)" == "loader" @@ -1704,7 +1704,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP7DEF = $(MISC)/$(APP7TARGET).def .ENDIF @@ -1768,7 +1768,7 @@ APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\" $(MISC)/$(APP7TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP7LIBS)"!="" +.ENDIF #"$(APP7LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP7TARGETN:b)_linkinc.ls @@ -1779,10 +1779,10 @@ $(APP7TARGETN) : $(LINKINCTARGETS) APP7LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") +_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") APP7IMP_ORD = $(foreach,i,$(_APP7IMP_ORD) $(shell @-ls $i)) .ELSE -APP7IMP_ORD = +APP7IMP_ORD = .ENDIF $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ @@ -1798,7 +1798,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \ `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_7.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \ @@ -1936,7 +1936,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc .ENDIF # "$(APP7LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def .ENDIF @@ -1954,7 +1954,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7OBJS) \ $(APP7LIBS) \ $(APP7STDLIBS:^"-l") \ - $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") + $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") .ENDIF $(COMMAND_ECHO)$(APP7LINKER) -v \ $(APP7LINKFLAGS) \ @@ -1970,7 +1970,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7OBJS) \ $(APP7LIBS) \ $(APP7STDLIBS:^"-l") \ - $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") + $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") .IF "$(APP7TARGET)" == "loader" @@ -1988,7 +1988,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP8DEF = $(MISC)/$(APP8TARGET).def .ENDIF @@ -2052,7 +2052,7 @@ APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\" $(MISC)/$(APP8TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP8LIBS)"!="" +.ENDIF #"$(APP8LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP8TARGETN:b)_linkinc.ls @@ -2063,10 +2063,10 @@ $(APP8TARGETN) : $(LINKINCTARGETS) APP8LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") +_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") APP8IMP_ORD = $(foreach,i,$(_APP8IMP_ORD) $(shell @-ls $i)) .ELSE -APP8IMP_ORD = +APP8IMP_ORD = .ENDIF $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ @@ -2082,7 +2082,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \ `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_8.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \ @@ -2220,7 +2220,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc .ENDIF # "$(APP8LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def .ENDIF @@ -2238,7 +2238,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8OBJS) \ $(APP8LIBS) \ $(APP8STDLIBS:^"-l") \ - $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") + $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") .ENDIF $(COMMAND_ECHO)$(APP8LINKER) -v \ $(APP8LINKFLAGS) \ @@ -2254,7 +2254,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8OBJS) \ $(APP8LIBS) \ $(APP8STDLIBS:^"-l") \ - $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") + $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") .IF "$(APP8TARGET)" == "loader" @@ -2272,7 +2272,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP9DEF = $(MISC)/$(APP9TARGET).def .ENDIF @@ -2336,7 +2336,7 @@ APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\" $(MISC)/$(APP9TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP9LIBS)"!="" +.ENDIF #"$(APP9LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP9TARGETN:b)_linkinc.ls @@ -2347,10 +2347,10 @@ $(APP9TARGETN) : $(LINKINCTARGETS) APP9LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") +_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") APP9IMP_ORD = $(foreach,i,$(_APP9IMP_ORD) $(shell @-ls $i)) .ELSE -APP9IMP_ORD = +APP9IMP_ORD = .ENDIF $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ @@ -2366,7 +2366,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \ `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_9.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \ @@ -2504,7 +2504,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc .ENDIF # "$(APP9LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def .ENDIF @@ -2522,7 +2522,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9OBJS) \ $(APP9LIBS) \ $(APP9STDLIBS:^"-l") \ - $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") + $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") .ENDIF $(COMMAND_ECHO)$(APP9LINKER) -v \ $(APP9LINKFLAGS) \ @@ -2538,7 +2538,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9OBJS) \ $(APP9LIBS) \ $(APP9STDLIBS:^"-l") \ - $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") + $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") .IF "$(APP9TARGET)" == "loader" @@ -2556,7 +2556,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" +.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" APP10DEF = $(MISC)/$(APP10TARGET).def .ENDIF @@ -2620,7 +2620,7 @@ APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\" $(MISC)/$(APP10TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@ -.ENDIF #"$(APP10LIBS)"!="" +.ENDIF #"$(APP10LIBS)"!="" .ENDIF LINKINCTARGETS+=$(MISC)/$(APP10TARGETN:b)_linkinc.ls @@ -2631,10 +2631,10 @@ $(APP10TARGETN) : $(LINKINCTARGETS) APP10LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") +_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") APP10IMP_ORD = $(foreach,i,$(_APP10IMP_ORD) $(shell @-ls $i)) .ELSE -APP10IMP_ORD = +APP10IMP_ORD = .ENDIF $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ @@ -2650,7 +2650,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \ `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ $(APP10LINKTYPEFLAG) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_10.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \ @@ -2788,7 +2788,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc .ENDIF # "$(APP10LINKRES)" != "" -.IF "$(TARGETTYPE)" == "GUI" +.IF "$(TARGETTYPE)" == "GUI" @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def .ENDIF @@ -2806,7 +2806,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10OBJS) \ $(APP10LIBS) \ $(APP10STDLIBS:^"-l") \ - $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") + $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") .ENDIF $(COMMAND_ECHO)$(APP10LINKER) -v \ $(APP10LINKFLAGS) \ @@ -2822,7 +2822,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10OBJS) \ $(APP10LIBS) \ $(APP10STDLIBS:^"-l") \ - $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") + $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") .IF "$(APP10TARGET)" == "loader" diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 3c4662e070f1..56a187abcce4 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -245,10 +245,10 @@ SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") +_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") SHL1IMP_ORD = $(foreach,i,$(_SHL1IMP_ORD) $(shell @-ls $i)) .ELSE -SHL1IMP_ORD = +SHL1IMP_ORD = .ENDIF @@ -429,7 +429,7 @@ $(SHL1TARGETN) : \ @echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ $(SHL1VERSIONOBJ) \ `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \ @@ -511,7 +511,7 @@ $(SHL1TARGETN) : \ $(SHL1LIBS) \ $(SHL1STDLIBS:^"-l") \ $(SHL1LINKRES) \ - $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") + $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -797,10 +797,10 @@ SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") +_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") SHL2IMP_ORD = $(foreach,i,$(_SHL2IMP_ORD) $(shell @-ls $i)) .ELSE -SHL2IMP_ORD = +SHL2IMP_ORD = .ENDIF @@ -981,7 +981,7 @@ $(SHL2TARGETN) : \ @echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ $(SHL2VERSIONOBJ) \ `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \ @@ -1063,7 +1063,7 @@ $(SHL2TARGETN) : \ $(SHL2LIBS) \ $(SHL2STDLIBS:^"-l") \ $(SHL2LINKRES) \ - $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") + $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -1349,10 +1349,10 @@ SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") +_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") SHL3IMP_ORD = $(foreach,i,$(_SHL3IMP_ORD) $(shell @-ls $i)) .ELSE -SHL3IMP_ORD = +SHL3IMP_ORD = .ENDIF @@ -1533,7 +1533,7 @@ $(SHL3TARGETN) : \ @echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ $(SHL3VERSIONOBJ) \ `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \ @@ -1615,7 +1615,7 @@ $(SHL3TARGETN) : \ $(SHL3LIBS) \ $(SHL3STDLIBS:^"-l") \ $(SHL3LINKRES) \ - $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") + $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -1901,10 +1901,10 @@ SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") +_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") SHL4IMP_ORD = $(foreach,i,$(_SHL4IMP_ORD) $(shell @-ls $i)) .ELSE -SHL4IMP_ORD = +SHL4IMP_ORD = .ENDIF @@ -2085,7 +2085,7 @@ $(SHL4TARGETN) : \ @echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ $(SHL4VERSIONOBJ) \ `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \ @@ -2167,7 +2167,7 @@ $(SHL4TARGETN) : \ $(SHL4LIBS) \ $(SHL4STDLIBS:^"-l") \ $(SHL4LINKRES) \ - $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") + $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -2453,10 +2453,10 @@ SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") +_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") SHL5IMP_ORD = $(foreach,i,$(_SHL5IMP_ORD) $(shell @-ls $i)) .ELSE -SHL5IMP_ORD = +SHL5IMP_ORD = .ENDIF @@ -2637,7 +2637,7 @@ $(SHL5TARGETN) : \ @echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ $(SHL5VERSIONOBJ) \ `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \ @@ -2719,7 +2719,7 @@ $(SHL5TARGETN) : \ $(SHL5LIBS) \ $(SHL5STDLIBS:^"-l") \ $(SHL5LINKRES) \ - $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") + $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -3005,10 +3005,10 @@ SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") +_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") SHL6IMP_ORD = $(foreach,i,$(_SHL6IMP_ORD) $(shell @-ls $i)) .ELSE -SHL6IMP_ORD = +SHL6IMP_ORD = .ENDIF @@ -3189,7 +3189,7 @@ $(SHL6TARGETN) : \ @echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ $(SHL6VERSIONOBJ) \ `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \ @@ -3271,7 +3271,7 @@ $(SHL6TARGETN) : \ $(SHL6LIBS) \ $(SHL6STDLIBS:^"-l") \ $(SHL6LINKRES) \ - $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") + $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -3557,10 +3557,10 @@ SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") +_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") SHL7IMP_ORD = $(foreach,i,$(_SHL7IMP_ORD) $(shell @-ls $i)) .ELSE -SHL7IMP_ORD = +SHL7IMP_ORD = .ENDIF @@ -3741,7 +3741,7 @@ $(SHL7TARGETN) : \ @echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ $(SHL7VERSIONOBJ) \ `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \ @@ -3823,7 +3823,7 @@ $(SHL7TARGETN) : \ $(SHL7LIBS) \ $(SHL7STDLIBS:^"-l") \ $(SHL7LINKRES) \ - $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") + $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -4109,10 +4109,10 @@ SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") +_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") SHL8IMP_ORD = $(foreach,i,$(_SHL8IMP_ORD) $(shell @-ls $i)) .ELSE -SHL8IMP_ORD = +SHL8IMP_ORD = .ENDIF @@ -4293,7 +4293,7 @@ $(SHL8TARGETN) : \ @echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ $(SHL8VERSIONOBJ) \ `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \ @@ -4375,7 +4375,7 @@ $(SHL8TARGETN) : \ $(SHL8LIBS) \ $(SHL8STDLIBS:^"-l") \ $(SHL8LINKRES) \ - $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") + $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -4661,10 +4661,10 @@ SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") +_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") SHL9IMP_ORD = $(foreach,i,$(_SHL9IMP_ORD) $(shell @-ls $i)) .ELSE -SHL9IMP_ORD = +SHL9IMP_ORD = .ENDIF @@ -4845,7 +4845,7 @@ $(SHL9TARGETN) : \ @echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ $(SHL9VERSIONOBJ) \ `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \ @@ -4927,7 +4927,7 @@ $(SHL9TARGETN) : \ $(SHL9LIBS) \ $(SHL9STDLIBS:^"-l") \ $(SHL9LINKRES) \ - $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") + $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") .ELSE # "$(USE_DEFFILE)"!="" @@ -5213,10 +5213,10 @@ SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") +_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") SHL10IMP_ORD = $(foreach,i,$(_SHL10IMP_ORD) $(shell @-ls $i)) .ELSE -SHL10IMP_ORD = +SHL10IMP_ORD = .ENDIF @@ -5397,7 +5397,7 @@ $(SHL10TARGETN) : \ @echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ $(SHL10VERSIONOBJ) \ `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list - @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + @/bin/echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \ @@ -5479,7 +5479,7 @@ $(SHL10TARGETN) : \ $(SHL10LIBS) \ $(SHL10STDLIBS:^"-l") \ $(SHL10LINKRES) \ - $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") + $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") .ELSE # "$(USE_DEFFILE)"!="" diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index 2d182a66a437..1ffa7fd39123 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -65,13 +65,13 @@ $(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minor @cat $(DMAKEROOT)/../ant.properties >> $@ ANTBUILD .PHONY: - $(ANT) $(ANT_FLAGS) + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) clean .PHONY: - $(ANT) $(ANT_FLAGS) $@ + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ prepare .PHONY: - $(ANT) $(ANT_FLAGS) $@ + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ main: .PHONY: $(ANT) $(ANT_FLAGS) $@ @@ -80,21 +80,19 @@ info: .PHONY $(ANT) $(ANT_FLAGS) $@ jar .PHONY: - $(ANT) $(ANT_FLAGS) $@ + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ compile .PHONY: - $(ANT) $(ANT_FLAGS) $@ + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ depend .PHONY: - $(ANT) $(ANT_FLAGS) $@ + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ javadoc .PHONY: - $(ANT) $(ANT_FLAGS) $@ + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ config .PHONY: - $(ANT) $(ANT_FLAGS) $@ + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ test .PHONY: - $(ANT) $(ANT_FLAGS) $@ - - + $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@ diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk index a06d7c90d6eb..fda4a82896ab 100644 --- a/solenv/inc/antsettings.mk +++ b/solenv/inc/antsettings.mk @@ -68,6 +68,12 @@ ANT_OPT=on .ENDIF .ENDIF +.IF "$(VERBOSE)" == "TRUE" + ANT_VERBOSE=-v +.ELSE + ANT_VERBOSE=-q +.ENDIF + .IF "$(JDK)"=="gcj" JAVA_HOME= .EXPORT : JAVA_HOME @@ -78,7 +84,8 @@ ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_V -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \ -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \ -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \ - -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs + -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \ + -emacs $(ANT_VERBOSE) .ELSE # No java ANT= ANT_FLAGS= diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg new file mode 100644 index 000000000000..36be3c27ba05 --- /dev/null +++ b/solenv/inc/doxygen.cfg @@ -0,0 +1,1314 @@ +# Doxyfile 1.5.3 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "$(DOXYGEN_PROJECTNAME) ($(DOXYGEN_VERSION)) " + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 1 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = $(DOXYGEN_OUTPUT) + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# will output the detailed description near the top, like JavaDoc. +# If set to NO, the detailed description appears after the member +# documentation. + +DETAILS_AT_TOP = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = "tpl=\par Template parameter: \n" "since=\par Available since: \n" "derive=\par Derive: \n" "attention=\par Attention: \n" +# precond throws see path todo(own section, can enable!) + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous +# namespace. By default anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = NO + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = NO + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = NO + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = NO + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = $(DOXYGEN_INPUT) + +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# See http://www.gnu.org/software/libiconv for the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce +# a warning and turn it on anyway + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentstion. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 1 + +# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = $(DOXYGEN_INCLUDE_PATH) + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = LINUX \ + UNX \ + VCL \ + GCC \ + C341 \ + X86_64 \ + _STLP_DEBUG \ + VER=C341 \ + NPTL \ + GLIBC=2 \ + NEW_SOLAR \ + _USE_NAMESPACE=1 \ + UNIX \ + SUPD=300 \ + DEBUG \ + DBG_UTIL \ + OSL_DEBUG_LEVEL=2 \ + CUI \ + SOLAR_JAVA \ + EXCEPTIONS_ON + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = $(DOXYGEN_REF_TAGFILES) + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = $(DOXYGEN_OUR_TAGFILE) + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# be found in the default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = NO + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 13a109572224..6ff3e24a4032 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -115,7 +115,6 @@ RMCXTLIB=-lrmcxt .ENDIF # "$(GUI)$(COM)"=="WNTGCC" BTSTRPLIB=-lbtstrp BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX) -SOLDEPLIB=-lsoldep$(DLLPOSTFIX) TRANSEXLIB=-ltransex OTXLIB=-lotx_ind OSXLIB=-losx @@ -238,7 +237,6 @@ BERKELEYLIB=-ldb-4.7 CURLLIB=-lcurl SFX2LIB=-lsfx$(DLLPOSTFIX) SFXLIB=-lsfx$(DLLPOSTFIX) -EGGTRAYLIB=-leggtray$(DLLPOSTFIX) SFXDEBUGLIB= FWELIB=-lfwe$(DLLPOSTFIX) FWILIB=-lfwi$(DLLPOSTFIX) @@ -414,7 +412,6 @@ FWELIB=ifwe.lib FWILIB=ifwi.lib BTSTRPLIB=btstrp.lib BTSTRPDTLIB=bootstrpdt.lib -SOLDEPLIB=soldep.lib TRANSEXLIB=transex.lib ICOLIB=icom.lib SVTOOLLIB=svtool.lib @@ -440,7 +437,6 @@ DOCMGRLIB=docmgr.lib BASICLIB=basic.lib VBAHELPERLIB=vbahelper.lib TKTLIB=tkt.lib -SJLIB=sj.lib SVXCORELIB=isvxcore.lib MSFILTERLIB=imsfilter.lib SVXLIB=isvx.lib diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk index 46dcba24aaa1..ec4d3410e652 100644 --- a/solenv/inc/os2gcci.mk +++ b/solenv/inc/os2gcci.mk @@ -128,7 +128,7 @@ CFLAGSOUTOBJ=-o # (this_type(p).swap(*this)) # - truncwarn: "conversion of 64 bit type value to smaller type causes # truncation" at least with CC 5.8 is reported only at the end of a -# compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see +# compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see # sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be # disabled globally CFLAGSWARNCC= diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 7ad8fd19f33f..a2797d2aee82 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -637,7 +637,7 @@ $(MISC)/%.dpj : $(SLO)/%.obj : %.asm @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(COM)"=="GCC" -.IF "$(ASM)"=="ml" +.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @@-$(RM) $*.err .ELSE # "$(ASM)"=="ml" @@ -650,7 +650,7 @@ $(SLO)/%.obj : %.asm @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE .IF "$(COM)"=="MSC" -.IF "$(ASM)"=="ml" +.IF "$(ASM)"=="ml" || "$(ASM)"=="ml64" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE # "$(ASM)"=="ml" diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 412fb3bd2821..e14c94de5719 100644..100755 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -142,7 +142,6 @@ MSILIB_X64=$(LIBPATH_X64)/msi.lib DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib -UNICOWSLIB_X64=$(LIBPATH_X64)/unicows.lib WININETLIB_X64=$(LIBPATH_X64)/wininet.lib OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 40e2c79d6020..2d39af7319e7 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -386,10 +386,6 @@ COMPILER_WARN_ALL=TRUE COMPILER_WARN_ERRORS=TRUE .ENDIF -.IF "$(RSC_ONCE)"!="" -rsc_once*=$(RSC_ONCE) -.ENDIF - .IF "$(COMMON_BUILD)"!="" common_build*=$(COMMON_BUILD) .ENDIF @@ -463,7 +459,7 @@ product=full .ENDIF .IF "$(debug)"!="" -DBG_LEVEL*=2 +DBG_LEVEL*=1 .ENDIF # Produkt auf einen Wert setzen (alles klein) @@ -967,10 +963,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc VERBOSITY=-verbose .ELSE COMMAND_ECHO=@ - .IF "$(VERBOSE)" == "FALSE" - VERBOSITY=-quiet - ZIP_VERBOSITY=-q - .ENDIF + VERBOSITY=-quiet + ZIP_VERBOSITY=-q .ENDIF # "$(VERBOSE)" == "TRUE" COMPILE_ECHO_SWITCH= COMPILE_ECHO_FILE=$(<:f) @@ -1032,27 +1026,24 @@ AUGMENT_LIBRARY_PATH_LOCAL = : && \ $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN)) .END -# remove if .Net 2003 support has expired -.IF "$(debug)"!="" -.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI" -.IF "$(COMEX)" == "10" -.IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)"!="" -MAXPROCESS!:=1 -.EXPORT : MAXPROCESS -.ENDIF # "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)"!="" -.ENDIF # "$(COMEX)" == "10" -.ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI" -.ENDIF # "$(debug)"!="" - # for multiprocess building in external modules # allow seperate handling EXTMAXPROCESS*=$(MAXPROCESS) GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args +#use with export VALGRIND=memcheck, that method of invocation is used because +#hunspell will aslo run its own unit tests under valgrind when this variable is +#set. +.IF "$(VALGRIND)" != "" +VALGRINDTOOL=valgrind --tool=$(VALGRIND) --leak-check=yes +G_SLICE*:=always-malloc +.EXPORT : G_SLICE +.ENDIF + IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc -REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge -REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare +REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regmerge +REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regcompare .IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != "" GDBREGCOMPTRACE=$(GDBTRACE) @@ -1068,7 +1059,7 @@ CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker GDBCPPUNITTRACE=$(GDBTRACE) .ENDIF -CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(SOLARBINDIR)/cppunittester +CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(SOLARBINDIR)/cppunittester HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker @@ -1249,11 +1240,13 @@ CDEFS+=$(JAVADEF) # .mk file for that platform should set COMPILER_WARN_ERRORS=TRUE and no longer # set MODULES_WITH_WARNINGS, and once no platform sets MODULES_WITH_WARNINGS any # longer, this code can go away: -.IF "$(MODULES_WITH_WARNINGS)" != "" +.IF "$(MODULES_WITH_WARNINGS)" == "" +COMPILER_WARN_ERRORS=TRUE +.ELSE MODULES_WITH_WARNINGS_1 := $(foreach,i,$(MODULES_WITH_WARNINGS) .$(i).) MODULES_WITH_WARNINGS_2 := $(subst,.$(PRJNAME)., $(MODULES_WITH_WARNINGS_1)) .IF "$(MODULES_WITH_WARNINGS_1)" == "$(MODULES_WITH_WARNINGS_2)" -COMPILER_WARN_ERRORS = TRUE +COMPILER_WARN_ERRORS=TRUE .ENDIF .ENDIF diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk index c68ae5af430e..a9fc9202ea2c 100644 --- a/solenv/inc/tg_compv.mk +++ b/solenv/inc/tg_compv.mk @@ -68,9 +68,11 @@ CCVER:=$(shell @-$(CXX) $(CFLAGSVERSION_CMD)) CCNUMVER:=$(shell @-$(CXX) $(CFLAGSNUMVERSION_CMD)) .IF "$(COM)"=="MSC" -.IF "$(CCNUMVER)">="001200000000" COMID=MSC +.IF "$(CPU)"=="I" COMNAME=msci +.ELSE +COMNAME=mscx .ENDIF .ENDIF diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 07fca7b5e67b..c59b3e1f6530 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -110,9 +110,9 @@ clean: $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @@ -120,28 +120,28 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar @-$(RM) $@ - @noop $(assign UNPACKCMD := $(GNUTAR) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar) + @noop $(assign UNPACKCMD := $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @@ -169,8 +169,8 @@ $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE @$(TOUCH) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR).exists # $(IFEXIST) only works with files $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) @echo make writeable... - @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE) - @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \; + @-cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE) + @-cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -print0 | xargs -0 chmod a+x #add new files to patch $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy") diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index d1109ec4e8f1..6faf113aeaa5 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -26,7 +26,7 @@ #************************************************************************* -.IF "$(VERBOSE)"=="FALSE" +.IF "$(VERBOSE)"!="TRUE" ZIP_VERBOSITY=-q .ENDIF @@ -57,7 +57,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) @@-$(RM) $@ $(COMMAND_ECHO)echo Manifest-Version: 1.0 > $@ .IF "$(JARCLASSPATH)" != "" - echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@ + $(COMMAND_ECHO)echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@ .ENDIF # $(RSCREVISION) contains chars that must be quoted (for *NIX shells) $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@ diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk index 5c00f2bbf7f5..1f6a50347b79 100644 --- a/solenv/inc/tg_java.mk +++ b/solenv/inc/tg_java.mk @@ -53,23 +53,23 @@ $(CLASSDIR)/%.class .NOINFER .IGNORE : %.java $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) .IF "$(JAVARESPONSE)"!="" - $(JAVAC) @<< + $(COMMAND_ECHO)$(JAVAC) @<< $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) <<keep .ELSE # "$(JAVARESPONSE)"!="" .IF "$(use_jdep)"!="" - $(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) + $(COMMAND_ECHO)$(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) .ELSE # "$(use_jdep)"!="" .IF "$(javauno)"!="" .IF "$(JAVAFILES:d)"=="" - $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) + $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) .ELSE # "$(JAVAFILES:d)"=="" @@$(TOUCH) $(INPATH)_$(VCSID)_a_dummy.java - $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java")) + $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java")) @@-$(RM) $(INPATH)_$(VCSID)_a_dummy.java .ENDIF # "$(JAVAFILES:d)"=="" .ELSE # "$(javauno)"!="" - $(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES))) + $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES))) .ENDIF # "$(javauno)"!="" .ENDIF # "$(use_jdep)"!="" .ENDIF # "$(JAVARESPONSE)"!="" diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index a40d48a81c66..19f44cb828af 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -31,36 +31,27 @@ MKFILENAME:=tg_merge.mk .IF "$(WITH_LANG)"!="" .IF "$(ULFFILES)"!="" -$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" +$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) +.ENDIF # *.xrb merge .IF "$(XMLPROPERTIES)"!="" -$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" +$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) +.ENDIF # *.xrm merge .IF "$(READMEFILES)"!="" -$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" +$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) +.ENDIF -# *.xrm merge -#.IF "$(APOCHELPFILES)"!="" -#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)/$(MYPATH)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) -#.ENDIF # "$(ULFFILES)"!="" # *.xcu merge .IF "$(LOCALIZEDFILES)"!="" $(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/merge/{$(subst,.,/ $(PACKAGE))}/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) -.ENDIF # "$(ULFFILES)"!="" -.ENDIF # "$(WITH_LANG)"!="" +.ENDIF +.ENDIF # "$(WITH_LANG)"!="" # dependencies from *.ulf to par-files .IF "$(ULFPARFILES)"!="" $(ULFPARFILES) : $(COMMONMISC)/$(TARGET)/$$(@:b).$(LANGFILEEXT) .ENDIF # "$(ULFPARFILES)"!="" -# *.xrm merge -#.IF "$(READMEFILES)"!="" -#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF) -#.ENDIF # "$(ULFFILES)"!="" - diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 7645a73c1908..311b6d15d6d4 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -139,6 +139,14 @@ .INCLUDE : unxbsdi2.mk .ENDIF +.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDI" +.INCLUDE : unxbsdi3.mk +.ENDIF + +.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDX" +.INCLUDE : unxbsdx3.mk +.ENDIF + .IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS" .INCLUDE : unxbsds.mk .ENDIF diff --git a/solenv/inc/unxbsdi3.mk b/solenv/inc/unxbsdi3.mk new file mode 100644 index 000000000000..c05996579487 --- /dev/null +++ b/solenv/inc/unxbsdi3.mk @@ -0,0 +1,178 @@ +# +# mk file for NetBSD/i386 with gcc 3.4.x and higher. +# + +ASM= +AFLAGS= + +SOLAR_JAVA*= +JAVAFLAGSDEBUG=-g + +# filter for supressing verbose messages from linker +#not needed at the moment +#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + +# _PTHREADS is needed for the stl +CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 + +# enable visibility define in "sal/types.h" +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE +.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + +# this is a platform with JAVA support +.IF "$(SOLAR_JAVA)"!="" +JAVADEF=-DSOLAR_JAVA +.IF "$(debug)"=="" +JAVA_RUNTIME=-ljava +.ELSE +JAVA_RUNTIME=-ljava_g +.ENDIF +.ENDIF + +# architecture dependent flags for the C and C++ compiler that can be changed by +# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build +ARCH_FLAGS*= + +# name of C++ Compiler +CXX*=g++ +# name of C Compiler +CC*=gcc +# flags for C and C++ Compiler +CFLAGS+=-fmessage-length=0 -c + +# Compiler flags for enabling optimizations +.IF "$(PRODUCT)"!="" +CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products +.ELSE # "$(PRODUCT)"!="" +CFLAGSOPT= # no optimizing for non products +.ENDIF # "$(PRODUCT)"!="" + +# flags to enable build with symbols; required for crashdump feature +.IF "$(ENABLE_SYMBOLS)"=="SMALL" +CFLAGSENABLESYMBOLS=-g1 +.ELSE +CFLAGSENABLESYMBOLS=-g +.ENDIF + +# flags for the C++ Compiler +CFLAGSCC= -pipe $(ARCH_FLAGS) +# Flags for enabling exception handling +CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +# Flags for disabling exception handling +CFLAGS_NO_EXCEPTIONS=-fno-exceptions + +CFLAGSCXX= -pipe $(ARCH_FLAGS) +PICSWITCH:=-fpic +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +CFLAGSCXX += -fvisibility-inlines-hidden +.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + +# Compiler flags for compiling static object in multi threaded environment with graphical user interface +CFLAGSOBJGUIMT= +# Compiler flags for compiling static object in multi threaded environment with character user interface +CFLAGSOBJCUIMT= +# Compiler flags for compiling shared object in multi threaded environment with graphical user interface +CFLAGSSLOGUIMT=$(PICSWITCH) +# Compiler flags for compiling shared object in multi threaded environment with character user interface +CFLAGSSLOCUIMT=$(PICSWITCH) +# Compiler flags for profiling +CFLAGSPROF= +# Compiler flags for debugging +CFLAGSDEBUG=-g +CFLAGSDBGUTIL= +# Compiler flags for enabling optimizations +# CFLAGSOPT=-O2 +# reduce to -O1 to avoid optimization problems +CFLAGSOPT=-O1 +# Compiler flags for disabling optimizations +CFLAGSNOOPT=-O0 +# Compiler flags for describing the output path +CFLAGSOUTOBJ=-o + +CFLAGSWARNCC= +CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy +# -Wshadow does not work for C with nested uses of pthread_cleanup_push: +CFLAGSWALLCC=-Wall -Wextra -Wendif-labels +CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy +CFLAGSWERRCC=-Werror + +# switches for dynamic and static linking +STATIC = -Wl,-Bstatic +DYNAMIC = -Wl,-Bdynamic + +# name of linker +LINK*=$(CXX) +LINKC*=$(CC) + +# default linker flags +LINKFLAGSDEFS*=-Wl,-z,defs +LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + +# linker flags for linking applications +LINKFLAGSAPPGUI= -Wl,-export-dynamic +LINKFLAGSAPPCUI= -Wl,-export-dynamic + +# linker flags for linking shared libraries +LINKFLAGSSHLGUI= -shared +LINKFLAGSSHLCUI= -shared + +LINKFLAGSTACK= +LINKFLAGSPROF= +LINKFLAGSDEBUG=-g +LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib + +# linker flags for optimization (symbol hashtable) +# for now, applied to symbol scoped libraries, only +LINKFLAGSOPTIMIZE*=-Wl,-O1 +LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script + +SONAME_SWITCH=-Wl,-h + +# Sequence of libs does matter ! + +STDLIBCPP=-lgcc_s -lstdc++ + +# default objectfilenames to link +STDOBJGUI= +STDSLOGUI= +STDOBJCUI= +STDSLOCUI= +STDOBJVCL=$(L)$/salmain.o + +# libraries for linking applications +STDLIBGUIMT=-lX11 -lm -lc -lgcc_s -lstdc++ -lpthread +STDLIBCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread +# libraries for linking shared libraries +STDSHLGUIMT=-lX11 -lXext -lm -lc -lgcc_s -lstdc++ -lpthread +STDSHLCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread + +LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive + +LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++ +LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) + +#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) + +# name of library manager +LIBMGR=ar +LIBFLAGS=-r + +# tool for generating import libraries +IMPLIB= +IMPLIBFLAGS= + +MAPSYM= +MAPSYMFLAGS= + +RC=irc +RCFLAGS=-fo$@ $(RCFILES) +RCLINK= +RCLINKFLAGS= +RCSETVERSION= + +# platform specific identifier for shared libs +DLLPOSTFIX=bi +DLLPRE=lib +DLLPOST=.so diff --git a/solenv/inc/unxbsdx3.mk b/solenv/inc/unxbsdx3.mk new file mode 100644 index 000000000000..069aa9100b38 --- /dev/null +++ b/solenv/inc/unxbsdx3.mk @@ -0,0 +1,178 @@ +# +# mk file for NetBSD/amd64 with gcc 3.4.x and higher. +# + +ASM= +AFLAGS= + +SOLAR_JAVA*= +JAVAFLAGSDEBUG=-g + +# filter for supressing verbose messages from linker +#not needed at the moment +#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + +# _PTHREADS is needed for the stl +CDEFS+= -DX86_64 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 + +# enable visibility define in "sal/types.h" +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE +.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + +# this is a platform with JAVA support +.IF "$(SOLAR_JAVA)"!="" +JAVADEF=-DSOLAR_JAVA +.IF "$(debug)"=="" +JAVA_RUNTIME=-ljava +.ELSE +JAVA_RUNTIME=-ljava_g +.ENDIF +.ENDIF + +# architecture dependent flags for the C and C++ compiler that can be changed by +# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build +ARCH_FLAGS*= + +# name of C++ Compiler +CXX*=g++ +# name of C Compiler +CC*=gcc +# flags for C and C++ Compiler +CFLAGS+=-fmessage-length=0 -c + +# Compiler flags for enabling optimizations +.IF "$(PRODUCT)"!="" +CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products +.ELSE # "$(PRODUCT)"!="" +CFLAGSOPT= # no optimizing for non products +.ENDIF # "$(PRODUCT)"!="" + +# flags to enable build with symbols; required for crashdump feature +.IF "$(ENABLE_SYMBOLS)"=="SMALL" +CFLAGSENABLESYMBOLS=-g1 +.ELSE +CFLAGSENABLESYMBOLS=-g +.ENDIF + +# flags for the C++ Compiler +CFLAGSCC= -pipe $(ARCH_FLAGS) +# Flags for enabling exception handling +CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +# Flags for disabling exception handling +CFLAGS_NO_EXCEPTIONS=-fno-exceptions + +CFLAGSCXX= -pipe $(ARCH_FLAGS) +PICSWITCH:=-fpic +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +CFLAGSCXX += -fvisibility-inlines-hidden +.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + +# Compiler flags for compiling static object in multi threaded environment with graphical user interface +CFLAGSOBJGUIMT= +# Compiler flags for compiling static object in multi threaded environment with character user interface +CFLAGSOBJCUIMT= +# Compiler flags for compiling shared object in multi threaded environment with graphical user interface +CFLAGSSLOGUIMT=$(PICSWITCH) +# Compiler flags for compiling shared object in multi threaded environment with character user interface +CFLAGSSLOCUIMT=$(PICSWITCH) +# Compiler flags for profiling +CFLAGSPROF= +# Compiler flags for debugging +CFLAGSDEBUG=-g +CFLAGSDBGUTIL= +# Compiler flags for enabling optimizations +# CFLAGSOPT=-O2 +# reduce to -O1 to avoid optimization problems +CFLAGSOPT=-O1 +# Compiler flags for disabling optimizations +CFLAGSNOOPT=-O0 +# Compiler flags for describing the output path +CFLAGSOUTOBJ=-o + +CFLAGSWARNCC= +CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy +# -Wshadow does not work for C with nested uses of pthread_cleanup_push: +CFLAGSWALLCC=-Wall -Wextra -Wendif-labels +CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy +CFLAGSWERRCC=-Werror + +# switches for dynamic and static linking +STATIC = -Wl,-Bstatic +DYNAMIC = -Wl,-Bdynamic + +# name of linker +LINK*=$(CXX) +LINKC*=$(CC) + +# default linker flags +LINKFLAGSDEFS*=-Wl,-z,defs +#LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) + +# linker flags for linking applications +LINKFLAGSAPPGUI= -Wl,-export-dynamic +LINKFLAGSAPPCUI= -Wl,-export-dynamic + +# linker flags for linking shared libraries +LINKFLAGSSHLGUI= -shared +LINKFLAGSSHLCUI= -shared + +LINKFLAGSTACK= +LINKFLAGSPROF= +LINKFLAGSDEBUG=-g +LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib + +# linker flags for optimization (symbol hashtable) +# for now, applied to symbol scoped libraries, only +LINKFLAGSOPTIMIZE*=-Wl,-O1 +LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script + +SONAME_SWITCH=-Wl,-h + +# Sequence of libs does matter ! + +STDLIBCPP=-lgcc_s -lstdc++ + +# default objectfilenames to link +STDOBJGUI= +STDSLOGUI= +STDOBJCUI= +STDSLOCUI= +STDOBJVCL=$(L)$/salmain.o + +# libraries for linking applications +STDLIBGUIMT=-lX11 -lm -lc -lgcc_s -lstdc++ -lpthread +STDLIBCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread +# libraries for linking shared libraries +STDSHLGUIMT=-lX11 -lXext -lm -lc -lgcc_s -lstdc++ -lpthread +STDSHLCUIMT=-lm -lc -lgcc_s -lstdc++ -lpthread + +LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive + +LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++ +LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) + +#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) + +# name of library manager +LIBMGR=ar +LIBFLAGS=-r + +# tool for generating import libraries +IMPLIB= +IMPLIBFLAGS= + +MAPSYM= +MAPSYMFLAGS= + +RC=irc +RCFLAGS=-fo$@ $(RCFILES) +RCLINK= +RCLINKFLAGS= +RCSETVERSION= + +# platform specific identifier for shared libs +DLLPOSTFIX=bx +DLLPRE=lib +DLLPOST=.so diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk index 4a22beaec256..9266d5d83e54 100644 --- a/solenv/inc/unxfbsd.mk +++ b/solenv/inc/unxfbsd.mk @@ -148,8 +148,8 @@ LINKFLAGSRUNPATH_NONE= LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) # linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec +LINKFLAGSAPPGUI= -Wl,-export-dynamic +LINKFLAGSAPPCUI= -Wl,-export-dynamic # linker flags for linking shared libraries LINKFLAGSSHLGUI= -shared diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index b54736ca0392..2261e25980f3 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -89,9 +89,12 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible CFLAGSCXX= -pipe $(ARCH_FLAGS) -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE" +CFLAGSCXX+=-fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +.IF "$(HAVE_CXX0X)" == "TRUE" +CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations +.ENDIF # "$(HAVE_CXX0X)" == "TRUE" CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch @@ -110,13 +113,13 @@ CFLAGSPROF= # Compiler flags for debugging CFLAGSDEBUG=-g CFLAGSDBGUTIL= -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk GCCNUMVER:=$(shell @-$(CXX) $(GCCNUMVERSION_CMD)) +# Compiler flags for enabling optimizations +.IF "$(PRODUCT)"!="" +CFLAGSOPT=$(CDEFAULTOPT) # optimizing for products .IF "$(USE_SYSTEM_STL)"!="YES" || "$(GCCNUMVER)" <= "000400050000" #STLPort headers are full of aliasing warnings and #At least SLED 10.2 gcc 4.3 overly agressively optimizes @@ -127,6 +130,7 @@ CFLAGSOPT+=-fno-strict-aliasing .ELSE # "$(PRODUCT)"!="" CFLAGSOPT= # no optimizing for non products .ENDIF # "$(PRODUCT)"!="" + # Compiler flags for disabling optimizations CFLAGSNOOPT=-O0 # Compiler flags for describing the output path @@ -144,8 +148,7 @@ CFLAGSWERRCC=-Werror # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): MODULES_WITH_WARNINGS := \ - lotuswordpro \ - soldep + lotuswordpro # switches for dynamic and static linking STATIC = -Wl,-Bstatic @@ -156,15 +159,26 @@ LINK*=$(CXX) LINKC*=$(CC) # default linker flags +# +# The DT RPATH value is used first, before any other path, specifically before +# the path defined in the LD_LIBRARY_PATH environment variable. This is +# problematic since it does not allow the user to overwrite the value. +# Therefore DT_RPATH is deprecated. The introduction of the new variant, +# DT_RUNPATH, corrects this oversight by requiring the value is used after the +# path in LD_LIBRARY_PATH. +# +# The linker option --enable-new-dtags must be used to also add DT_RUNPATH +# entry. This will cause both, DT_RPATH and DT_RUNPATH entries, to be created +# LINKFLAGSDEFS*=-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' +LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags +LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' +LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags +LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags +LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' +LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\',--enable-new-dtags LINKFLAGSRUNPATH_NONE= # flag -Wl,-z,noexecstack sets the NX bit on the stack LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) @@ -173,9 +187,9 @@ LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-l .ENDIF # linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ +LINKFLAGSAPPGUI= -Wl,-export-dynamic \ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR) -LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ +LINKFLAGSAPPCUI= -Wl,-export-dynamic \ -Wl,-rpath-link,$(LB):$(SOLARLIBDIR) # linker flags for linking shared libraries diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk index 9ac0c7e3daf1..fa5c4a52a35a 100644 --- a/solenv/inc/unxhpgr.mk +++ b/solenv/inc/unxhpgr.mk @@ -79,9 +79,9 @@ DYNAMIC = -Bdynamic LINK=ld LINKFLAGS=-L/nw386/dev/s/solenv/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.91.57/threads -L/nw386/dev/s/solenv/unxhpgr/lib/gcc-lib/hppa1.1-hp-hpux10.20/egcs-2.91.57 LINKFLAGSAPPGUI= /usr/lib/crt0.o -LINKFLAGSSHLGUI= -b -noinhibit-exec -Bsymbolic -G $(THREADLIB) +LINKFLAGSSHLGUI= -b -Bsymbolic -G $(THREADLIB) LINKFLAGSAPPCUI= /usr/lib/crt0.o -LINKFLAGSSHLCUI= -b -noinhibit-exec -warn-once -Bsymbolic -G +LINKFLAGSSHLCUI= -b -warn-once -Bsymbolic -G LINKFLAGSTACK= APPLINKSTATIC=-Bstatic APPLINKSHARED=-Bsymbolic diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk index d86aab185d0e..8c6c540e86bc 100644 --- a/solenv/inc/unxlngi.mk +++ b/solenv/inc/unxlngi.mk @@ -27,7 +27,11 @@ # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk CDEFAULTOPT=-Os +.IF "$(GCCNUMVER)" >= "000400050000" +ARCH_FLAGS*=-mtune=atom +.ELSE ARCH_FLAGS*=-mtune=pentiumpro +.ENDIF .INCLUDE : unxlng.mk CDEFS+=-DX86 DLLPOST=.so diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index b1778a0edfde..6d958a0b1a24 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -87,7 +87,7 @@ CFLAGSOUTOBJ=-o # (this_type(p).swap(*this)) # - truncwarn: "conversion of 64 bit type value to smaller type causes # truncation" at least with CC 5.8 is reported only at the end of a -# compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see +# compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see # sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be # disabled globally # - wnoretvalue: warning about the last statement of a function not @@ -106,8 +106,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index 4febb67d446a..37abd3d8ddce 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -93,7 +93,7 @@ CFLAGSOUTOBJ=-o # (this_type(p).swap(*this)) # - truncwarn: "conversion of 64 bit type value to smaller type causes # truncation" at least with CC 5.8 is reported only at the end of a -# compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see +# compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see # sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be # disabled globally # - wnoretvalue: warning about the last statement of a function not @@ -112,8 +112,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk index c73d6fc37283..406c211e82c1 100644 --- a/solenv/inc/unxsolu4.mk +++ b/solenv/inc/unxsolu4.mk @@ -92,7 +92,7 @@ CFLAGSOUTOBJ=-o # (this_type(p).swap(*this)) # - truncwarn: "conversion of 64 bit type value to smaller type causes # truncation" at least with CC 5.8 is reported only at the end of a -# compilation unit that uses std::hash_map<sal_Int64, sal_Int64> (see +# compilation unit that uses boost::unordered_map<sal_Int64, sal_Int64> (see # sfx2/source/toolbox/imgmgr.cxx:1.27) and thus unfortunately needs to be # disabled globally # - wnoretvalue: "The last statement should return a value." @@ -111,8 +111,7 @@ CFLAGSWERRCXX=-xwe # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := STDOBJVCL=$(L)/salmain.o diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index f369bd15ad30..8b65c5f393e3 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -30,14 +30,11 @@ # --- Compiler --- -.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI" -.IF "$(COMEX)" == "10" -.INCLUDE : wntmsci10.mk -.ELSE -# for wntmsci11 (.Net 2005) and wntmsci12 (.Net 2008) -.INCLUDE : wntmsci11.mk -.ENDIF # "$(COMEX)" == "10" -.ENDIF # "$(OS)$(COM)$(CPU)" == "WNTMSCI" +.IF "$(OS)$(COM)" == "WNTMSC" +# for wntmsci12, wntmscx12, wntmsci13 and wntmscx13 +# (MSVC 2008 and MSVC 2010, 32- and 64-bit) +.INCLUDE : wntmsc.mk +.ENDIF # "$(OS)$(COM)" == "WNTMSC" .IF "$(COM)$(OS)$(CPU)" == "GCCWNTI" .INCLUDE : wntgcci.mk diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index a6c7e67cfd9f..e6d73b45d466 100644..100755 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -98,7 +98,6 @@ MODULES_WITH_WARNINGS := \ extensions \ lingu \ r_tools \ - soldep \ starmath \ sw \ xmlsecurity @@ -210,7 +209,6 @@ MSILIB=$(PSDK_HOME)$/lib$/msi.lib DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib -UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib WININETLIB=-lwininet OLDNAMESLIB=-lmoldname MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsc.mk index 972feb0a8fdc..db65506ee665 100644 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsc.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -25,16 +25,18 @@ # #************************************************************************* -# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSCI11 and WNTMSCI12 +# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSC[IX]{12,13} -SOLAR_JAVA*=TRUE FULL_DESK=TRUE JAVAFLAGSDEBUG=-g -# SOLAR JAva Unterstuetzung nur fuer wntmsci - +.IF "$(CL_X64)" == "" ASM=ml AFLAGS=/c /Cp /coff /safeseh +.ELSE +ASM=ml64 +AFLAGS=/c /Cp +.ENDIF # architecture dependent flags for the C and C++ compiler that can be changed by # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build @@ -88,18 +90,16 @@ CFLAGS+=-GS CFLAGS+=-c -nologo -Gs $(NOLOGO) +.IF "$(CL_X64)" == "" CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS +.ELSE +CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS +.ENDIF .IF "$(product)" != "" CFLAGS+= -Gy .ENDIF # "$(product)" != "" -.IF "$(bndchk)" == "" -.IF "$(VC_STANDARD)"=="" -CFLAGS+= -Ob1 -.ENDIF # "$(VC_STANDARD)"=="" -.ENDIF - # flags to enable build with symbols; required for crashdump feature #CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB CFLAGSENABLESYMBOLS=-Z7 -Yd @@ -124,8 +124,10 @@ RSCDEFS+=-DFULL_DESK CFLAGSEXCEPTIONS=-EHa CFLAGS_NO_EXCEPTIONS= +.IF "$(CL_X64)" == "" # enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL +.ENDIF # with the current debug switches PCH won't work # anyway. so keep the existing .pch intact and don't @@ -220,8 +222,7 @@ CFLAGSWERRCC=-WX # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := \ - soldep +MODULES_WITH_WARNINGS := CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 .IF "$(COMEX)" == "11" @@ -230,7 +231,11 @@ _VC_MANIFEST_BASENAME=__VC80 _VC_MANIFEST_BASENAME=__VC90 .ENDIF +.IF "$(CL_X64)" == "" LINK=link /MACHINE:IX86 +.ELSE +LINK=link /MACHINE:X64 +.ENDIF # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with # a return value 1, which makes dmake think it failed LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:" @@ -240,7 +245,9 @@ LINKFLAGS=/MAP /OPT:NOREF .ENDIF # excetion handling protection +.IF "$(CL_X64)" == "" LINKFLAGS+=-safeseh +.ENDIF # enable DEP LINKFLAGS+=-nxcompat @@ -303,17 +310,37 @@ LIBCMT=libcmt.lib .ENDIF # "$(USE_STLP_DEBUG)" != "" .ENDIF # "$(DYNAMIC_CRT)"!="" +.IF "$(USE_SYSTEM_STL)"=="YES" +.IF "$(DYNAMIC_CRT)"!="" +.IF "$(USE_STLP_DEBUG)" != "" +LIBCPMT=msvcprtd.lib +.ELSE # "$(USE_STLP_DEBUG)" != "" +LIBCPMT=msvcprt.lib +.ENDIF # "$(USE_STLP_DEBUG)" != "" +.ELSE # "$(DYNAMIC_CRT)"!="" +.IF "$(USE_STLP_DEBUG)" != "" +LIBCPMT=libcpmtd.lib +CDEFS+=-D_DEBUG +.ELSE # "$(USE_STLP_DEBUG)" != "" +LIBCPMT=libcpmt.lib +.ENDIF # "$(USE_STLP_DEBUG)" != "" +.ENDIF # "$(DYNAMIC_CRT)"!="" +.ELSE # "$(USE_SYSTEM_STL)"=="YES" +LIBCPMT= +.ENDIF # "$(USE_SYSTEM_STL)"=="YES" + STDOBJVCL=$(L)/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib -STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib -STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib -STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib +STDLIBGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib +STDLIBCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib +STDSHLGUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib +STDSHLCUIMT=$(LIBCMT) $(LIBCPMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib +.IF "$(USE_SYSTEM_STL)"!="YES" .IF "$(USE_STLP_DEBUG)" != "" LIBSTLPORT=stlport_vc71_stldebug.lib LIBSTLPORTST=stlport_vc71_stldebug_static.lib @@ -321,24 +348,20 @@ LIBSTLPORTST=stlport_vc71_stldebug_static.lib LIBSTLPORT=stlport_vc71.lib LIBSTLPORTST=stlport_vc71_static.lib .ENDIF - -.IF "$(PROF_EDITION)" == "" -ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl -ATL_LIB*=$(COMPATH)/atlmfc/lib -MFC_INCLUDE*=$(COMPATH)/PlatformSDK/include/mfc -MFC_LIB*=$(COMPATH)/atlmfc/lib -.ELSE -ATL_INCLUDE*=$(COMPATH)/atlmfc/include -ATL_LIB*=$(COMPATH)/atlmfc/lib -MFC_INCLUDE*=$(COMPATH)/atlmfc/include -MFC_LIB*=$(COMPATH)/atlmfc/lib -.ENDIF +.ELSE # "$(USE_SYSTEM_STL)"!="YES" +LIBSTLPORT= +LIBSTLPORTST= +.ENDIF # "$(USE_SYSTEM_STL)"!="YES" LIBMGR=lib $(NOLOGO) IMPLIB=lib LIBFLAGS= +.IF "$(CL_X64)" == "" IMPLIBFLAGS=-machine:IX86 +.ELSE +IMPLIBFLAGS=-machine:X64 +.ENDIF MAPSYM= MAPSYMFLAGS= @@ -353,7 +376,11 @@ MT=mt.exe MTFLAGS=$(NOLOGO) +.IF "$(CL_X64)" == "" DLLPOSTFIX=mi +.ELSE +DLLPOSTFIX=mx +.ENDIF PCHPOST=.pch CSC*=$(FLIPCMD) csc @@ -383,9 +410,7 @@ MSILIB=msi.lib DDRAWLIB=ddraw.lib SHLWAPILIB=shlwapi.lib URLMONLIB=urlmon.lib -UNICOWSLIB=unicows.lib WININETLIB=wininet.lib OLDNAMESLIB=oldnames.lib MSIMG32LIB=msimg32.lib PROPSYSLIB=propsys.lib - diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk deleted file mode 100644 index 5c959f7d0e3c..000000000000 --- a/solenv/inc/wntmsci10.mk +++ /dev/null @@ -1,343 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# mk file for $(OS)$(COM)$(CPU)$(COMEX) == WNTMSCI10 - -SOLAR_JAVA*=TRUE -FULL_DESK=TRUE -JAVAFLAGSDEBUG=-g - -# SOLAR JAva Unterstuetzung nur fuer wntmsci - -ASM=ml -AFLAGS=/c /Cp /coff /safeseh - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*= - -CC*:=cl -.IF "$(bndchk)" != "" -CXX*=nmcl -.ELSE -.IF "$(truetime)" != "" -CXX*=nmcl /NMttOn -.ELSE -CXX*:=cl -.ENDIF -.ENDIF # "$(bndchk)" != "" - -.IF "$(stoponerror)" != "" -CXX+= /NMstoponerror -.ENDIF - -.IF "$(nmpass)" != "" -CXX+= /NMpass -.ENDIF - -.IF "$(ttinlines)" != "" -CXX+= /NMttInlines -.ENDIF - -.IF "$(ttnolines)" != "" -CXX+= /NMttNoLines -.ENDIF - -# Flags for COMEX == 10 - -CFLAGS+=-Zm500 -Zc:forScope -GR -CFLAGS+=-c -nologo -Gs $(NOLOGO) - -CDEFS+= -D_X86_=1 - -.IF "$(product)" != "" -CFLAGS+= -Gy -.ENDIF # "$(product)" != "" - -.IF "$(bndchk)" == "" -.IF "$(VC_STANDARD)"=="" -CFLAGS+= -Ob1 -.ENDIF # "$(VC_STANDARD)"=="" -.ENDIF - -# flags to enable build with symbols; required for crashdump feature -#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB -# full debug for RE builds only due to size concerns -.IF "$(UPDATER)"!="" -CFLAGSENABLESYMBOLS=-Z7 -Yd -.ELSE # "$(UPDATER)"!="" -# -Zd got higher priority and overrides debug switches -.IF "$(debug)"=="" -CFLAGSENABLESYMBOLS=-Zd -.ENDIF # "$(debug)"=="" -.ENDIF # "$(UPDATER)"!="" - -.IF "$(bndchk)" != "" -.IF "$(debug)" == "" -CFLAGS+= -Z7 -.ENDIF -.ENDIF - -.IF "$(truetime)" != "" -.IF "$(debug)" == "" -CFLAGS+= -Z7 -.ENDIF -.ENDIF - -.IF "$(FULL_DESK)"!="" -CDEFS+=-DFULL_DESK -RSCDEFS+=-DFULL_DESK -.ENDIF - -CFLAGSEXCEPTIONS=-GX -CFLAGS_NO_EXCEPTIONS= - -CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS -CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS -.IF "$(CALL_CDECL)"=="TRUE" -CFLAGSCALL=-Gd -.ELSE # "$(CALL_CDECL)"=="TRUE" -CFLAGSCALL=-Gz -.ENDIF # "$(CALL_CDECL)"=="TRUE" - -CFLAGSCC=$(ARCH_FLAGS) -.IF "$(DYNAMIC_CRT)"!="" -CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL -CDEFSSLOMT+=-DWIN32 -D_MT -D_DLL -.IF "$(NO_DYNAMIC_OBJ)"=="" -CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL -CDEFSOBJMT+=-DWIN32 -D_MT -D_DLL -.ELSE -CDEFSOBJMT+=-DWIN32 -D_MT -CDEFSOBJMT+=-DWIN32 -D_MT -.ENDIF -.ELSE -CDEFSSLOMT+=-DWIN32 -D_MT -CDEFSSLOMT+=-DWIN32 -D_MT -CDEFSOBJMT+=-DWIN32 -D_MT -CDEFSOBJMT+=-DWIN32 -D_MT -.ENDIF -CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb -CFLAGSDEBUG=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB -CFLAGSDBGUTIL= -.IF "$(VC_STANDARD)"=="" -CFLAGSOPT=-Oxs -Oy- -CFLAGSNOOPT=-Od -.ELSE # "$(VC_STANDARD)"=="" -CFLAGSOPT= -CFLAGSNOOPT= -.ENDIF # "$(VC_STANDARD)"=="" -CFLAGSOUTOBJ=-Fo - -# For C and C++, certain warnings are disabled globally, as they result in -# spurious warnings and are hard or impossible to workaround: -# - "warning C4061: enumerate in switch of enum is not explicitly handled by a -# case label", -# - "warning C4063: case 'identifier' is not a valid value for switch of enum -# 'enumeration'", -# - "warning C4127: conditional expression is constant", -# - "warning C4191: unsafe conversion from function type to function type", -# - "warning C4217: member template functions cannot be used for copy-assignment -# or copy-construction", -# - "warning C4250: 'class1' : inherits 'class2::member' via dominance", -# - "warning C4292: compiler limit : terminating debug information emission", -# - "warning C4344: behavior change: use of explicit template arguments results -# in call to 'function", -# - "warning C4347: behavior change: 'overload A' is called instead of -# 'overload B'", -# - "warning C4355: 'this' used in base member initializer list", -# - "warning C4503: 'identifier': decorated name length exceeded, name was -# truncated" (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx), -# - "warning C4511: copy constructor could not be generated", -# - "warning C4512: assignment operator could not be generated", -# - "warning C4514: unreferenced inline function has been removed", -# - "warning C4611: interaction between '_setjmp' and C++ object destruction is -# non-portable", -# - "warning C4619: warning Cnnnn unknown", -# - "warning C4625: copy constructor could not be generated because a base class -# copy constructor is inaccessible", -# - "warning C4626: assignment operator could not be generated because a base -# class assignment operator is inaccessible", -# - "warning C4675: resolved overload was found by argument-dependent lookup", -# - "warning C4686: possible change in behavior, change in UDT return calling -# convention", -# - "warning C4710: function not inlined", -# - "warning C4711: function selected for automatic inline expansion", -# - "warning C4820: padding added after member". -# For C, certain warnings from system headers (stdlib.h etc.) have to be -# disabled globally (for C++, this is not necessary, as the system headers are -# wrapped by STLport): -# - "warning C4255: no function prototype given: converting '()' to '(void)'". -CFLAGSWARNCXX=-Wall -wd4061 -wd4063 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 \ - -wd4275 -wd4290 -wd4292 -wd4294 -wd4344 -wd4347 -wd4355 -wd4503 -wd4511 \ - -wd4512 -wd4514 -wd4611 -wd4619 -wd4625 -wd4626 -wd4640 -wd4675 -wd4686 \ - -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255 -CFLAGSWALLCC=$(CFLAGSWARNCC) -CFLAGSWALLCXX=$(CFLAGSWARNCXX) -CFLAGSWERRCC=-WX - -# Once all modules on this platform compile without warnings, set -# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see -# settings.mk): -MODULES_WITH_WARNINGS := \ - lingucomponent \ - soldep - -CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 - -COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_" - -LINK=link $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86 -LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:" -.IF "$(PRODUCT)"!="full" -.ELSE -LINKFLAGS=/MAP /OPT:NOREF -.ENDIF - -.IF "$(linkinc)" != "" -LINKFLAGS=-NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv -INCREMENTAL:YES -MAPFILE= -.ELSE # "$(linkinc)" != "" -.IF "$(PRODUCT)"!="full" -LINKFLAGS+= -NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv -.ELSE # "$(PRODUCT)"!="full" -LINKFLAGS+= -NODEFAULTLIB -RELEASE -DEBUG:full -.ENDIF # "$(PRODUCT)"!="full" -MAPFILE=-out:$$@ -.ENDIF # "$(linkinc)" != "" - -.IF "$(bndchk)" != "" -LINK=nmlink $(COMMENTFLAG) $(NOLOGO) -MACHINE:IX86 -LINKFLAGS=-NODEFAULTLIB -DEBUG:full -DEBUGTYPE:cv -.ENDIF - -.IF "$(truetime)" != "" -LINK=nmlink /NMttOn $(COMMENTFLAG) $(NOLOGO) /MACHINE:IX86 -LINKFLAGS=/NODEFAULTLIB /DEBUG:full /DEBUGTYPE:cv -.ENDIF - -LINKFLAGSAPPGUI=/SUBSYSTEM:WINDOWS,4.0 -LINKFLAGSSHLGUI=/SUBSYSTEM:WINDOWS,4.0 /DLL -LINKFLAGSAPPCUI=/SUBSYSTEM:CONSOLE /BASE:0x1b000000 -LINKFLAGSSHLCUI=/SUBSYSTEM:CONSOLE /DLL -LINKFLAGSTACK=/STACK: -LINKFLAGSPROF=-DEBUG:mapped,partial -DEBUGTYPE:coff cap.lib -LINKFLAGSWST=-DEBUG:mapped,partial -DEBUGTYPE:coff wst.lib -NODEFAULTLIB -LINKFLAGSDEBUG=-DEBUG:full -DEBUGTYPE:cv -LINKFLAGSOPT= - -UWINAPILIB*=uwinapi.lib -.IF "$(DYNAMIC_CRT)"!="" -.IF "$(USE_STLP_DEBUG)" != "" -LIBCMT=msvcrtd.lib -.ELSE # "$(USE_STLP_DEBUG)" != "" -LIBCMT=msvcrt.lib -.ENDIF # "$(USE_STLP_DEBUG)" != "" -.ELSE # "$(DYNAMIC_CRT)"!="" -.IF "$(USE_STLP_DEBUG)" != "" -LIBCMT=libcmtd.lib -.ELSE # "$(USE_STLP_DEBUG)" != "" -LIBCMT=libcmt.lib -.ENDIF # "$(USE_STLP_DEBUG)" != "" -.ENDIF # "$(DYNAMIC_CRT)"!="" - -STDOBJVCL=$(L)/salmain.obj -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -STDLIBGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib -STDLIBCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib -STDSHLGUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib -STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib oldnames.lib psapi.lib - -.IF "$(USE_STLP_DEBUG)" != "" -CFLAGS+=-MTd -LIBSTLPORT=stlport_vc71_stldebug.lib -LIBSTLPORTST=stlport_vc71_stldebug_static.lib -.ELSE -LIBSTLPORT=stlport_vc71.lib -LIBSTLPORTST=stlport_vc71_static.lib -.ENDIF - -ATL_INCLUDE*=$(COMPATH)/atlmfc/include -ATL_LIB*=$(COMPATH)/atlmfc/lib - -LIBMGR=lib $(NOLOGO) -IMPLIB=lib -LIBFLAGS= - -IMPLIBFLAGS=-machine:IX86 - -MAPSYM= -MAPSYMFLAGS= - -RC=rc -RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES) -RCLINK=rc -RCLINKFLAGS= -RCSETVERSION= - - -DLLPOSTFIX=mi -PCHPOST=.pch - -CSC*=$(FLIPCMD) csc -VBC*=vbc - -ADVAPI32LIB=advapi32.lib -SHELL32LIB=shell32.lib -GDI32LIB=gdi32.lib -OLE32LIB=ole32.lib -OLEAUT32LIB=oleaut32.lib -UUIDLIB=uuid.lib -WINSPOOLLIB=winspool.lib -IMM32LIB=imm32.lib -VERSIONLIB=version.lib -WINMMLIB=winmm.lib -WSOCK32LIB=wsock32.lib -MPRLIB=mpr.lib -WS2_32LIB=ws2_32.lib -KERNEL32LIB=kernel32.lib -USER32LIB=user32.lib -COMDLG32LIB=comdlg32.lib -COMCTL32LIB=comctl32.lib -CRYPT32LIB=crypt32.lib -GDIPLUSLIB=gdiplus.lib -DBGHELPLIB=dbghelp.lib -MSILIB=msi.lib -DDRAWLIB=ddraw.lib -SHLWAPILIB=shlwapi.lib -URLMONLIB=urlmon.lib -UNICOWSLIB=unicows.lib -WININETLIB=wininet.lib -OLDNAMESLIB=oldnames.lib -MSIMG32LIB=msimg32.lib - |