diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-15 08:43:33 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-15 08:43:33 +0000 |
| commit | a24b024b3b6fa665b3e660dec386ea5f472ec09b (patch) | |
| tree | 7bc04347dbc14e37dd6fc6f720559d4252ee3608 /solenv/inc/target.mk | |
| parent | 5208ea7053255a8d4dae5dd9670dffa0eae1610e (diff) | |
CWS-TOOLING: integrate CWS ause098
Diffstat (limited to 'solenv/inc/target.mk')
| -rw-r--r-- | solenv/inc/target.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 1e5fab265438..02008467c033 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -8,7 +8,7 @@ # # $RCSfile: target.mk,v $ # -# $Revision: 1.211 $ +# $Revision: 1.211.4.1 $ # # This file is part of OpenOffice.org. # @@ -280,55 +280,55 @@ NOLIBSLOTARGET=$(SLOFILES) .IF "$(SRC1FILES)"!="" SRC1TARGET=$(SRS)$/$(SRS1NAME).srs -DEPSRS1FILE+=$(MISC)$/$(PWD:f).$(SRS1NAME).dprr +DEPSRS1FILE+=$(MISC)$/$(TARGET).$(SRS1NAME).dprr DEPSRSFILES+=$(DEPSRS1FILE) .ENDIF .IF "$(SRC2FILES)"!="" SRC2TARGET=$(SRS)$/$(SRS2NAME).srs -DEPSRS2FILE+=$(MISC)$/$(PWD:f).$(SRS2NAME).dprr +DEPSRS2FILE+=$(MISC)$/$(TARGET).$(SRS2NAME).dprr DEPSRSFILES+=$(DEPSRS2FILE) .ENDIF .IF "$(SRC3FILES)"!="" SRC3TARGET=$(SRS)$/$(SRS3NAME).srs -DEPSRS3FILE+=$(MISC)$/$(PWD:f).$(SRS3NAME).dprr +DEPSRS3FILE+=$(MISC)$/$(TARGET).$(SRS3NAME).dprr DEPSRSFILES+=$(DEPSRS3FILE) .ENDIF .IF "$(SRC4FILES)"!="" SRC4TARGET=$(SRS)$/$(SRS4NAME).srs -DEPSRS4FILE+=$(MISC)$/$(PWD:f).$(SRS4NAME).dprr +DEPSRS4FILE+=$(MISC)$/$(TARGET).$(SRS4NAME).dprr DEPSRSFILES+=$(DEPSRS4FILE) .ENDIF .IF "$(SRC5FILES)"!="" SRC5TARGET=$(SRS)$/$(SRS5NAME).srs -DEPSRS5FILE+=$(MISC)$/$(PWD:f).$(SRS5NAME).dprr +DEPSRS5FILE+=$(MISC)$/$(TARGET).$(SRS5NAME).dprr DEPSRSFILES+=$(DEPSRS5FILE) .ENDIF .IF "$(SRC6FILES)"!="" SRC6TARGET=$(SRS)$/$(SRS6NAME).srs -DEPSRS6FILE+=$(MISC)$/$(PWD:f).$(SRS6NAME).dprr +DEPSRS6FILE+=$(MISC)$/$(TARGET).$(SRS6NAME).dprr DEPSRSFILES+=$(DEPSRS6FILE) .ENDIF .IF "$(SRC7FILES)"!="" SRC7TARGET=$(SRS)$/$(SRS7NAME).srs -DEPSRS7FILE+=$(MISC)$/$(PWD:f).$(SRS7NAME).dprr +DEPSRS7FILE+=$(MISC)$/$(TARGET).$(SRS7NAME).dprr DEPSRSFILES+=$(DEPSRS7FILE) .ENDIF .IF "$(SRC8FILES)"!="" SRC8TARGET=$(SRS)$/$(SRS8NAME).srs -DEPSRS8FILE+=$(MISC)$/$(PWD:f).$(SRS8NAME).dprr +DEPSRS8FILE+=$(MISC)$/$(TARGET).$(SRS8NAME).dprr DEPSRSFILES+=$(DEPSRS8FILE) .ENDIF .IF "$(SRC9FILES)"!="" SRC9TARGET=$(SRS)$/$(SRS9NAME).srs -DEPSRS9FILE+=$(MISC)$/$(PWD:f).$(SRS9NAME).dprr +DEPSRS9FILE+=$(MISC)$/$(TARGET).$(SRS9NAME).dprr DEPSRSFILES+=$(DEPSRS9FILE) .ENDIF @@ -1388,19 +1388,19 @@ $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE) makedoc: @@-mkdir $(OUT)$/ucrdoc - $(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n")) + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n")) # -$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES) $(IDLFILES) .IF "$(LOCALDBTARGET)"!="" $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES) - $(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl)) + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl)) -$(RM) $@ $(REGMERGE) $@ UCR @$(mktmp $(URDFILES)) .ENDIF .IF "$(LOCALDOCDBTARGET)"!="" $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES) - $(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl)) + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl)) -$(RM) $@ $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES)) .ENDIF |