diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 08:29:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 08:29:11 +0000 |
| commit | 0e3298739542d0046338a607d7006a12835b5c43 (patch) | |
| tree | f48f7a811574f68eb2456faf997c2ad9088e7980 /solenv/inc/target.mk | |
| parent | d0416c665c6078433a58c6e1ddc06803ea2dfe0b (diff) | |
INTEGRATION: CWS ause093 (1.207.2); FILE MERGED
2008/05/26 15:34:42 hjs 1.207.2.2: #i87286# - force MAXPROCESS=1 to avoid collisions with directory-wide debug files
2008/04/18 12:49:42 hjs 1.207.2.1: #i81628# - less warnings and cleanup
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 412127fdfcd2..2d228b56d79d 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -8,7 +8,7 @@ # # $RCSfile: target.mk,v $ # -# $Revision: 1.207 $ +# $Revision: 1.208 $ # # This file is part of OpenOffice.org. # @@ -112,6 +112,18 @@ DEPFILE_OBJ+:=$(MISC)$/all_$(TARGET).dpobj .IF "$(depend)" == "" +# 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)"!="" + # ------- # - ALL - # ------- @@ -733,7 +745,6 @@ UNOTYPES!:=$(strip $(UNOTYPES)) #moved here to get UNOTYPES from COMPxTYPELIST .IF "$(UNOTYPES)" != "" UNOUCRHEADER=$(foreach,j,$(subst,.,$/ $(UNOTYPES)) $(UNOUCROUT)$/$(j:+".hpp")) -UNOUCRTYPEFLAGS=$(foreach,j,$(UNOTYPES) $(UNOUCROUT)$/$(j:+".flag")) UNOUCRTARGET:=$(INCCOM)$/$(TARGET)_headergen.done .ENDIF # "$(UNOTYPES)" != "" @@ -1256,40 +1267,41 @@ CPPUMAKERFLAGS*=-L MKDEPFLAGS+=-I:$(ENVINCPRE) .ENDIF # "$(ENVINCPRE))"!="" .IF "$(OBJFILES)"!="" -$(OBJFILES) : $(UNOUCRHEADER) +$(OBJFILES) : $(UNOUCRTARGET) .ENDIF # "$(OBJFILES)"!="" .IF "$(SLOFILES)"!="" -$(SLOFILES) : $(UNOUCRHEADER) +$(SLOFILES) : $(UNOUCRTARGET) .ENDIF # "$(SLOFILES)"!="" .IF "$(DEPOBJFILES)"!="" -$(DEPOBJFILES) : $(UNOUCRHEADER) +$(DEPOBJFILES) : $(UNOUCRTARGET) .ENDIF # "$(SLOFILES)"!="" .IF "$(NOOPTTARGET)"!="" -$(NOOPTTARGET) : $(UNOUCRHEADER) +$(NOOPTTARGET) : $(UNOUCRTARGET) .ENDIF # "$(SLOFILES)"!="" .IF "$(NOOPTFILES)"!="" -$(NOOPTFILES) : $(UNOUCRHEADER) +$(NOOPTFILES) : $(UNOUCRTARGET) .ENDIF # "$(SLOFILES)"!="" .IF "$(EXCEPTIONSFILES)"!="" -$(EXCEPTIONSFILES) : $(UNOUCRHEADER) +$(EXCEPTIONSFILES) : $(UNOUCRTARGET) .ENDIF # "$(SLOFILES)"!="" .IF "$(EXCEPTIONSNOOPTTARGET)"!="" -$(EXCEPTIONSNOOPTTARGET) : $(UNOUCRHEADER) +$(EXCEPTIONSNOOPTTARGET) : $(UNOUCRTARGET) .ENDIF # "$(SLOFILES)"!="" .IF "$(EXCEPTIONSNOOPTFILES)"!="" -$(EXCEPTIONSNOOPTFILES) : $(UNOUCRHEADER) +$(EXCEPTIONSNOOPTFILES) : $(UNOUCRTARGET) .ENDIF # "$(SLOFILES)"!="" -$(UNOUCRHEADER) : $(UNOUCRTARGET) - -$(UNOUCROUT)$/%.flag : - @-$(MKDIRHIER) $(@:d) - @$(TOUCH) $@ +$(UNOUCRTARGET) : $(UNOUCRHEADER) -$(UNOUCRTARGET) : $(UNOUCRDEP) $(UNOUCRTYPEFLAGS) +# keep that one to rebuild single misses +$(UNOUCRHEADER): + @noop + +$(UNOUCRTARGET) : $(UNOUCRDEP) .IF "$(XML2MK_FILES)"!="" @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)$/$(i).mk) .ENDIF # "$(XML2MK_FILES)"!="" + @@-$(MKDIRHIER) $(UNOUCROUT) $(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T") $(UNOUCRRDB)) && $(TOUCH) $@ .ENDIF # "$(UNOTYPES)" != "" |