diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2002-08-12 14:30:10 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2002-08-12 14:30:10 +0000 |
| commit | dc7bcaaec8a674325cd03607ecff61eed1540196 (patch) | |
| tree | 41fd8b00b62d30350c93e4891b1a4d29bd282c36 /solenv/inc/tg_def.mk | |
| parent | cc04e8ec093799f75025aa9949268226688f5112 (diff) | |
#100000# avoid exportlist writing if not lock owner
Diffstat (limited to 'solenv/inc/tg_def.mk')
| -rw-r--r-- | solenv/inc/tg_def.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index bb536a18b0d4..c8e8430186e3 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_def.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: hjs $ $Date: 2002-08-09 18:04:24 $ +# last change: $Author: hjs $ $Date: 2002-08-12 15:30:10 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -149,7 +149,6 @@ $(DEF$(TNR)TARGETN) .PHONY : \ # don't forget to have the right DEFSTAG set! # +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl -u$(DEF$(TNR)UNIQE:b) update $(DEFSTAG) - +ok.bat && $(RM) ok.bat .ENDIF # "$(shell +echo %_disk)"=="O" .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" .ENDIF # "$(UPDATER)"!="" @@ -168,17 +167,17 @@ $(DEF$(TNR)TARGETN) .PHONY : \ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"=="" .IF "$(DEFLIB$(TNR)NAME)"!="" - $(LIBMGR) -EXTRACT:/ /OUT:$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib + @+$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && $(LIBMGR) -EXTRACT:/ /OUT:$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF$(TNR)CEXP)"!="" - @$(LDUMP2) -A $(DEF$(TNR)CEXP) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@ + @+$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && $(LDUMP2) -A $(DEF$(TNR)CEXP) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@ .ELSE - @$(LDUMP2) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@ + @+$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && $(LDUMP2) -E 20 -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@ .ENDIF .ELSE # "$(USE_LDUMP2)"=!"" - @$(LDUMP) -E 20 -F$(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@ + @+$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && $(LDUMP) -E 20 -F$(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" - +-$(RM) $(SHL$(TNR)TARGET).exp + @+$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && +-$(RM) $(SHL$(TNR)TARGET).exp # now *\defs\$(OUTPATH) exists, commit it # %_disk is a 4nt special; don't exppect it to work in any other shell .IF "$(BUILD_SOSL)"=="" @@ -188,7 +187,7 @@ $(DEF$(TNR)TARGETN) .PHONY : \ # don't forget to have the right DEFSTAG set! # +$(PERL) $(COMMON_ENV_TOOLS)$/lockcidef.pl -u$(DEF$(TNR)UNIQE:b) commit - +ok.bat && $(RM) ok.bat + +$(TMP)$/$(DEF$(TNR)UNIQE:b).bat && $(RM) $(TMP)$/$(DEF$(TNR)UNIQE:b).bat .ENDIF # "$(shell +echo %_disk)"=="O" .ENDIF # "$(UPDATER)"!="" .ENDIF # "$(BUILD_SOSL)"=="" |